diff options
| author | Paul Brook <paul@codesourcery.com> | 2010-11-26 18:47:45 +0000 |
|---|---|---|
| committer | Paul Brook <paul@codesourcery.com> | 2010-11-26 18:47:45 +0000 |
| commit | bd9141bb2e53195e3c1abf29275365d7f554beb5 (patch) | |
| tree | bd58ce6d38d04e2cea21de3410124f7535510589 | |
| parent | 6e14404aab26f74a448747d1e793ac16bde8a92b (diff) | |
Include directives in default configs
Allow default configs to be split into several files.
Signed-off-by: Paul Brook <paul@codesourcery.com>
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | Makefile.objs | 3 | ||||
| -rw-r--r-- | make_device_config.sh | 27 |
3 files changed, 35 insertions, 6 deletions
@@ -39,18 +39,19 @@ endif SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory) SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS)) +SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %/config-devices.mak.d, $(TARGET_DIRS)) config-all-devices.mak: $(SUBDIR_DEVICES_MAK) $(call quiet-command,cat $(SUBDIR_DEVICES_MAK) | grep =y | sort -u > $@," GEN $@") +-include $(SUBDIR_DEVICES_MAK_DEP) + %/config-devices.mak: default-configs/%.mak - $(call quiet-command,cat $< > $@.tmp, " GEN $@") + $(call quiet-command,$(SHELL) $(SRC_PATH)/make_device_config.sh $@ $<, " GEN $@") @if test -f $@; then \ if cmp -s $@.old $@; then \ - if ! cmp -s $@ $@.tmp; then \ - mv $@.tmp $@; \ - cp -p $@ $@.old; \ - fi; \ + mv $@.tmp $@; \ + cp -p $@ $@.old; \ else \ if test -f $@.old; then \ echo "WARNING: $@ (user modified) out of date.";\ diff --git a/Makefile.objs b/Makefile.objs index 23b17cefad..4f4aba3472 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -160,7 +160,8 @@ user-obj-y += cutils.o cache-utils.o hw-obj-y = hw-obj-y += vl.o loader.o hw-obj-y += virtio.o virtio-console.o -hw-obj-y += fw_cfg.o pci.o pci_host.o pcie_host.o pci_bridge.o +hw-obj-y += fw_cfg.o +hw-obj-$(CONFIG_PCI) += pci.o pci_host.o pcie_host.o pci_bridge.o hw-obj-y += ioh3420.o xio3130_upstream.o xio3130_downstream.o hw-obj-y += watchdog.o hw-obj-$(CONFIG_ISA_MMIO) += isa_mmio.o diff --git a/make_device_config.sh b/make_device_config.sh new file mode 100644 index 0000000000..59f267b5ef --- /dev/null +++ b/make_device_config.sh @@ -0,0 +1,27 @@ +#! /bin/sh +# Construct a target device config file from a default, pulling in any +# files from include directives. + +dest=$1.tmp +dep=$1.d +src=$2 +src_dir=`dirname $src` +all_includes= + +process_includes () { + cat $1 | grep '^include' | \ + while read include file ; do + all_includes="$all_includes $src_dir/$file" + process_includes $src_dir/$file + done +} + +f=$src +while [ -n "$f" ] ; do + f=`awk '/^include / {print "'$src_dir'/" $2}' $f` + all_includes="$all_includes $f" +done +process_includes $src > $dest + +cat $src $all_includes | grep -v '^include' > $dest +echo "$1: $all_includes" > $dep |