[PATCH] libpayload: rename config.h to libpayload-config.h

Rename the generated config file to libpayload-config.h to differenciate
it from other config.h files.  Move the default location of the file to
$(src)/include so that LIBPAYLOAD_PREFIX= users can access the file
without staging it.

Signed-off-by: Jordan Crouse <jordan@cosmicpenguin.net>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3768 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile
index d8ca6f691718dc652dd0724aa65fd3e155d24538..f2536e9b95ae944c12b8e2beeb0ac6c5c1075b3f 100644 (file)
--- a/payloads/libpayload/Makefile
+++ b/payloads/libpayload/Makefile
@@ -35,7 +35,7 @@ export obj := $(src)/build
 export objk := $(src)/build/util/kconfig
 
 export KERNELVERSION      := 0.1.0
-export KCONFIG_AUTOHEADER := $(obj)/config.h
+export KCONFIG_AUTOHEADER := $(src)/include/libpayload-config.h
 export KCONFIG_AUTOCONFIG := $(obj)/auto.conf
 
 CONFIG_SHELL := sh
@@ -132,7 +132,6 @@ install: lib
        $(Q)install -m 755 bin/lpgcc $(DESTDIR)/libpayload/bin
        $(Q)install -m 755 bin/lpas $(DESTDIR)/libpayload/bin
        $(Q)install -m 644 bin/lp.functions $(DESTDIR)/libpayload/bin
-       $(Q)install -m 644 $(KCONFIG_AUTOHEADER) $(DESTDIR)/libpayload/include/libpayload-config.h
        $(Q)install -m 644 $(KCONFIG_AUTOCONFIG) $(DESTDIR)/libpayload/libpayload.config
 
 prepare:
@@ -158,6 +157,7 @@ clean: doxygen-clean
 distclean: clean
        $(Q)rm -rf build
        $(Q)rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig*
+       $(Q)rm -f $(src)/include/libpayload-config.h
 
 # This include must come _before_ the pattern rules below!
 # Order _does_ matter for pattern rules.

diff --git a/payloads/libpayload/crypto/sha1.c b/payloads/libpayload/crypto/sha1.c
index 292561913d1a73ad3a5951baf07a7fe7bc6f213e..8d849db71d7d205a5e4a60262f2b5a8dcb05ab69 100644 (file)
--- a/payloads/libpayload/crypto/sha1.c
+++ b/payloads/libpayload/crypto/sha1.c
@@ -20,7 +20,7 @@
  *   34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
  */
 
-#include <config.h>
+#include <libpayload-config.h>
 #include <libpayload.h>
 
 typedef u8 u_int8_t;

diff --git a/payloads/libpayload/curses/keyboard.c b/payloads/libpayload/curses/keyboard.c
index ead4313a988d4c5619061f9bd4a5903f8fe1e993..4a96428f1607b6679934dd30200630fb342aa39d 100644 (file)
--- a/payloads/libpayload/curses/keyboard.c
+++ b/payloads/libpayload/curses/keyboard.c
@@ -37,7 +37,7 @@
  * Actually cook the serial (handle special keys)
  */
 
-#include <config.h>
+#include <libpayload-config.h>
 #include <usb/usb.h>
 #include "local.h"
 

diff --git a/payloads/libpayload/curses/local.h b/payloads/libpayload/curses/local.h
index fff26cbc0c8ee1b0e055986e2a13b9c3607167be..b801e38e5b9d1263293dc76b7f446f13017dd080 100644 (file)
--- a/payloads/libpayload/curses/local.h
+++ b/payloads/libpayload/curses/local.h
@@ -58,7 +58,7 @@
 
 #undef USE_TERMLIB
 
-#include <config.h>
+#include <libpayload-config.h>
 #include <libpayload.h>
 #include <curses.h>
 #include <curses.priv.h>

diff --git a/payloads/libpayload/drivers/keyboard.c b/payloads/libpayload/drivers/keyboard.c
index 0d8f72b32e17d8d1c2192fd63eaf73f39d975708..ecec60c35f562574a18c5f2a8afa07620647a664 100644 (file)
--- a/payloads/libpayload/drivers/keyboard.c
+++ b/payloads/libpayload/drivers/keyboard.c
@@ -27,8 +27,8 @@
  * SUCH DAMAGE.
  */
 
+#include <libpayload-config.h>
 #include <libpayload.h>
-#include <config.h>
 #include <curses.h>
 
 #define I8042_CMD_READ_MODE  0x20

diff --git a/payloads/libpayload/drivers/nvram.c b/payloads/libpayload/drivers/nvram.c
index 13a718004a2c99c51c88f880ab8ab1c6ad5d2eed..502cf6e5875fa426980647cb96e42f2ee3497244 100644 (file)
--- a/payloads/libpayload/drivers/nvram.c
+++ b/payloads/libpayload/drivers/nvram.c
@@ -39,7 +39,7 @@
  * http://bochs.sourceforge.net/techspec/CMOS-reference.txt
  * http://www.bioscentral.com/misc/cmosmap.htm
  */
-#include <config.h>
+#include <libpayload-config.h>
 #include <libpayload.h>
 
 

diff --git a/payloads/libpayload/drivers/serial.c b/payloads/libpayload/drivers/serial.c
index 7a6590cb164fc38d203287394fd0e48240f35fe8..e58f0fc228463cbdaf0a4c927c56801e0411afa4 100644 (file)
--- a/payloads/libpayload/drivers/serial.c
+++ b/payloads/libpayload/drivers/serial.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  */
 
