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 8afc11b611ff84b54d76426423f17bfc9f0feb64..7e38f4de89a41ec0f59407edeab572a5c6fbf62a 100644 (file)
--- 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 af046b930bddc4bddd5c87a0b6d11839f41cd66b..fefcbbac0a7b186ed9ec60c4093a5dd9b47ae287 100644 (file)
--- 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)