From 46d6ec7d77a041d8266d0d9811f57ba92e86599e Mon Sep 17 00:00:00 2001
From: Piotr Jaroszyński
Date: Mon, 22 Mar 2010 23:19:00 +0100
Subject: [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>
---
 src/config/console.h        | 2 ++
 src/config/general.h        | 2 ++
 src/config/ioapi.h          | 2 ++
 src/config/isa.h            | 2 ++
 src/config/local/.gitignore | 1 +
 src/config/nap.h            | 2 ++
 src/config/serial.h         | 2 ++
 src/config/timer.h          | 2 ++
 src/config/umalloc.h        | 2 ++
 9 files changed, 17 insertions(+)
 create mode 100644 src/config/local/.gitignore

(limited to 'src/config')

diff --git a/src/config/console.h b/src/config/console.h
index be3242dd..586e3715 100644
--- 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 0a9e6252..bfab5b6e 100644
--- 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 8ddd557b..ce19c6d7 100644
--- 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 523be1c0..e2a05050 100644
--- 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
index 00000000..72e8ffc0
--- /dev/null
+++ b/src/config/local/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/src/config/nap.h b/src/config/nap.h
index 1b981355..187af428 100644
--- 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 44272d1f..8bb9311f 100644
--- 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 cc6a93d1..abd66985 100644
--- 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 65febf1f..245c6b4a 100644
--- 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 */
-- 
cgit v1.2.3-55-g7522