summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-09-10 22:48:04 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-09-10 22:48:04 +0200
commit507641d2491980531932b9f25dab37fe5e6c3a1a (patch)
treeb6f120b6dfc0b90db4d554393a51d6f69e9418cf
parent5a1aceb0689e2f731491838970884a673ef7e7d3 (diff)
downloadu-boot-imx-507641d2491980531932b9f25dab37fe5e6c3a1a.zip
u-boot-imx-507641d2491980531932b9f25dab37fe5e6c3a1a.tar.gz
u-boot-imx-507641d2491980531932b9f25dab37fe5e6c3a1a.tar.bz2
env_flash: 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_flash.c5
2 files changed, 1 insertions, 6 deletions
diff --git a/common/Makefile b/common/Makefile
index fad9bc1..a6fd97e 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -52,7 +52,7 @@ COBJS-y += env_common.o
COBJS-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o
COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o
COBJS-y += env_embedded.o
-COBJS-y += env_flash.o
+COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o
COBJS-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o
diff --git a/common/env_flash.c b/common/env_flash.c
index c287b17..84166af 100644
--- a/common/env_flash.c
+++ b/common/env_flash.c
@@ -27,9 +27,6 @@
/* #define DEBUG */
#include <common.h>
-
-#if defined(CONFIG_ENV_IS_IN_FLASH) /* Environment is in Flash */
-
#include <command.h>
#include <environment.h>
#include <linux/stddef.h>
@@ -383,5 +380,3 @@ void env_relocate_spec (void)
#endif
#endif /* ! ENV_IS_EMBEDDED || CFG_ENV_ADDR_REDUND */
}
-
-#endif /* CONFIG_ENV_IS_IN_FLASH */