libpayload: Change CONFIG_* to CONFIG_LP_* in the kconfig.

When libpayload header files are included in the payload itself, it's possible
that the payloads config settings will conflict with the ones in libpayload.
It's also possible for the libpayload config settings to conflict with the
payloads. To avoid that, the libpayload config settings have _LP_ (for
libpayload) added to them. The symbols themselves as defined in the Config.in files
are still the same, but the prefix added to them is now CONFIG_LP_ instead of just
CONFIG_.

Change-Id: Ib8a46d202e7880afdeac7924d69a949bfbcc5f97
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: https://gerrit.chromium.org/gerrit/65303
Reviewed-by: Stefan Reinauer <reinauer@google.com>
Tested-by: Gabe Black <gabeblack@chromium.org>
Commit-Queue: Gabe Black <gabeblack@chromium.org>
(cherry picked from commit 23e866da20862cace0ed2a67d6fb74056bc9ea9a)
Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com>
Reviewed-on: http://review.coreboot.org/6427
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Marc Jones <marc.jones@se-eng.com>

5 files changed, 26 insertions, 26 deletions

diff --git a/payloads/libpayload/libc/Makefile.inc b/payloads/libpayload/libc/Makefile.inc
index edeb0d99fe..53f3c9b1bb 100644
--- a/payloads/libpayload/libc/Makefile.inc
+++ b/payloads/libpayload/libc/Makefile.inc
@@ -28,14 +28,14 @@
 ## SUCH DAMAGE.
 ##
 
-libc-$(CONFIG_LIBC) += malloc.c printf.c console.c string.c
-libc-$(CONFIG_LIBC) += memory.c ctype.c ipchecksum.c lib.c
-libc-$(CONFIG_LIBC) += rand.c time.c exec.c
-libc-$(CONFIG_LIBC) += readline.c getopt_long.c sysinfo.c
-libc-$(CONFIG_LIBC) += args.c strings.c
-libc-$(CONFIG_LIBC) += strlcpy.c
-libc-$(CONFIG_LIBC) += qsort.c
-libc-$(CONFIG_LIBC) += hexdump.c
+libc-$(CONFIG_LP_LIBC) += malloc.c printf.c console.c string.c
+libc-$(CONFIG_LP_LIBC) += memory.c ctype.c ipchecksum.c lib.c
+libc-$(CONFIG_LP_LIBC) += rand.c time.c exec.c
+libc-$(CONFIG_LP_LIBC) += readline.c getopt_long.c sysinfo.c
+libc-$(CONFIG_LP_LIBC) += args.c strings.c
+libc-$(CONFIG_LP_LIBC) += strlcpy.c
+libc-$(CONFIG_LP_LIBC) += qsort.c
+libc-$(CONFIG_LP_LIBC) += hexdump.c
 
 # should be moved to coreboot directory
-libc-$(CONFIG_LAR) += lar.c
+libc-$(CONFIG_LP_LAR) += lar.c
diff --git a/payloads/libpayload/libc/console.c b/payloads/libpayload/libc/console.c
index 54844db79b..a362481b15 100644
--- a/payloads/libpayload/libc/console.c
+++ b/payloads/libpayload/libc/console.c
@@ -49,16 +49,16 @@ void console_add_input_driver(struct console_input_driver *in)
 
 void console_init(void)
 {
-#ifdef CONFIG_VIDEO_CONSOLE
+#ifdef CONFIG_LP_VIDEO_CONSOLE
 	video_console_init();
 #endif
-#ifdef CONFIG_SERIAL_CONSOLE
+#ifdef CONFIG_LP_SERIAL_CONSOLE
 	serial_init();
 #endif
-#ifdef CONFIG_PC_KEYBOARD
+#ifdef CONFIG_LP_PC_KEYBOARD
 	keyboard_init();
 #endif
-#ifdef CONFIG_CBMEM_CONSOLE
+#ifdef CONFIG_LP_CBMEM_CONSOLE
 	cbmem_console_init();
 #endif
 }
