summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-09-05 09:19:54 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-09-10 21:09:38 +0200
commitbf5a7710ec70e90e98f451b4ba0eb65f9ffc34eb (patch)
treea32f2efe3d82f6717aa125fa33f7e828da709b9a
parentbb1f8b4f8bb0bfce52e0faa4637b975b745824b3 (diff)
downloadu-boot-imx-bf5a7710ec70e90e98f451b4ba0eb65f9ffc34eb.zip
u-boot-imx-bf5a7710ec70e90e98f451b4ba0eb65f9ffc34eb.tar.gz
u-boot-imx-bf5a7710ec70e90e98f451b4ba0eb65f9ffc34eb.tar.bz2
env_eeprom: Move conditional compilation to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
-rw-r--r--common/Makefile2
-rw-r--r--common/env_eeprom.c5
2 files changed, 1 insertions, 6 deletions
diff --git a/common/Makefile b/common/Makefile
index a9a02b2..9001237 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 */