[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

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.

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;

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"
 

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>

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

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>
 
 

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

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;

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>

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>
 

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>
 

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>
 

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>
 

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>
 

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

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>
 

payloads/libpayload/sample/hello.c

@@ -29,6 +29,7 @@
 
 /* Example file for libpayload. */
 
+#include <libpayload-config.h>
 #include <libpayload.h>
 
 int main(void)