[U-Boot-Users] [PATCH 8/9] Generate include/autoconf.mk from board config files
Grant Likely
grant.likely at secretlab.ca
Tue Sep 25 20:27:10 CEST 2007
From: Grant Likely <grant.likely at secretlab.ca>
Use cpp and sed to postprocess config.h and import the defined values
into include/autoconf.mk. This is to support conditional compilation
Signed-off-by: Grant Likely <grant.likely at secretlab.ca>
---
Makefile | 7 ++++++-
config.mk | 3 +++
tools/scripts/define2mk.sed | 29 +++++++++++++++++++++++++++++
3 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 8d500f5..6410f08 100644
--- a/Makefile
+++ b/Makefile
@@ -341,6 +341,10 @@ $(obj)System.map: $(obj)u-boot
grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \
sort > $(obj)System.map
+# Auto-generate the autoconf.mk file (which is included by all makefiles)
+$(OBJTREE)/include/autoconf.mk: $(obj)include/config.h
+ @${CPP} ${CFLAGS} -dM include/common.h | sed -n -f tools/scripts/define2mk.sed > $(OBJTREE)/include/autoconf.mk
+
#########################################################################
else
all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \
@@ -360,7 +364,8 @@ CHANGELOG:
unconfig:
@rm -f $(obj)include/config.h $(obj)include/config.mk \
- $(obj)board/*/config.tmp $(obj)board/*/*/config.tmp
+ $(obj)board/*/config.tmp $(obj)board/*/*/config.tmp \
+ $(obj)include/autoconf.mk
#========================================================================
# PowerPC
diff --git a/config.mk b/config.mk
index 582df32..7e477d6 100644
--- a/config.mk
+++ b/config.mk
@@ -91,6 +91,9 @@ ifdef BOARD
sinclude $(TOPDIR)/board/$(BOARDDIR)/config.mk # include board specific rules
endif
+# Load generated board configuration
+sinclude $(OBJTREE)/include/autoconf.mk
+
#########################################################################
CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
diff --git a/tools/scripts/define2mk.sed b/tools/scripts/define2mk.sed
new file mode 100644
index 0000000..6464627
--- /dev/null
+++ b/tools/scripts/define2mk.sed
@@ -0,0 +1,29 @@
+#
+# Sed script to parse CPP macros and generate output usable by make
+#
+# It is expected that this script is fed the output of 'gpp -dM'
+# which preprocesses the common.h header files and outputs the final
+# list of CPP macros (and whitespace is sanitized)
+#
+
+# Only process values prefixed with #define CONFIG_
+/^#define CONFIG_[A-Za-z0-9_]\+/ {
+ # Strip the #define prefix
+ s/#define *//;
+ # Change to form CONFIG_*=VALUE
+ s/ \+/=/;
+ # Drop trailing spaces
+ s/ *$//;
+ # drop quotes around string values
+ s/="\(.*\)"$/=\1/;
+ # Concatenate string values
+ s/" *"//g;
+ # Wrap non-numeral values with quotes
+ s/=\(.*\?[^0-9].*\)$/=\"\1\"/;
+ # Change '1' and empty values to "y" (not perfect, but
+ # supports conditional compilation in the makefiles
+ s/=$/=y/;
+ s/=1$/=y/;
+ # print the line
+ p
+}
More information about the U-Boot
mailing list