7 files changed, 13 insertions, 13 deletions
diff --git a/payloads/libpayload/include/cbfs_core.h b/payloads/libpayload/include/cbfs_core.h
index f9d1fc313d..d908d83d9c 100644
--- a/payloads/libpayload/include/cbfs_core.h
+++ b/payloads/libpayload/include/cbfs_core.h
@@ -88,7 +88,7 @@
 /** this is the master cbfs header - it needs to be located somewhere available
     to bootblock (to load romstage).  Where it actually lives is up to coreboot.
     On x86, a pointer to this header will live at 0xFFFFFFFC.
-    For other platforms, you need to define CONFIG_CBFS_HEADER_ROM_OFFSET */
+    For other platforms, you need to define CONFIG_LP_CBFS_HEADER_ROM_OFFSET */
 
 struct cbfs_header {
 	uint32_t magic;
diff --git a/payloads/libpayload/include/endian.h b/payloads/libpayload/include/endian.h
index d4ddb5df4f..ada6bc65b0 100644
--- a/payloads/libpayload/include/endian.h
+++ b/payloads/libpayload/include/endian.h
@@ -45,7 +45,7 @@ static inline uint64_t swap_bytes64(uint64_t in)
 
 /* Endian functions from glibc 2.9 / BSD "endian.h" */
 
-#if defined CONFIG_BIG_ENDIAN
+#if defined CONFIG_LP_BIG_ENDIAN
 
 #define htobe16(in) (in)
 #define htobe32(in) (in)
@@ -55,7 +55,7 @@ static inline uint64_t swap_bytes64(uint64_t in)
 #define htole32(in) swap_bytes32(in)
 #define htole64(in) swap_bytes64(in)
 
-#elif defined CONFIG_LITTLE_ENDIAN
+#elif defined CONFIG_LP_LITTLE_ENDIAN
 
 #define htobe16(in) swap_bytes16(in)
 #define htobe32(in) swap_bytes32(in)
diff --git a/payloads/libpayload/include/kconfig.h b/payloads/libpayload/include/kconfig.h
index 3d7d768f9c..adb3403cf2 100644
--- a/payloads/libpayload/include/kconfig.h
+++ b/payloads/libpayload/include/kconfig.h
@@ -5,10 +5,10 @@
 
 /*
  * Getting something that works in C and CPP for an arg that may or may
- * not be defined is tricky.  Here, if we have "#define CONFIG_BOOGER 1"
+ * not be defined is tricky.  Here, if we have "#define CONFIG_LP_BOOGER 1"
  * we match on the placeholder define, insert the "0," for arg1 and generate
  * the triplet (0, 1, 0).  Then the last step cherry picks the 2nd arg (a one).
- * When CONFIG_BOOGER is not defined, we generate a (... 1, 0) pair, and when
+ * When CONFIG_LP_BOOGER is not defined, we generate a (... 1, 0) pair, and when
  * the last step cherry picks the 2nd arg, we get a zero.
  */
 #define __ARG_PLACEHOLDER_1 0,
diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h
index 14f8a38164..29b5629348 100644
--- a/payloads/libpayload/include/libpayload.h
+++ b/payloads/libpayload/include/libpayload.h
@@ -56,7 +56,7 @@
 #include <arch/virtual.h>
 #include <sysinfo.h>
 #include <pci.h>
-#ifdef CONFIG_LAR
+#ifdef CONFIG_LP_LAR
 #include <lar.h>
 #endif
 
@@ -339,7 +339,7 @@ struct timeval {
 int gettimeofday(struct timeval *tv, void *tz);
 /** @} */
 
-#ifdef CONFIG_LAR
+#ifdef CONFIG_LP_LAR
 /**
  * @defgroup lar LAR functions
  * @{
diff --git a/payloads/libpayload/include/stdlib.h b/payloads/libpayload/include/stdlib.h
index cf37c8056f..92a13e38e7 100644
--- a/payloads/libpayload/include/stdlib.h
+++ b/payloads/libpayload/include/stdlib.h
@@ -36,7 +36,7 @@
  * @defgroup malloc Memory allocation functions
  * @{
  */
-#if defined(CONFIG_DEBUG_MALLOC) && !defined(IN_MALLOC_C)
+#if defined(CONFIG_LP_DEBUG_MALLOC) && !defined(IN_MALLOC_C)
 #define free(p)	\
 	({ \
 	 extern void print_malloc_map(void); \
diff --git a/payloads/libpayload/include/storage/storage.h b/payloads/libpayload/include/storage/storage.h
index ef61cd287d..a3cebd90bd 100644
--- a/payloads/libpayload/include/storage/storage.h
+++ b/payloads/libpayload/include/storage/storage.h
@@ -34,7 +34,7 @@
 #include <unistd.h>
 
 
-#ifndef CONFIG_STORAGE_64BIT_LBA
+#ifndef CONFIG_LP_STORAGE_64BIT_LBA
 typedef u32 lba_t;
 #else
 typedef u64 lba_t;
diff --git a/payloads/libpayload/include/sysinfo.h b/payloads/libpayload/include/sysinfo.h
index e2ceffc259..92b8dcabf0 100644
--- a/payloads/libpayload/include/sysinfo.h
+++ b/payloads/libpayload/include/sysinfo.h
@@ -63,7 +63,7 @@ struct sysinfo_t {
 	u32 cmos_range_start;
 	u32 cmos_range_end;
 	u32 cmos_checksum_location;
-#ifdef CONFIG_CHROMEOS
+#ifdef CONFIG_LP_CHROMEOS
 	u32 vbnv_start;
 	u32 vbnv_size;
 #endif
@@ -83,7 +83,7 @@ struct sysinfo_t {
 
 	struct cb_framebuffer *framebuffer;
 
-#ifdef CONFIG_CHROMEOS
+#ifdef CONFIG_LP_CHROMEOS
 	int num_gpios;
 	struct cb_gpio gpios[SYSINFO_MAX_GPIOS];
 #endif
@@ -93,14 +93,14 @@ struct sysinfo_t {
 	struct cb_header *header;
 	struct cb_mainboard *mainboard;
 
-#ifdef CONFIG_CHROMEOS
+#ifdef CONFIG_LP_CHROMEOS
 	void	*vboot_handoff;
 	u32	vboot_handoff_size;
 	void	*vdat_addr;
 	u32	vdat_size;
 #endif
 
-#ifdef CONFIG_ARCH_X86
+#ifdef CONFIG_LP_ARCH_X86
 	int x86_rom_var_mtrr_index;
 #endif