From bf5a7710ec70e90e98f451b4ba0eb65f9ffc34eb Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Fri, 5 Sep 2008 09:19:54 +0200 Subject: env_eeprom: Move conditional compilation to Makefile Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- common/Makefile | 2 +- common/env_eeprom.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/common/Makefile b/common/Makefile index a9a02b2e03..9001237760 100644 --- a/common/Makefile +++ b/common/Makefile @@ -51,7 +51,7 @@ COBJS-y += cmd_nvedit.o COBJS-y += environment.o COBJS-y += env_common.o COBJS-y += env_dataflash.o -COBJS-y += env_eeprom.o +COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o COBJS-y += env_flash.o COBJS-y += env_nand.o COBJS-y += env_nvram.o diff --git a/common/env_eeprom.c b/common/env_eeprom.c index 1a03f436d8..df3e31e93a 100644 --- a/common/env_eeprom.c +++ b/common/env_eeprom.c @@ -25,9 +25,6 @@ */ #include - -#if defined(CONFIG_ENV_IS_IN_EEPROM) /* Environment is in EEPROM */ - #include #include #include @@ -106,5 +103,3 @@ int env_init(void) return (0); } - -#endif /* CONFIG_ENV_IS_IN_EEPROM */ -- cgit