@@ -94,7 +94,7 @@ int puts(const char *s)
 
 int havekey(void)
 {
-#ifdef CONFIG_USB
+#ifdef CONFIG_LP_USB
 	usb_poll();
 #endif
 	struct console_input_driver *in;
@@ -111,7 +111,7 @@ int havekey(void)
 int getchar(void)
 {
 	while (1) {
-#ifdef CONFIG_USB
+#ifdef CONFIG_LP_USB
 		usb_poll();
 #endif
 		struct console_input_driver *in;
diff --git a/payloads/libpayload/libc/exec.c b/payloads/libpayload/libc/exec.c
index 13a1e5a8cd..4360bd595c 100644
--- a/payloads/libpayload/libc/exec.c
+++ b/payloads/libpayload/libc/exec.c
@@ -30,7 +30,7 @@
 #include <libpayload-config.h>
 #include <libpayload.h>
 
-#ifdef CONFIG_ARCH_X86
+#ifdef CONFIG_LP_ARCH_X86
 extern void i386_do_exec(long addr, int argc, char **argv, int *ret);
 #endif
 
@@ -46,7 +46,7 @@ int exec(long addr, int argc, char **argv)
 {
 	int val = -1;
 
-#ifdef CONFIG_ARCH_X86
+#ifdef CONFIG_LP_ARCH_X86
 	i386_do_exec(addr, argc, argv, &val);
 #endif
 	return val;
diff --git a/payloads/libpayload/libc/malloc.c b/payloads/libpayload/libc/malloc.c
index 851ef574e2..f022f7349a 100644
--- a/payloads/libpayload/libc/malloc.c
+++ b/payloads/libpayload/libc/malloc.c
@@ -68,7 +68,7 @@ typedef u64 hdrtype_t;
 static int free_aligned(void* addr);
 void print_malloc_map(void);
 
-#ifdef CONFIG_DEBUG_MALLOC
+#ifdef CONFIG_LP_DEBUG_MALLOC
 static int heap_initialized = 0;
 static int minimal_free = 0;
 #endif
@@ -77,7 +77,7 @@ static void setup(hdrtype_t volatile *start, int size)
 {
 	*start = FREE_BLOCK(size);
 
-#ifdef CONFIG_DEBUG_MALLOC
+#ifdef CONFIG_LP_DEBUG_MALLOC
 	heap_initialized = 1;
 	minimal_free  = size;
 #endif
@@ -282,7 +282,7 @@ static struct align_region_t* align_regions = 0;
 static struct align_region_t *allocate_region(int alignment, int num_elements)
 {
 	struct align_region_t *new_region;
-#ifdef CONFIG_DEBUG_MALLOC
+#ifdef CONFIG_LP_DEBUG_MALLOC
 	printf("%s(old align_regions=%p, alignment=%u, num_elements=%u)\n",
 			__func__, align_regions, alignment, num_elements);
 #endif
@@ -344,7 +344,7 @@ look_further:
 	{
 		if ((reg->alignment == align) && (reg->free >= (size + align - 1)/align))
 		{
-#ifdef CONFIG_DEBUG_MALLOC
+#ifdef CONFIG_LP_DEBUG_MALLOC
 			printf("  found memalign region. %x free, %x required\n", reg->free, (size + align - 1)/align);
 #endif
 			break;
@@ -353,12 +353,12 @@ look_further:
 	}
 	if (reg == 0)
 	{
-#ifdef CONFIG_DEBUG_MALLOC
+#ifdef CONFIG_LP_DEBUG_MALLOC
 		printf("  need to allocate a new memalign region\n");
 #endif
 		/* get align regions */
 		reg = allocate_region(align, (size<1024)?(1024/align):(((size-1)/align)+1));
-#ifdef CONFIG_DEBUG_MALLOC
+#ifdef CONFIG_LP_DEBUG_MALLOC
 		printf("  ... returned %p\n", align_regions);
 #endif
 	}
@@ -394,7 +394,7 @@ look_further:
 }
 
 /* This is for debugging purposes. */
-#ifdef CONFIG_DEBUG_MALLOC
+#ifdef CONFIG_LP_DEBUG_MALLOC
 void print_malloc_map(void)
 {
 	void *ptr = hstart;
diff --git a/payloads/libpayload/libc/time.c b/payloads/libpayload/libc/time.c
index 7b6bf47cdf..ec1c85ce8c 100644
--- a/payloads/libpayload/libc/time.c
+++ b/payloads/libpayload/libc/time.c
@@ -34,7 +34,7 @@
 
 #include <libpayload-config.h>
 #include <libpayload.h>
-#ifdef CONFIG_ARCH_X86
+#ifdef CONFIG_LP_ARCH_X86
 #include <arch/rdtsc.h>
 #endif
 
@@ -70,7 +70,7 @@ static void update_clock(void)
 	}
 }
 
-#ifdef CONFIG_NVRAM
+#ifdef CONFIG_LP_NVRAM
 
 static unsigned int day_of_year(int mon, int day, int year)
 {