From: Jean-Christophe PLAGNIOL-VILLARD Date: Wed, 10 Sep 2008 20:48:01 +0000 (+0200) Subject: env_nowhere: Move conditional compilation to Makefile X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=c0878af6e32f0fd8e13a6ca315b9add64441115a;p=u-boot.git env_nowhere: Move conditional compilation to Makefile Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- diff --git a/common/Makefile b/common/Makefile index e171ae0b4c..cf861c575c 100644 --- a/common/Makefile +++ b/common/Makefile @@ -57,7 +57,7 @@ COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o COBJS-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o COBJS-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o -COBJS-y += env_nowhere.o +COBJS-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o # command COBJS-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o diff --git a/common/env_nowhere.c b/common/env_nowhere.c index 8dd4867f1f..78e8f8eb4e 100644 --- a/common/env_nowhere.c +++ b/common/env_nowhere.c @@ -25,9 +25,6 @@ */ #include - -#if defined(CONFIG_ENV_IS_NOWHERE) /* Environment is nowhere */ - #include #include #include @@ -61,5 +58,3 @@ int env_init(void) return (0); } - -#endif /* CONFIG_ENV_IS_NOWHERE) */