summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-04-05 00:18:44 +0200
committerWolfgang Denk <wd@denx.de>2009-04-05 00:18:44 +0200
commitf63728c804ab7413a67d70f6774cd30c3f7b40fb (patch)
treef1da3db76e7428c507f637b5b645e1bd77fcd7ee
parente3d1ac7bb1955d36980d267cb4cec40b0f7d30b5 (diff)
One more fix for building env_embedded.o
In addition to the changes for CONFIG_ENV_IS_IN_FLASH as done in commit afcbce07, we also need to do the same for CONFIG_ENV_IS_IN_EEPROM and CONFIG_ENV_IS_IN_NVRAM. Signed-off-by: Wolfgang Denk <wd@denx.de>
-rw-r--r--common/Makefile2
-rw-r--r--tools/Makefile2
2 files changed, 4 insertions, 0 deletions
diff --git a/common/Makefile b/common/Makefile
index e2d2f450ef..b9f4ca79cc 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -52,7 +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/tools/Makefile b/tools/Makefile
index 52f6cc07cb..70d87b0b48 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -69,7 +69,9 @@ include $(TOPDIR)/config.mk
BIN_FILES-$(CONFIG_CMD_LOADS) += img2srec$(SFX)
BIN_FILES-y += mkimage$(SFX)
BIN_FILES-$(CONFIG_ENV_IS_EMBEDDED) += envcrc$(SFX)
+BIN_FILES-$(CONFIG_ENV_IS_IN_EEPROM) += envcrc$(SFX)
BIN_FILES-$(CONFIG_ENV_IS_IN_FLASH) += envcrc$(SFX)
+BIN_FILES-$(CONFIG_ENV_IS_IN_NVRAM) += envcrc$(SFX)
BIN_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1$(SFX)
BIN_FILES-$(CONFIG_CMD_NET) += gen_eth_addr$(SFX)
BIN_FILES-$(CONFIG_LCD_LOGO) += bmp_logo$(SFX)