-#include <config.h>
+#include <libpayload-config.h>
 #include <libpayload.h>
 
 #define IOBASE lib_sysinfo.ser_ioport

diff --git a/payloads/libpayload/drivers/usb/usb.c b/payloads/libpayload/drivers/usb/usb.c
index 2290bc6d0900a8c93c945e6c8c620d8a6aa577d0..3820180cbcc1636ca22464adb29043e2709be98f 100644 (file)
--- a/payloads/libpayload/drivers/usb/usb.c
+++ b/payloads/libpayload/drivers/usb/usb.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 
-#include <config.h>
+#include <libpayload-config.h>
 #include <usb/usb.h>
 
 hci_t *usb_hcs = 0;

diff --git a/payloads/libpayload/drivers/usb/usbinit.c b/payloads/libpayload/drivers/usb/usbinit.c
index 851aa3c9d9e5aca306e5c333ec1e4d5a5b1a687d..ead98469f7fdd8786521852e49916fb86607faed 100644 (file)
--- a/payloads/libpayload/drivers/usb/usbinit.c
+++ b/payloads/libpayload/drivers/usb/usbinit.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 
-#include <config.h>
+#include <libpayload-config.h>
 #include <usb/usb.h>
 #include "uhci.h"
 #include <usb/usbdisk.h>

diff --git a/payloads/libpayload/drivers/video/video.c b/payloads/libpayload/drivers/video/video.c
index a9c070d527c285ec4ac79f8cc49e63e8ce02f6e1..87b16b8a31c502ac1858ac8cd2e1cda697394107 100644 (file)
--- a/payloads/libpayload/drivers/video/video.c
+++ b/payloads/libpayload/drivers/video/video.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 
-#include <config.h>
+#include <libpayload-config.h>
 #include <libpayload.h>
 #include <video_console.h>
 

diff --git a/payloads/libpayload/i386/coreboot.c b/payloads/libpayload/i386/coreboot.c
index d27e0f3abbe18055c876c0e9afcee0503e5f8d13..2a675afbe69b2fae28a63333016bb3de5be60876 100644 (file)
--- a/payloads/libpayload/i386/coreboot.c
+++ b/payloads/libpayload/i386/coreboot.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 
-#include <config.h>
+#include <libpayload-config.h>
 #include <libpayload.h>
 #include <coreboot_tables.h>
 

diff --git a/payloads/libpayload/i386/multiboot.c b/payloads/libpayload/i386/multiboot.c
index 040cc082f1476bb9a987b6c7105a8c9df21f3a94..290283e8edb6acf0ee34f7859c9951b7e66b0d8d 100644 (file)
--- a/payloads/libpayload/i386/multiboot.c
+++ b/payloads/libpayload/i386/multiboot.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 
-#include <config.h>
+#include <libpayload-config.h>
 #include <libpayload.h>
 #include <multiboot_tables.h>
 

diff --git a/payloads/libpayload/i386/sysinfo.c b/payloads/libpayload/i386/sysinfo.c
index a074361f4f6278b4d9e2407deeef6a33eec47fe3..02e1d3daec29f91462a2e86e8cd1f1f7fc4a279f 100644 (file)
--- a/payloads/libpayload/i386/sysinfo.c
+++ b/payloads/libpayload/i386/sysinfo.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 
-#include <config.h>
+#include <libpayload-config.h>
 #include <libpayload.h>
 #include <multiboot_tables.h>
 

diff --git a/payloads/libpayload/libc/console.c b/payloads/libpayload/libc/console.c
index 8b09c44d51631823114dafaad88042d4c1790683..ea0eba0164ff34efd55090ea644c091804ec7ac8 100644 (file)
--- a/payloads/libpayload/libc/console.c
+++ b/payloads/libpayload/libc/console.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 
-#include <config.h>
+#include <libpayload-config.h>
 #include <libpayload.h>
 #include <usb/usb.h>
 

diff --git a/payloads/libpayload/libc/exec.c b/payloads/libpayload/libc/exec.c
index e0fea8b291ce693e7e3572b874738597ab6ca5d6..bb531d8f67361785e37c9d0300cb7e2e064a0a5d 100644 (file)
--- a/payloads/libpayload/libc/exec.c
+++ b/payloads/libpayload/libc/exec.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 
-#include <config.h>
+#include <libpayload-config.h>
 #include <libpayload.h>
 
 #ifdef CONFIG_TARGET_I386

diff --git a/payloads/libpayload/libc/time.c b/payloads/libpayload/libc/time.c
index b47e452e49dcdabf234731f531b5177684b4e436..2d19bd173f7a866a988d5fbd92e43f76eb78e5fc 100644 (file)
--- a/payloads/libpayload/libc/time.c
+++ b/payloads/libpayload/libc/time.c
@@ -32,7 +32,7 @@
  * General time functions
  */
 
-#include <config.h>
+#include <libpayload-config.h>
 #include <libpayload.h>
 #include <arch/rdtsc.h>
 

diff --git a/payloads/libpayload/sample/hello.c b/payloads/libpayload/sample/hello.c
index 8112501474049880df0c8602f3d84c8461eaa928..677a96fc8cfe5008c72b524e46bb639cf2f2f879 100644 (file)
--- a/payloads/libpayload/sample/hello.c
+++ b/payloads/libpayload/sample/hello.c
@@ -29,6 +29,7 @@
 
 /* Example file for libpayload. */
 
+#include <libpayload-config.h>
 #include <libpayload.h>
 
 int main(void)