summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-04-04 16:10:40 +0200
committerWolfgang Denk <wd@denx.de>2009-04-04 16:10:40 +0200
commitafcbce07e9323c0e8aeb783ba7ce6104860fd7a7 (patch)
treee9aa667a5cd34eef5b08a7d5471d9ff075d0e5d3
parenta31e091ad70915278fb15b79d6ae53ea2d44b251 (diff)
downloadu-boot-imx-afcbce07e9323c0e8aeb783ba7ce6104860fd7a7.zip
u-boot-imx-afcbce07e9323c0e8aeb783ba7ce6104860fd7a7.tar.gz
u-boot-imx-afcbce07e9323c0e8aeb783ba7ce6104860fd7a7.tar.bz2
Fix building of env_embedded.o
Since commit a706bfc7 common/env_embedded.o and tools/envcrc were only built when CONFIG_ENV_IS_EMBEDDED was set, but this breaks building for many boards. We always have to build these files when CONFIG_ENV_IS_IN_FLASH is set. Signed-off-by: Wolfgang Denk <wd@denx.de>
-rw-r--r--common/Makefile1
-rw-r--r--tools/Makefile3
2 files changed, 3 insertions, 1 deletions
diff --git a/common/Makefile b/common/Makefile
index 0a93462..a42440a 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -52,6 +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-$(CONFIG_ENV_IS_EMBEDDED) += env_embedded.o
+COBJS-$(CONFIG_ENV_IS_IN_FLASH) += 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 12f0216..52f6cc0 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -69,6 +69,7 @@ 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_FLASH) += 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)
@@ -124,7 +125,7 @@ endif
SRCS += $(addprefix $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c))
SRCS += $(addprefix $(SRCTREE)/tools/,$(OBJ_FILES-y:.o=.c))
SRCS += $(addprefix $(SRCTREE)/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c))
-BINS := $(addprefix $(obj),$(BIN_FILES-y))
+BINS := $(addprefix $(obj),$(sort $(BIN_FILES-y)))
LIBFDT_OBJS := $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y))
#