diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-09-10 22:47:58 +0200 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-09-10 22:47:58 +0200 |
| commit | d8cc04d0ac9c7c0d12454708aaf5489f8532bbf9 (patch) | |
| tree | f95e8d31ec4f7f1aae9fefd0e8f28621aaae7e89 | |
| parent | 057c849c45b9ee19df8ff3acdeee66be52819962 (diff) | |
| download | u-boot-imx-d8cc04d0ac9c7c0d12454708aaf5489f8532bbf9.zip u-boot-imx-d8cc04d0ac9c7c0d12454708aaf5489f8532bbf9.tar.gz u-boot-imx-d8cc04d0ac9c7c0d12454708aaf5489f8532bbf9.tar.bz2 | |
env_dataflash: 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_dataflash.c | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/common/Makefile b/common/Makefile index fea0caf..27f515b 100644 --- a/common/Makefile +++ b/common/Makefile @@ -50,7 +50,7 @@ COBJS-y += cmd_nvedit.o # environment COBJS-y += environment.o COBJS-y += env_common.o -COBJS-y += env_dataflash.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 diff --git a/common/env_dataflash.c b/common/env_dataflash.c index 1d55a27..2254b9b 100644 --- a/common/env_dataflash.c +++ b/common/env_dataflash.c @@ -18,9 +18,6 @@ * */ #include <common.h> - -#if defined(CONFIG_ENV_IS_IN_DATAFLASH) /* Environment is in DataFlash */ - #include <command.h> #include <environment.h> #include <linux/stddef.h> @@ -100,5 +97,3 @@ int env_init(void) return (0); } - -#endif /* CONFIG_ENV_IS_IN_DATAFLASH */ |