env_eeprom: Move conditional compilation to Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/common/Makefile b/common/Makefile
index a9a02b2e03c121963ec935a983de6c19e8cf81e7..9001237760788319e913cfb7cb832cb1563eb466 100644 (file)
--- 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 1a03f436d8feadd718f191238ebe4df012f1d07c..df3e31e93ab56c2175a286e23bb7a8f41c7e207f 100644 (file)
--- a/common/env_eeprom.c
+++ b/common/env_eeprom.c
@@ -25,9 +25,6 @@
  */
 
 #include <common.h>
-
-#if defined(CONFIG_ENV_IS_IN_EEPROM) /* Environment is in EEPROM */
-
 #include <command.h>
 #include <environment.h>
 #include <linux/stddef.h>
@@ -106,5 +103,3 @@ int env_init(void)
 
        return (0);
 }
-
-#endif /* CONFIG_ENV_IS_IN_EEPROM */