From a747a7f31059b9069e97c78bba5496409c33aa05 Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Tue, 27 Oct 2009 00:03:32 +0100 Subject: 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. --- common/Makefile | 3 +++ common/env_embedded.c | 7 +++++++ 2 files changed, 10 insertions(+) (limited to 'common') diff --git a/common/Makefile b/common/Makefile index a92a75fe9..3781738e1 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 e27e1cd27..ae6cac439 100644 --- a/common/env_embedded.c +++ b/common/env_embedded.c @@ -40,6 +40,11 @@ # define SYM_CHAR #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 @@ -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 */ -- cgit v1.2.3