From: Wolfgang Denk <wd@pollux.denx.de>
Date: Sun, 12 Mar 2006 00:37:50 +0000 (+0100)
Subject: Fix Makefile: include config.mk only after CROSS_COMPILE is defined
X-Git-Tag: LABEL_2006_04_18_1106~7^2~41
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=92b197f0da45ae086b7c457184ae67a432ef1c5e;p=u-boot

Fix Makefile: include config.mk only after CROSS_COMPILE is defined
Patch by Friedrich Lobenstock, 02 Jun 2005
---

diff --git a/CHANGELOG b/CHANGELOG
index 8afc11b611..7e38f4de89 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Fix Makefile: include config.mk only after CROSS_COMPILE is defined
+  Patch by Friedrich Lobenstock, 02 Jun 2005
+
 * Fix comment in common/soft_i2c.c
   Patches by Peter Korsgaard/Tolunay Orkun, 26 May 2005
 
diff --git a/Makefile b/Makefile
index af046b930b..fefcbbac0a 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)