r3768 - in trunk/payloads/libpayload: . crypto curses drivers drivers/usb drivers/video i386 libc sample

Author: jcrouse
Date: 2008-11-24 18:54:46 +0100 (Mon, 24 Nov 2008)
New Revision: 3768

Modified:
   trunk/payloads/libpayload/Makefile
   trunk/payloads/libpayload/crypto/sha1.c
   trunk/payloads/libpayload/curses/keyboard.c
   trunk/payloads/libpayload/curses/local.h
   trunk/payloads/libpayload/drivers/keyboard.c
   trunk/payloads/libpayload/drivers/nvram.c
   trunk/payloads/libpayload/drivers/serial.c
   trunk/payloads/libpayload/drivers/usb/usb.c
   trunk/payloads/libpayload/drivers/usb/usbinit.c
   trunk/payloads/libpayload/drivers/video/video.c
   trunk/payloads/libpayload/i386/coreboot.c
   trunk/payloads/libpayload/i386/multiboot.c
   trunk/payloads/libpayload/i386/sysinfo.c
   trunk/payloads/libpayload/libc/console.c
   trunk/payloads/libpayload/libc/exec.c
   trunk/payloads/libpayload/libc/time.c
   trunk/payloads/libpayload/sample/hello.c
Log:
[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 
Acked-by: Stefan Reinauer

Modified: trunk/payloads/libpayload/Makefile
===================================================================
--- trunk/payloads/libpayload/Makefile	2008-11-22 18:29:44 UTC (rev 3767)
+++ trunk/payloads/libpayload/Makefile	2008-11-24 17:54:46 UTC (rev 3768)
@@ -35,7 +35,7 @@
 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 @@
    $(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 @@
 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.

Modified: trunk/payloads/libpayload/crypto/sha1.c
===================================================================
--- trunk/payloads/libpayload/crypto/sha1.c	2008-11-22 18:29:44 UTC (rev 3767)
+++ trunk/payloads/libpayload/crypto/sha1.c	2008-11-24 17:54:46 UTC (rev 3768)
@@ -20,7 +20,7 @@
  *   34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
  */

-#include <config.h>
+#include <libpayload-config.h>
 #include <libpayload.h>

typedef u8 u_int8_t;

Modified: trunk/payloads/libpayload/curses/keyboard.c
===================================================================
--- trunk/payloads/libpayload/curses/keyboard.c	2008-11-22 18:29:44 UTC (rev 3767)
+++ trunk/payloads/libpayload/curses/keyboard.c	2008-11-24 17:54:46 UTC (rev 3768)
@@ -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"

Modified: trunk/payloads/libpayload/curses/local.h
===================================================================
--- trunk/payloads/libpayload/curses/local.h	2008-11-22 18:29:44 UTC (rev 3767)
+++ trunk/payloads/libpayload/curses/local.h	2008-11-24 17:54:46 UTC (rev 3768)
@@ -58,7 +58,7 @@

#undef USE_TERMLIB

-#include <config.h>
+#include <libpayload-config.h>
 #include <libpayload.h>
 #include <curses.h>
 #include <curses.priv.h>

Modified: trunk/payloads/libpayload/drivers/keyboard.c
===================================================================
--- trunk/payloads/libpayload/drivers/keyboard.c	2008-11-22 18:29:44 UTC (rev 3767)
+++ trunk/payloads/libpayload/drivers/keyboard.c	2008-11-24 17:54:46 UTC (rev 3768)
@@ -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

Modified: trunk/payloads/libpayload/drivers/nvram.c
===================================================================
--- trunk/payloads/libpayload/drivers/nvram.c	2008-11-22 18:29:44 UTC (rev 3767)
+++ trunk/payloads/libpayload/drivers/nvram.c	2008-11-24 17:54:46 UTC (rev 3768)
@@ -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>

Modified: trunk/payloads/libpayload/drivers/serial.c
===================================================================
--- trunk/payloads/libpayload/drivers/serial.c	2008-11-22 18:29:44 UTC (rev 3767)
+++ trunk/payloads/libpayload/drivers/serial.c	2008-11-24 17:54:46 UTC (rev 3768)
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  */

-#include <config.h>
+#include <libpayload-config.h>
 #include <libpayload.h>

#define IOBASE lib_sysinfo.ser_ioport

Modified: trunk/payloads/libpayload/drivers/usb/usb.c
===================================================================
--- trunk/payloads/libpayload/drivers/usb/usb.c	2008-11-22 18:29:44 UTC (rev 3767)
+++ trunk/payloads/libpayload/drivers/usb/usb.c	2008-11-24 17:54:46 UTC (rev 3768)
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */

-#include <config.h>
+#include <libpayload-config.h>
 #include <usb/usb.h>

hci_t *usb_hcs = 0;

Modified: trunk/payloads/libpayload/drivers/usb/usbinit.c
===================================================================
--- trunk/payloads/libpayload/drivers/usb/usbinit.c	2008-11-22 18:29:44 UTC (rev 3767)
+++ trunk/payloads/libpayload/drivers/usb/usbinit.c	2008-11-24 17:54:46 UTC (rev 3768)
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */

-#include <config.h>
+#include <libpayload-config.h>
 #include <usb/usb.h>
 #include "uhci.h"
 #include <usb/usbdisk.h>

Modified: trunk/payloads/libpayload/drivers/video/video.c
===================================================================
--- trunk/payloads/libpayload/drivers/video/video.c	2008-11-22 18:29:44 UTC (rev 3767)
+++ trunk/payloads/libpayload/drivers/video/video.c	2008-11-24 17:54:46 UTC (rev 3768)
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */

-#include <config.h>
+#include <libpayload-config.h>
 #include <libpayload.h>
 #include <video_console.h>

Modified: trunk/payloads/libpayload/i386/coreboot.c
===================================================================
--- trunk/payloads/libpayload/i386/coreboot.c	2008-11-22 18:29:44 UTC (rev 3767)
+++ trunk/payloads/libpayload/i386/coreboot.c	2008-11-24 17:54:46 UTC (rev 3768)
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */

-#include <config.h>
+#include <libpayload-config.h>
 #include <libpayload.h>
 #include <coreboot_tables.h>

Modified: trunk/payloads/libpayload/i386/multiboot.c
===================================================================
--- trunk/payloads/libpayload/i386/multiboot.c	2008-11-22 18:29:44 UTC (rev 3767)
+++ trunk/payloads/libpayload/i386/multiboot.c	2008-11-24 17:54:46 UTC (rev 3768)
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */

-#include <config.h>
+#include <libpayload-config.h>
 #include <libpayload.h>
 #include <multiboot_tables.h>

Modified: trunk/payloads/libpayload/i386/sysinfo.c
===================================================================
--- trunk/payloads/libpayload/i386/sysinfo.c	2008-11-22 18:29:44 UTC (rev 3767)
+++ trunk/payloads/libpayload/i386/sysinfo.c	2008-11-24 17:54:46 UTC (rev 3768)
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */

-#include <config.h>
+#include <libpayload-config.h>
 #include <libpayload.h>
 #include <multiboot_tables.h>

Modified: trunk/payloads/libpayload/libc/console.c
===================================================================
--- trunk/payloads/libpayload/libc/console.c	2008-11-22 18:29:44 UTC (rev 3767)
+++ trunk/payloads/libpayload/libc/console.c	2008-11-24 17:54:46 UTC (rev 3768)
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */

-#include <config.h>
+#include <libpayload-config.h>
 #include <libpayload.h>
 #include <usb/usb.h>

Modified: trunk/payloads/libpayload/libc/exec.c
===================================================================
--- trunk/payloads/libpayload/libc/exec.c	2008-11-22 18:29:44 UTC (rev 3767)
+++ trunk/payloads/libpayload/libc/exec.c	2008-11-24 17:54:46 UTC (rev 3768)
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */

-#include <config.h>
+#include <libpayload-config.h>
 #include <libpayload.h>

#ifdef CONFIG_TARGET_I386

Modified: trunk/payloads/libpayload/libc/time.c
===================================================================
--- trunk/payloads/libpayload/libc/time.c	2008-11-22 18:29:44 UTC (rev 3767)
+++ trunk/payloads/libpayload/libc/time.c	2008-11-24 17:54:46 UTC (rev 3768)
@@ -32,7 +32,7 @@
  * General time functions
  */

-#include <config.h>
+#include <libpayload-config.h>
 #include <libpayload.h>
 #include <arch/rdtsc.h>

Modified: trunk/payloads/libpayload/sample/hello.c
===================================================================
--- trunk/payloads/libpayload/sample/hello.c	2008-11-22 18:29:44 UTC (rev 3767)
+++ trunk/payloads/libpayload/sample/hello.c	2008-11-24 17:54:46 UTC (rev 3768)
@@ -29,6 +29,7 @@

/* Example file for libpayload. */

+#include <libpayload-config.h>
 #include <libpayload.h>

int main(void)