summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-03-12 01:37:50 +0100
committerWolfgang Denk <wd@pollux.denx.de>2006-03-12 01:37:50 +0100
commit92b197f0da45ae086b7c457184ae67a432ef1c5e (patch)
treea1e1d9c19ba40fe1169eb8f03dbba547cc69d38c /Makefile
parent82d716fd0d057db300cf2b1ab59194858f9b2e6d (diff)
downloadu-boot-imx-92b197f0da45ae086b7c457184ae67a432ef1c5e.zip
u-boot-imx-92b197f0da45ae086b7c457184ae67a432ef1c5e.tar.gz
u-boot-imx-92b197f0da45ae086b7c457184ae67a432ef1c5e.tar.bz2
Fix Makefile: include config.mk only after CROSS_COMPILE is defined
Patch by Friedrich Lobenstock, 02 Jun 2005
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index af046b9..fefcbba 100644
--- a/Makefile
+++ b/Makefile
@@ -53,9 +53,6 @@ ifeq (include/config.mk,$(wildcard include/config.mk))
# load ARCH, BOARD, and CPU configuration
include include/config.mk
export ARCH CPU BOARD VENDOR SOC
-# load other configuration
-include $(TOPDIR)/config.mk
-
ifndef CROSS_COMPILE
ifeq ($(HOSTARCH),ppc)
CROSS_COMPILE =
@@ -93,6 +90,10 @@ endif
export CROSS_COMPILE
+# load other configuration
+include $(TOPDIR)/config.mk
+
+
#########################################################################
# U-Boot objects....order is important (i.e. start must be first)