summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-10-27 00:03:32 +0100
committerWolfgang Denk <wd@denx.de>2009-10-27 20:46:31 +0100
commita747a7f31059b9069e97c78bba5496409c33aa05 (patch)
treefbb86723c7f45116d198a7c6e4d4f47e95dce896 /common
parentf3ee25859e3920ee7c7cc519a3e6f60d70d7a53f (diff)
downloadu-boot-imx-a747a7f31059b9069e97c78bba5496409c33aa05.zip
u-boot-imx-a747a7f31059b9069e97c78bba5496409c33aa05.tar.gz
u-boot-imx-a747a7f31059b9069e97c78bba5496409c33aa05.tar.bz2
Revert "env: only build env_embedded and envcrc when needed"
Breaks building on many boards, and no really clean fix available yet. This reverts commit 6dab6add2d8ee80905234b326abc3de11be1d178.
Diffstat (limited to 'common')
-rw-r--r--common/Makefile3
-rw-r--r--common/env_embedded.c7
2 files changed, 10 insertions, 0 deletions
diff --git a/common/Makefile b/common/Makefile
index a92a75f..3781738 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -52,6 +52,9 @@ COBJS-y += env_common.o
COBJS-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o
COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o
COBJS-$(CONFIG_ENV_IS_EMBEDDED) += env_embedded.o
+COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_embedded.o
+COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_embedded.o
+COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_embedded.o
COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
COBJS-$(CONFIG_ENV_IS_IN_MG_DISK) += env_mgdisk.o
COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
diff --git a/common/env_embedded.c b/common/env_embedded.c
index e27e1cd..ae6cac4 100644
--- a/common/env_embedded.c
+++ b/common/env_embedded.c
@@ -41,6 +41,11 @@
#endif
/*
+ * Generate embedded environment table
+ * inside U-Boot image, if needed.
+ */
+#if defined(ENV_IS_EMBEDDED)
+/*
* Only put the environment in it's own section when we are building
* U-Boot proper. The host based program "tools/envcrc" does not need
* a seperate section. Note that ENV_CRC is only defined when building
@@ -205,3 +210,5 @@ unsigned long env_size __PPCTEXT__ = sizeof(env_t);
* Add in absolutes.
*/
GEN_ABS(env_offset, CONFIG_ENV_OFFSET);
+
+#endif /* ENV_IS_EMBEDDED */