[U-Boot] [PATCH] autoconf.mk: include before config.mk for top level files
Mike Frysinger
vapier at gentoo.org
Wed Jul 22 04:59:36 CEST 2009
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.
---
Makefile | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 25a6254..69037b4 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 \
--
1.6.3.3
More information about the U-Boot
mailing list