diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-09-10 22:48:01 +0200 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-09-10 22:48:01 +0200 |
| commit | c0878af6e32f0fd8e13a6ca315b9add64441115a (patch) | |
| tree | b66992e39c65d51454591aed09c8f18021785666 | |
| parent | 93f6d72544da4510a146bc4c93d609b0116cde37 (diff) | |
| download | blackbird-obmc-uboot-c0878af6e32f0fd8e13a6ca315b9add64441115a.tar.gz blackbird-obmc-uboot-c0878af6e32f0fd8e13a6ca315b9add64441115a.zip | |
env_nowhere: Move conditional compilation to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| -rw-r--r-- | common/Makefile | 2 | ||||
| -rw-r--r-- | common/env_nowhere.c | 5 |
2 files changed, 1 insertions, 6 deletions
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 <common.h> - -#if defined(CONFIG_ENV_IS_NOWHERE) /* Environment is nowhere */ - #include <command.h> #include <environment.h> #include <linux/stddef.h> @@ -61,5 +58,3 @@ int env_init(void) return (0); } - -#endif /* CONFIG_ENV_IS_NOWHERE) */ |
