summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-05-03 22:25:00 +0200
committerWolfgang Denk <wd@denx.de>2008-05-03 23:06:59 +0200
commitc4e5f52a58d278eebb87f476e353972c5dacea40 (patch)
treede678d78bf9fc595788354de91897864aa82fbe3
parent27c38689d0cfde0e444239345f97b5eecc9f4067 (diff)
downloadu-boot-imx-c4e5f52a58d278eebb87f476e353972c5dacea40.zip
u-boot-imx-c4e5f52a58d278eebb87f476e353972c5dacea40.tar.gz
u-boot-imx-c4e5f52a58d278eebb87f476e353972c5dacea40.tar.bz2
config.mk: use correct (cross) compiler
Some config.mk files reference $(CC) to test for specific tool chain features, so make sure $(CC) gets set before including any such config files. This patch replaces commit b7166e05a5 ("ColdFire: Get information from the correct GCC"). Signed-off-by: Wolfgang Denk <wd@denx.de>
-rw-r--r--config.mk46
1 files changed, 25 insertions, 21 deletions
diff --git a/config.mk b/config.mk
index 22d3398..62fc1d5 100644
--- a/config.mk
+++ b/config.mk
@@ -69,27 +69,6 @@ PLATFORM_CPPFLAGS+= -D__ARM__
endif
endif
-# Load generated board configuration
-sinclude $(OBJTREE)/include/autoconf.mk
-
-ifdef ARCH
-sinclude $(TOPDIR)/$(ARCH)_config.mk # include architecture dependend rules
-endif
-ifdef CPU
-sinclude $(TOPDIR)/cpu/$(CPU)/config.mk # include CPU specific rules
-endif
-ifdef SOC
-sinclude $(TOPDIR)/cpu/$(CPU)/$(SOC)/config.mk # include SoC specific rules
-endif
-ifdef VENDOR
-BOARDDIR = $(VENDOR)/$(BOARD)
-else
-BOARDDIR = $(BOARD)
-endif
-ifdef BOARD
-sinclude $(TOPDIR)/board/$(BOARDDIR)/config.mk # include board specific rules
-endif
-
#########################################################################
CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
@@ -127,6 +106,31 @@ OBJCOPY = $(CROSS_COMPILE)objcopy
OBJDUMP = $(CROSS_COMPILE)objdump
RANLIB = $(CROSS_COMPILE)RANLIB
+#########################################################################
+
+# Load generated board configuration
+sinclude $(OBJTREE)/include/autoconf.mk
+
+ifdef ARCH
+sinclude $(TOPDIR)/$(ARCH)_config.mk # include architecture dependend rules
+endif
+ifdef CPU
+sinclude $(TOPDIR)/cpu/$(CPU)/config.mk # include CPU specific rules
+endif
+ifdef SOC
+sinclude $(TOPDIR)/cpu/$(CPU)/$(SOC)/config.mk # include SoC specific rules
+endif
+ifdef VENDOR
+BOARDDIR = $(VENDOR)/$(BOARD)
+else
+BOARDDIR = $(BOARD)
+endif
+ifdef BOARD
+sinclude $(TOPDIR)/board/$(BOARDDIR)/config.mk # include board specific rules
+endif
+
+#########################################################################
+
ifneq (,$(findstring s,$(MAKEFLAGS)))
ARFLAGS = cr
else