[build] Add support for local configuration files

Include config/local/$file in config/$file where it makes sense and
create empty local configs during build if not present.

Modified-by: Michael Brown <mcb30@etherboot.org>
Signed-off-by: Michael Brown <mcb30@etherboot.org>

diff --git a/src/.gitignore b/src/.gitignore
index 413f81410393a3067603a2b7d7dfc0ca71625b02..cc8e33e28ef57fc493a9f4b8002e87fed1e8b537 100644 (file)
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -2,4 +2,3 @@
 .echocheck
 TAGS*
 bin*
-config-local.h

diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
index 7e7ad762fbe78fcc21803e4dbc4e59e718d95c0f..c373c8820b8f80aed27afd3950789a5180832c9f 100644 (file)
--- a/src/Makefile.housekeeping
+++ b/src/Makefile.housekeeping
@@ -468,7 +468,7 @@ define src_template
        @$(RM) $(2)
        @$(TOUCH) $(2)
        @$(CPP) $(CFLAGS) $(CFLAGS_$(3)) $(CFLAGS_$(4)) -DOBJECT=$(4) \
-               -Wno-error -MM $(1) -MG -MP | \
+               -Wno-error -M $(1) -MG -MP | \
                sed 's/\.o\s*:/_DEPS =/' >> $(2)
        @$(ECHO_E) '\n$$(BIN)/$(4).o :' \
                 '$(1) $$(MAKEDEPS) $$(POST_O_DEPS) $$($(4)_DEPS)' \
@@ -921,6 +921,13 @@ $(ICCFIX) : util/iccfix.c $(MAKEDEPS)
        $(Q)$(HOST_CC) -idirafter include -O2 -o $@ $<
 CLEANUP += $(ICCFIX)
 
+###############################################################################
+#
+# Local configs
+#
+config/local/%.h :
+       $(Q)touch $@
+
 ###############################################################################
 #
 # Auto-incrementing build serial number.  Append "bs" to your list of

diff --git a/src/config/console.h b/src/config/console.h
index be3242dd9e4dc58b6723a07bb101fcabc8e1a7f5..586e3715136661efc31af28fda709610d16e39f0 100644 (file)
--- a/src/config/console.h
+++ b/src/config/console.h
@@ -20,4 +20,6 @@ FILE_LICENCE ( GPL2_OR_LATER );
 //#define      CONSOLE_BTEXT           /* Who knows what this does? */
 //#define      CONSOLE_PC_KBD          /* Direct access to PC keyboard */
 
+#include <config/local/console.h>
+
 #endif /* CONFIG_CONSOLE_H */

diff --git a/src/config/general.h b/src/config/general.h
index 0a9e6252a2a06bc034a958e71128b19846f80287..bfab5b6e9b596a6b1c1708550cd5f309fb93db48 100644 (file)
--- a/src/config/general.h
+++ b/src/config/general.h
@@ -145,4 +145,6 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #undef GDBUDP                  /* Remote GDB debugging over UDP
                                 * (both may be set) */
 
+#include <config/local/general.h>
+
 #endif /* CONFIG_GENERAL_H */

diff --git a/src/config/ioapi.h b/src/config/ioapi.h
index 8ddd557b97f89b931f2aa22ba9249f9b7d4917c0..ce19c6d719943e96cfa139631789d9748e152c6d 100644 (file)
--- a/src/config/ioapi.h
+++ b/src/config/ioapi.h
@@ -14,4 +14,6 @@ FILE_LICENCE ( GPL2_OR_LATER );
 //#undef       PCIAPI_PCBIOS           /* Access via PCI BIOS */
 //#define      PCIAPI_DIRECT           /* Direct access via Type 1 accesses */
 
+#include <config/local/ioapi.h>
+
 #endif /* CONFIG_IOAPI_H */

diff --git a/src/config/isa.h b/src/config/isa.h
index 523be1c0a747f930dcd0cd4193210d02f82085eb..e2a05050f3d55d83c399ae38f20d598aa71848b3 100644 (file)
--- a/src/config/isa.h
+++ b/src/config/isa.h
@@ -12,4 +12,6 @@
 #undef ISA_PROBE_ADDRS         /* e.g. 0x200, 0x300 */
 #undef ISA_PROBE_ONLY          /* Do not probe any other addresses */
 
+#include <config/local/isa.h>
+
 #endif /* CONFIG_ISA_H */

diff --git a/src/config/local/.gitignore b/src/config/local/.gitignore
new file mode 100644 (file)
index 0000000..72e8ffc
--- /dev/null
+++ b/src/config/local/.gitignore
@@ -0,0 +1 @@
+*

diff --git a/src/config/nap.h b/src/config/nap.h
index 1b981355a9322471f340d1e56a30638bd7b5d30b..187af42894017d34dbf4b25d939c57afb4f31ae2 100644 (file)
--- a/src/config/nap.h
+++ b/src/config/nap.h
@@ -14,4 +14,6 @@ FILE_LICENCE ( GPL2_OR_LATER );
 //#undef               NAP_PCBIOS
 //#define              NAP_NULL
 
+#include <config/local/nap.h>
+
 #endif /* CONFIG_NAP_H */

diff --git a/src/config/serial.h b/src/config/serial.h
index 44272d1fad07346de70537015b8c2e211bc49242..8bb9311f15760fc7682cb11cedab89a03dfa86ad 100644 (file)
--- a/src/config/serial.h
+++ b/src/config/serial.h
@@ -32,4 +32,6 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #define        COMSTOP         1               /* Stop bits */
 #endif
 
+#include <config/local/serial.h>
+
 #endif /* CONFIG_SERIAL_H */

diff --git a/src/config/timer.h b/src/config/timer.h
index cc6a93d18deac69f187fa6e566229bd074611c7e..abd6698518666347e67967fbd7a3120957e6ea6e 100644 (file)
--- a/src/config/timer.h
+++ b/src/config/timer.h
@@ -14,4 +14,6 @@ FILE_LICENCE ( GPL2_OR_LATER );
 //#undef               TIMER_PCBIOS
 //#define              TIMER_RDTSC
 
+#include <config/local/timer.h>
+
 #endif /* CONFIG_TIMER_H */

diff --git a/src/config/umalloc.h b/src/config/umalloc.h
index 65febf1fd6da37ebc2f117e16746482b1f407081..245c6b4aa831e73d1606948072ae1e42d9614036 100644 (file)
--- a/src/config/umalloc.h
+++ b/src/config/umalloc.h
@@ -11,4 +11,6 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <config/defaults.h>
 
+#include <config/local/umalloc.h>
+
 #endif /* CONFIG_UMALLOC_H */