diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-03-12 01:37:50 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-03-12 01:37:50 +0100 |
| commit | 92b197f0da45ae086b7c457184ae67a432ef1c5e (patch) | |
| tree | a1e1d9c19ba40fe1169eb8f03dbba547cc69d38c | |
| parent | 82d716fd0d057db300cf2b1ab59194858f9b2e6d (diff) | |
| download | u-boot-92b197f0da45ae086b7c457184ae67a432ef1c5e.zip u-boot-92b197f0da45ae086b7c457184ae67a432ef1c5e.tar.gz u-boot-92b197f0da45ae086b7c457184ae67a432ef1c5e.tar.bz2 | |
Fix Makefile: include config.mk only after CROSS_COMPILE is defined
Patch by Friedrich Lobenstock, 02 Jun 2005
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | Makefile | 7 |
2 files changed, 7 insertions, 3 deletions
@@ -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 @@ -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) |