9 files changed, 14 insertions, 14 deletions
diff --git a/payloads/libpayload/arch/arm/main.c b/payloads/libpayload/arch/arm/main.c
index b63e0bec56..cb2d242679 100644
--- a/payloads/libpayload/arch/arm/main.c
+++ b/payloads/libpayload/arch/arm/main.c
@@ -48,7 +48,7 @@ void start_main(void)
 	lib_get_sysinfo();
 
 	/* Optionally set up the consoles. */
-#if !IS_ENABLED(CONFIG_LP_SKIP_CONSOLE_INIT)
+#if !CONFIG(LP_SKIP_CONSOLE_INIT)
 	console_init();
 #endif
 
diff --git a/payloads/libpayload/arch/arm64/main.c b/payloads/libpayload/arch/arm64/main.c
index aa2292ffec..593c40e9a1 100644
--- a/payloads/libpayload/arch/arm64/main.c
+++ b/payloads/libpayload/arch/arm64/main.c
@@ -123,7 +123,7 @@ void start_main(void)
 
 	post_sysinfo_scan_mmu_setup();
 
-#if !IS_ENABLED(CONFIG_LP_SKIP_CONSOLE_INIT)
+#if !CONFIG(LP_SKIP_CONSOLE_INIT)
 	console_init();
 #endif
 
diff --git a/payloads/libpayload/arch/mips/main.c b/payloads/libpayload/arch/mips/main.c
index 9f9326e1d4..b8c0c4d039 100644
--- a/payloads/libpayload/arch/mips/main.c
+++ b/payloads/libpayload/arch/mips/main.c
@@ -34,7 +34,7 @@ void start_main(void)
 	lib_get_sysinfo();
 
 	/* Optionally set up the consoles. */
-#if !IS_ENABLED(CONFIG_LP_SKIP_CONSOLE_INIT)
+#if !CONFIG(LP_SKIP_CONSOLE_INIT)
 	console_init();
 #endif
 
diff --git a/payloads/libpayload/arch/x86/delay.c b/payloads/libpayload/arch/x86/delay.c
index a617ce602e..14056dda33 100644
--- a/payloads/libpayload/arch/x86/delay.c
+++ b/payloads/libpayload/arch/x86/delay.c
@@ -50,7 +50,7 @@ void arch_ndelay(uint64_t ns)
 	if (ns > APIC_INTERRUPT_LATENCY_NS)
 		apic_us = (ns - APIC_INTERRUPT_LATENCY_NS) / NSECS_PER_USEC;
 
-	if (IS_ENABLED(CONFIG_LP_ENABLE_APIC) && apic_initialized() && apic_us)
+	if (CONFIG(LP_ENABLE_APIC) && apic_initialized() && apic_us)
 		apic_delay(apic_us);
 
 	if (delta > PAUSE_THRESHOLD_TICKS)
diff --git a/payloads/libpayload/arch/x86/exception.c b/payloads/libpayload/arch/x86/exception.c
index 983a9f3bd2..13ff58ccbe 100644
--- a/payloads/libpayload/arch/x86/exception.c
+++ b/payloads/libpayload/arch/x86/exception.c
@@ -173,10 +173,10 @@ void exception_dispatch(void)
 		handlers[vec](vec);
 		goto success;
 	} else if (vec >= EXC_COUNT
-		   && IS_ENABLED(CONFIG_LP_IGNORE_UNKNOWN_INTERRUPTS)) {
+		   && CONFIG(LP_IGNORE_UNKNOWN_INTERRUPTS)) {
 		goto success;
 	} else if (vec >= EXC_COUNT
-		   && IS_ENABLED(CONFIG_LP_LOG_UNKNOWN_INTERRUPTS)) {
+		   && CONFIG(LP_LOG_UNKNOWN_INTERRUPTS)) {
 		printf("Ignoring interrupt vector %u\n", vec);
 		goto success;
 	}
@@ -192,7 +192,7 @@ void exception_dispatch(void)
 	return;
 
 success:
-	if (IS_ENABLED(CONFIG_LP_ENABLE_APIC))
+	if (CONFIG(LP_ENABLE_APIC))
 		apic_eoi(vec);
 }
 
diff --git a/payloads/libpayload/arch/x86/main.c b/payloads/libpayload/arch/x86/main.c
index 05ffa0d83b..4da0bba9f7 100644
--- a/payloads/libpayload/arch/x86/main.c
+++ b/payloads/libpayload/arch/x86/main.c
@@ -52,13 +52,13 @@ int start_main(void)
 	lib_get_sysinfo();
 
 	/* Optionally set up the consoles. */
-#if !IS_ENABLED(CONFIG_LP_SKIP_CONSOLE_INIT)
+#if !CONFIG(LP_SKIP_CONSOLE_INIT)
 	console_init();
 #endif
 
 	exception_init();
 
-	if (IS_ENABLED(CONFIG_LP_ENABLE_APIC)) {
+	if (CONFIG(LP_ENABLE_APIC)) {
 		apic_init();
 
 		enable_interrupts();
diff --git a/payloads/libpayload/arch/x86/multiboot.c b/payloads/libpayload/arch/x86/multiboot.c
index 1cd0295c47..76eeae33ac 100644
--- a/payloads/libpayload/arch/x86/multiboot.c
+++ b/payloads/libpayload/arch/x86/multiboot.c
@@ -40,7 +40,7 @@ static int mb_add_memrange(struct sysinfo_t *info, unsigned long long base,
 	if (info->n_memranges >= SYSINFO_MAX_MEM_RANGES)
 		return -1;
 
-#if IS_ENABLED(CONFIG_LP_MEMMAP_RAM_ONLY)
+#if CONFIG(LP_MEMMAP_RAM_ONLY)
 	/* 1 == normal RAM.  Ignore everything else for now */
 	if (type != 1)
 		return 0;
diff --git a/payloads/libpayload/arch/x86/rom_media.c b/payloads/libpayload/arch/x86/rom_media.c
index 0c6f521bb5..d9c27fa8b4 100644
--- a/payloads/libpayload/arch/x86/rom_media.c
+++ b/payloads/libpayload/arch/x86/rom_media.c
@@ -83,7 +83,7 @@ int init_x86rom_cbfs_media(struct cbfs_media *media) {
 	struct cbfs_header *header = (struct cbfs_header*)
 			*(uint32_t*)(0xfffffffc);
 	if (CBFS_HEADER_MAGIC != ntohl(header->magic)) {
-#if IS_ENABLED(CONFIG_LP_ROM_SIZE)
+#if CONFIG(LP_ROM_SIZE)
 		printk(BIOS_ERR, "Invalid CBFS master header at %p\n", header);
 		media->context = (void*)CONFIG_LP_ROM_SIZE;
 #else
@@ -92,7 +92,7 @@ int init_x86rom_cbfs_media(struct cbfs_media *media) {
 	} else {
 		uint32_t romsize = ntohl(header->romsize);
 		media->context = (void*)romsize;
-#if IS_ENABLED(CONFIG_LP_ROM_SIZE)
+#if CONFIG(LP_ROM_SIZE)
 		if (CONFIG_LP_ROM_SIZE != romsize)
 			printk(BIOS_INFO, "Warning: rom size unmatch (%d/%d)\n",
 			       CONFIG_LP_ROM_SIZE, romsize);
diff --git a/payloads/libpayload/arch/x86/sysinfo.c b/payloads/libpayload/arch/x86/sysinfo.c
index ddd6550e08..4494f0b415 100644
--- a/payloads/libpayload/arch/x86/sysinfo.c
+++ b/payloads/libpayload/arch/x86/sysinfo.c
@@ -40,7 +40,7 @@
  */
 struct sysinfo_t lib_sysinfo = {
 	.cpu_khz = CPU_KHZ_DEFAULT,
-#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE)
+#if CONFIG(LP_SERIAL_CONSOLE)
 	.ser_ioport = CONFIG_LP_SERIAL_IOBASE,
 #else
 	.ser_ioport = 0x3f8,
@@ -51,7 +51,7 @@ int lib_get_sysinfo(void)
 {
 	int ret;
 
-#if IS_ENABLED(CONFIG_LP_MULTIBOOT)
+#if CONFIG(LP_MULTIBOOT)
 	/* Get the information from the multiboot tables,
 	 * if they exist */
 	get_multiboot_info(&lib_sysinfo);