diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-09-10 22:47:59 +0200 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-09-10 22:47:59 +0200 |
| commit | 06f61354397911a4c121dfa51b6ccbf7e300d48b (patch) | |
| tree | 9a4d829a3119f44fa00c253c0acbc33c7316fdd5 /common | |
| parent | 51bfee192099206a4397f15f3b93516e01f58ab0 (diff) | |
| download | u-boot-imx-06f61354397911a4c121dfa51b6ccbf7e300d48b.zip u-boot-imx-06f61354397911a4c121dfa51b6ccbf7e300d48b.tar.gz u-boot-imx-06f61354397911a4c121dfa51b6ccbf7e300d48b.tar.bz2 | |
env_nand: Move conditional compilation to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/Makefile | 2 | ||||
| -rw-r--r-- | common/env_nand.c | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/common/Makefile b/common/Makefile index 27f515b..2e0fa26 100644 --- a/common/Makefile +++ b/common/Makefile @@ -53,7 +53,7 @@ COBJS-y += env_common.o COBJS-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o COBJS-y += env_flash.o -COBJS-y += env_nand.o +COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o COBJS-y += env_nvram.o COBJS-y += env_onenand.o COBJS-y += env_sf.o diff --git a/common/env_nand.c b/common/env_nand.c index 53e3183..9d01d7c 100644 --- a/common/env_nand.c +++ b/common/env_nand.c @@ -33,9 +33,6 @@ /* #define DEBUG */ #include <common.h> - -#if defined(CONFIG_ENV_IS_IN_NAND) /* Environment is in Nand Flash */ - #include <command.h> #include <environment.h> #include <linux/stddef.h> @@ -366,5 +363,3 @@ static void use_default() set_default_env(); } #endif - -#endif /* CONFIG_ENV_IS_IN_NAND */ |