From db8c0abefce8900c52b304d25878abf835cb5aac Mon Sep 17 00:00:00 2001 From: Jordan Crouse Date: Mon, 24 Nov 2008 17:54:46 +0000 Subject: [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 git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3768 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- payloads/libpayload/Makefile | 4 ++-- payloads/libpayload/crypto/sha1.c | 2 +- payloads/libpayload/curses/keyboard.c | 2 +- payloads/libpayload/curses/local.h | 2 +- payloads/libpayload/drivers/keyboard.c | 2 +- payloads/libpayload/drivers/nvram.c | 2 +- payloads/libpayload/drivers/serial.c | 2 +- payloads/libpayload/drivers/usb/usb.c | 2 +- payloads/libpayload/drivers/usb/usbinit.c | 2 +- payloads/libpayload/drivers/video/video.c | 2 +- payloads/libpayload/i386/coreboot.c | 2 +- payloads/libpayload/i386/multiboot.c | 2 +- payloads/libpayload/i386/sysinfo.c | 2 +- payloads/libpayload/libc/console.c | 2 +- payloads/libpayload/libc/exec.c | 2 +- payloads/libpayload/libc/time.c | 2 +- payloads/libpayload/sample/hello.c | 1 + 17 files changed, 18 insertions(+), 17 deletions(-) (limited to 'payloads/libpayload') diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile index d8ca6f6917..f2536e9b95 100644 --- 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 292561913d..8d849db71d 100644 --- a/payloads/libpayload/crypto/sha1.c +++ b/payloads/libpayload/crypto/sha1.c @@ -20,7 +20,7 @@ * 34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F */ -#include +#include #include typedef u8 u_int8_t; diff --git a/payloads/libpayload/curses/keyboard.c b/payloads/libpayload/curses/keyboard.c index ead4313a98..4a96428f16 100644 --- a/payloads/libpayload/curses/keyboard.c +++ b/payloads/libpayload/curses/keyboard.c @@ -37,7 +37,7 @@ * Actually cook the serial (handle special keys) */ -#include +#include #include #include "local.h" diff --git a/payloads/libpayload/curses/local.h b/payloads/libpayload/curses/local.h index fff26cbc0c..b801e38e5b 100644 --- a/payloads/libpayload/curses/local.h +++ b/payloads/libpayload/curses/local.h @@ -58,7 +58,7 @@ #undef USE_TERMLIB -#include +#include #include #include #include diff --git a/payloads/libpayload/drivers/keyboard.c b/payloads/libpayload/drivers/keyboard.c index 0d8f72b32e..ecec60c35f 100644 --- a/payloads/libpayload/drivers/keyboard.c +++ b/payloads/libpayload/drivers/keyboard.c @@ -27,8 +27,8 @@ * SUCH DAMAGE. */ +#include #include -#include #include #define I8042_CMD_READ_MODE 0x20 diff --git a/payloads/libpayload/drivers/nvram.c b/payloads/libpayload/drivers/nvram.c index 13a718004a..502cf6e587 100644 --- 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 +#include #include diff --git a/payloads/libpayload/drivers/serial.c b/payloads/libpayload/drivers/serial.c index 7a6590cb16..e58f0fc228 100644 --- a/payloads/libpayload/drivers/serial.c +++ b/payloads/libpayload/drivers/serial.c @@ -28,7 +28,7 @@ * SUCH DAMAGE. */ -#include +#include #include #define IOBASE lib_sysinfo.ser_ioport diff --git a/payloads/libpayload/drivers/usb/usb.c b/payloads/libpayload/drivers/usb/usb.c index 2290bc6d09..3820180cbc 100644 --- a/payloads/libpayload/drivers/usb/usb.c +++ b/payloads/libpayload/drivers/usb/usb.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ -#include +#include #include hci_t *usb_hcs = 0; diff --git a/payloads/libpayload/drivers/usb/usbinit.c b/payloads/libpayload/drivers/usb/usbinit.c index 851aa3c9d9..ead98469f7 100644 --- a/payloads/libpayload/drivers/usb/usbinit.c +++ b/payloads/libpayload/drivers/usb/usbinit.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ -#include +#include #include #include "uhci.h" #include diff --git a/payloads/libpayload/drivers/video/video.c b/payloads/libpayload/drivers/video/video.c index a9c070d527..87b16b8a31 100644 --- a/payloads/libpayload/drivers/video/video.c +++ b/payloads/libpayload/drivers/video/video.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ -#include +#include #include #include diff --git a/payloads/libpayload/i386/coreboot.c b/payloads/libpayload/i386/coreboot.c index d27e0f3abb..2a675afbe6 100644 --- a/payloads/libpayload/i386/coreboot.c +++ b/payloads/libpayload/i386/coreboot.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ -#include +#include #include #include diff --git a/payloads/libpayload/i386/multiboot.c b/payloads/libpayload/i386/multiboot.c index 040cc082f1..290283e8ed 100644 --- a/payloads/libpayload/i386/multiboot.c +++ b/payloads/libpayload/i386/multiboot.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ -#include +#include #include #include diff --git a/payloads/libpayload/i386/sysinfo.c b/payloads/libpayload/i386/sysinfo.c index a074361f4f..02e1d3daec 100644 --- a/payloads/libpayload/i386/sysinfo.c +++ b/payloads/libpayload/i386/sysinfo.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ -#include +#include #include #include diff --git a/payloads/libpayload/libc/console.c b/payloads/libpayload/libc/console.c index 8b09c44d51..ea0eba0164 100644 --- a/payloads/libpayload/libc/console.c +++ b/payloads/libpayload/libc/console.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ -#include +#include #include #include diff --git a/payloads/libpayload/libc/exec.c b/payloads/libpayload/libc/exec.c index e0fea8b291..bb531d8f67 100644 --- a/payloads/libpayload/libc/exec.c +++ b/payloads/libpayload/libc/exec.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ -#include +#include #include #ifdef CONFIG_TARGET_I386 diff --git a/payloads/libpayload/libc/time.c b/payloads/libpayload/libc/time.c index b47e452e49..2d19bd173f 100644 --- a/payloads/libpayload/libc/time.c +++ b/payloads/libpayload/libc/time.c @@ -32,7 +32,7 @@ * General time functions */ -#include +#include #include #include diff --git a/payloads/libpayload/sample/hello.c b/payloads/libpayload/sample/hello.c index 8112501474..677a96fc8c 100644 --- a/payloads/libpayload/sample/hello.c +++ b/payloads/libpayload/sample/hello.c @@ -29,6 +29,7 @@ /* Example file for libpayload. */ +#include #include int main(void) -- cgit v1.2.3