summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-07-21 22:59:36 -0400
committerWolfgang Denk <wd@denx.de>2009-07-23 21:44:07 +0200
commit2632c008e2c2cd61fefb622ed671ea3e6bd2e2a6 (patch)
treed76fc488e3cfb1e9ad6751d433ff12710805af55
parentc01171eaecc963d2c1f56a0984a0cbcdd8a3ab3c (diff)
downloadu-boot-imx-2632c008e2c2cd61fefb622ed671ea3e6bd2e2a6.zip
u-boot-imx-2632c008e2c2cd61fefb622ed671ea3e6bd2e2a6.tar.gz
u-boot-imx-2632c008e2c2cd61fefb622ed671ea3e6bd2e2a6.tar.bz2
autoconf.mk: include before config.mk for top level files
By including autoconf.mk before config.mk, all top level files can use any config options it sets up (like <arch>_config.mk) or the Makefile itself without being forced to use lazy evaluation.
-rw-r--r--Makefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index ebdf032..2320db6 100644
--- a/Makefile
+++ b/Makefile
@@ -147,6 +147,13 @@ SUBDIRS = tools \
ifeq ($(obj)include/config.mk,$(wildcard $(obj)include/config.mk))
+# Include autoconf.mk before config.mk so that the config options are available
+# to all top level build files. We need the dummy all: target to prevent the
+# dependency target in autoconf.mk.dep from being the default.
+all:
+sinclude $(obj)include/autoconf.mk.dep
+sinclude $(obj)include/autoconf.mk
+
# load ARCH, BOARD, and CPU configuration
include $(obj)include/config.mk
export ARCH CPU BOARD VENDOR SOC
@@ -440,9 +447,6 @@ $(obj)include/autoconf.mk: $(obj)include/config.h
sed -n -f tools/scripts/define2mk.sed > $@.tmp && \
mv $@.tmp $@
-sinclude $(obj)include/autoconf.mk.dep
-sinclude $(obj)include/autoconf.mk
-
#########################################################################
else # !config.mk
all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \