3 files changed, 8 insertions, 8 deletions
diff --git a/payloads/libpayload/libcbfs/Makefile.inc b/payloads/libpayload/libcbfs/Makefile.inc
index 0d3e1ec59a..72f6b790ad 100644
--- a/payloads/libpayload/libcbfs/Makefile.inc
+++ b/payloads/libpayload/libcbfs/Makefile.inc
@@ -27,6 +27,6 @@
 ## SUCH DAMAGE.
 ##
 
-libcbfs-$(CONFIG_CBFS) += cbfs.c
-libcbfs-$(CONFIG_CBFS) += ram_media.c
+libcbfs-$(CONFIG_LP_CBFS) += cbfs.c
+libcbfs-$(CONFIG_LP_CBFS) += ram_media.c
 
diff --git a/payloads/libpayload/libcbfs/cbfs.c b/payloads/libpayload/libcbfs/cbfs.c
index c143abb5e0..561055534a 100644
--- a/payloads/libpayload/libcbfs/cbfs.c
+++ b/payloads/libpayload/libcbfs/cbfs.c
@@ -31,7 +31,7 @@
 
 #ifdef LIBPAYLOAD
 # include <libpayload-config.h>
-# ifdef CONFIG_LZMA
+# ifdef CONFIG_LP_LZMA
 #  include <lzma.h>
 #  define CBFS_CORE_WITH_LZMA
 # endif
@@ -55,15 +55,15 @@
 # include <console/console.h>
 # define ERROR(x...) printk(BIOS_ERR, "CBFS: " x)
 # define LOG(x...) printk(BIOS_INFO, "CBFS: " x)
-# if CONFIG_DEBUG_CBFS
+# if CONFIG_LP_DEBUG_CBFS
 #  define DEBUG(x...) printk(BIOS_SPEW, "CBFS: " x)
 # else
 #  define DEBUG(x...)
 # endif
 #endif
 
-#if defined(CONFIG_CBFS_HEADER_ROM_OFFSET) && (CONFIG_CBFS_HEADER_ROM_OFFSET)
-# define CBFS_HEADER_ROM_ADDRESS (CONFIG_CBFS_HEADER_ROM_OFFSET)
+#if defined(CONFIG_LP_CBFS_HEADER_ROM_OFFSET) && (CONFIG_LP_CBFS_HEADER_ROM_OFFSET)
+# define CBFS_HEADER_ROM_ADDRESS (CONFIG_LP_CBFS_HEADER_ROM_OFFSET)
 #else
 /* ugly hack: this assumes that "media" exists
               in the scope where the macro is used. */
diff --git a/payloads/libpayload/libcbfs/cbfs_core.c b/payloads/libpayload/libcbfs/cbfs_core.c
index d14cf61a67..a3d3e02467 100644
--- a/payloads/libpayload/libcbfs/cbfs_core.c
+++ b/payloads/libpayload/libcbfs/cbfs_core.c
@@ -69,7 +69,7 @@ const struct cbfs_header *cbfs_get_header(struct cbfs_media *media)
 
 	media->open(media);
 	DEBUG("CBFS_HEADER_ROM_ADDRESS: 0x%x/0x%x\n", CBFS_HEADER_ROM_ADDRESS,
-	      CONFIG_ROM_SIZE);
+	      CONFIG_LP_ROM_SIZE);
 	header = media->map(media, CBFS_HEADER_ROM_ADDRESS, sizeof(*header));
 	media->close(media);
 
@@ -118,7 +118,7 @@ struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name)
 
 	// TODO Add a "size" in CBFS header for a platform independent way to
 	// determine the end of CBFS data.
-#if defined(CONFIG_ARCH_X86) && CONFIG_ARCH_X86
+#if defined(CONFIG_LP_ARCH_X86) && CONFIG_LP_ARCH_X86
 	romsize -= htonl(header->bootblocksize);
 #endif
 	DEBUG("CBFS location: 0x%x~0x%x, align: %d\n", offset, romsize, align);