Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com --- common/Makefile | 2 +- common/env_dataflash.c | 5 ----- 2 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/common/Makefile b/common/Makefile index a7d5b59..53e20e6 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 */