Fix Makefile: include config.mk only after CROSS_COMPILE is defined

Patch by Friedrich Lobenstock, 02 Jun 2005
18 years ago · 92b197f0da
parent 82d716fd0d
commit 92b197f0da
2 changed files with 7 additions and 3 deletions
--- a/3
+++ b/3
@ -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

--- a/7
+++ b/7
@ -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)