[U-Boot] [PATCH 06/25] env_eeprom: Move conditional compilation to Makefile

Jean-Christophe PLAGNIOL-VILLARD plagnioj at jcrosoft.com
Sun Aug 31 03:38:55 CEST 2008


Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
---
 common/Makefile     |    2 +-
 common/env_eeprom.c |    5 -----
 2 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/common/Makefile b/common/Makefile
index 3a20926..3f601e8 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 1a03f43..df3e31e 100644
--- 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 */
-- 
1.5.6.3



More information about the U-Boot mailing list