payloads: Replace all IS_ENABLED(CONFIG_XXX) with CONFIG(XXX)

This patch is a raw application of

 find payloads/ -type f | \
   xargs sed -i -e 's/IS_ENABLED\s*(CONFIG_/CONFIG(/g'

Change-Id: I883b03b189f59b5d998a09a2596b0391a2d5cf33
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31775
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>

19 files changed, 57 insertions, 57 deletions

diff --git a/payloads/libpayload/drivers/i8042/i8042.c b/payloads/libpayload/drivers/i8042/i8042.c
index 4cdd0be7ad..e97fab8429 100644
--- a/payloads/libpayload/drivers/i8042/i8042.c
+++ b/payloads/libpayload/drivers/i8042/i8042.c
@@ -229,7 +229,7 @@ u8 i8042_probe(void)
 	}
 
 	/* Test secondary port */
-	if (IS_ENABLED(CONFIG_LP_PC_MOUSE)) {
+	if (CONFIG(LP_PC_MOUSE)) {
 		if (i8042_cmd_with_response(I8042_CMD_AUX_TEST) == 0)
 			aux_fifo = fifo_init(4 * 32);
 	}
diff --git a/payloads/libpayload/drivers/i8042/keyboard.c b/payloads/libpayload/drivers/i8042/keyboard.c
index a0d5b63e13..be22497898 100644
--- a/payloads/libpayload/drivers/i8042/keyboard.c
+++ b/payloads/libpayload/drivers/i8042/keyboard.c
@@ -45,7 +45,7 @@ static struct layout_maps *map;
 static int modifier = 0;
 
 static struct layout_maps keyboard_layouts[] = {
-#if IS_ENABLED(CONFIG_LP_PC_KEYBOARD_LAYOUT_US)
+#if CONFIG(LP_PC_KEYBOARD_LAYOUT_US)
 { .country = "us", .map = {
 	{ /* No modifier */
 	 0x00, 0x1B, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
@@ -101,7 +101,7 @@ static struct layout_maps keyboard_layouts[] = {
 	 }
 }},
 #endif
-#if IS_ENABLED(CONFIG_LP_PC_KEYBOARD_LAYOUT_DE)
+#if CONFIG(LP_PC_KEYBOARD_LAYOUT_DE)
 { .country = "de", .map = {
 	{ /* No modifier */
 	 0x00, 0x1B, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
@@ -309,16 +309,16 @@ void keyboard_init(void)
 
 	/* Set scancode set 1 */
 	ret = keyboard_cmd(I8042_KBCMD_SET_SCANCODE);
-	if (!ret && !IS_ENABLED(CONFIG_LP_PC_KEYBOARD_IGNORE_INIT_FAILURE))
+	if (!ret && !CONFIG(LP_PC_KEYBOARD_IGNORE_INIT_FAILURE))
 		return;
 
 	ret = keyboard_cmd(I8042_SCANCODE_SET_1);
-	if (!ret && !IS_ENABLED(CONFIG_LP_PC_KEYBOARD_IGNORE_INIT_FAILURE))
+	if (!ret && !CONFIG(LP_PC_KEYBOARD_IGNORE_INIT_FAILURE))
 		return;
 
 	/* Enable scanning */
 	ret = keyboard_cmd(I8042_KBCMD_EN);
-	if (!ret && !IS_ENABLED(CONFIG_LP_PC_KEYBOARD_IGNORE_INIT_FAILURE))
+	if (!ret && !CONFIG(LP_PC_KEYBOARD_IGNORE_INIT_FAILURE))
 		return;
 
 	console_add_input_driver(&cons);
diff --git a/payloads/libpayload/drivers/mouse_cursor.c b/payloads/libpayload/drivers/mouse_cursor.c
index 40c8934889..7006b4dee0 100644
--- a/payloads/libpayload/drivers/mouse_cursor.c
+++ b/payloads/libpayload/drivers/mouse_cursor.c
@@ -60,7 +60,7 @@ void mouse_cursor_add_input_driver(struct mouse_cursor_input_driver *const in)
 /** Init enabled mouse cursor drivers */
 void mouse_cursor_init(void)
 {
-#if IS_ENABLED(CONFIG_LP_PC_MOUSE)
+#if CONFIG(LP_PC_MOUSE)
 	i8042_mouse_init();
 #endif
 }
diff --git a/payloads/libpayload/drivers/nvram.c b/payloads/libpayload/drivers/nvram.c
index c82533173f..a116d1b65f 100644
--- a/payloads/libpayload/drivers/nvram.c
+++ b/payloads/libpayload/drivers/nvram.c
@@ -60,7 +60,7 @@
  * doesn't try to do this on its own.
  */
 #define RTC_PORT_STANDARD      0x70
-#if IS_ENABLED(CONFIG_LP_RTC_PORT_EXTENDED_VIA)
+#if CONFIG(LP_RTC_PORT_EXTENDED_VIA)
 #define RTC_PORT_EXTENDED      0x74
 #else
 #define RTC_PORT_EXTENDED      0x72
diff --git a/payloads/libpayload/drivers/serial/8250.c b/payloads/libpayload/drivers/serial/8250.c
index 9327304248..f503bdb124 100644
--- a/payloads/libpayload/drivers/serial/8250.c
+++ b/payloads/libpayload/drivers/serial/8250.c
@@ -41,7 +41,7 @@ static uint8_t serial_read_reg(int offset)
 {
 	offset *= lib_sysinfo.serial->regwidth;
 
-#if IS_ENABLED(CONFIG_LP_IO_ADDRESS_SPACE)
+#if CONFIG(LP_IO_ADDRESS_SPACE)
 	if (!serial_is_mem_mapped)
 		return inb(IOBASE + offset);
 	else
@@ -56,7 +56,7 @@ static void serial_write_reg(uint8_t val, int offset)
 {
 	offset *= lib_sysinfo.serial->regwidth;
 
-#if IS_ENABLED(CONFIG_LP_IO_ADDRESS_SPACE)
+#if CONFIG(LP_IO_ADDRESS_SPACE)
 	if (!serial_is_mem_mapped)
 		outb(val, IOBASE + offset);
 	else
@@ -67,13 +67,13 @@ static void serial_write_reg(uint8_t val, int offset)
 			writeb(val, MEMBASE + offset);
 }
 
-#if IS_ENABLED(CONFIG_LP_SERIAL_SET_SPEED)
+#if CONFIG(LP_SERIAL_SET_SPEED)
 static void serial_hardware_init(int speed, int word_bits,
 				 int parity, int stop_bits)
 {
 	unsigned char reg;
 
-#if !IS_ENABLED(CONFIG_LP_PL011_SERIAL_CONSOLE)
+#if !CONFIG(LP_PL011_SERIAL_CONSOLE)
 	/* Disable interrupts. */
 	serial_write_reg(0, 0x01);
 
@@ -114,7 +114,7 @@ void serial_init(void)
 		(lib_sysinfo.serial->type == CB_SERIAL_TYPE_MEMORY_MAPPED);
 
 	if (!serial_is_mem_mapped) {
-#if IS_ENABLED(CONFIG_LP_IO_ADDRESS_SPACE)
+#if CONFIG(LP_IO_ADDRESS_SPACE)
 		if ((inb(IOBASE + 0x05) == 0xFF) &&
 				(inb(IOBASE + 0x06) == 0xFF)) {
 			printf("IO space mapped serial not present.");
@@ -126,7 +126,7 @@ void serial_init(void)
 #endif
 	}
 
-#if IS_ENABLED(CONFIG_LP_SERIAL_SET_SPEED)
+#if CONFIG(LP_SERIAL_SET_SPEED)
 	serial_hardware_init(CONFIG_LP_SERIAL_BAUD_RATE, 8, 0, 1);
 #endif
 }
@@ -147,7 +147,7 @@ void serial_putchar(unsigned int c)
 {
 	if (!serial_hardware_is_present)
 		return;
-#if !IS_ENABLED(CONFIG_LP_PL011_SERIAL_CONSOLE)
+#if !CONFIG(LP_PL011_SERIAL_CONSOLE)
 	while ((serial_read_reg(0x05) & 0x20) == 0) ;
 #endif
 	serial_write_reg(c, 0x00);
diff --git a/payloads/libpayload/drivers/storage/ahci.c b/payloads/libpayload/drivers/storage/ahci.c
index bb0d37eecb..fbfcf97255 100644
--- a/payloads/libpayload/drivers/storage/ahci.c
+++ b/payloads/libpayload/drivers/storage/ahci.c
@@ -153,7 +153,7 @@ static int ahci_dev_init(hba_ctrl_t *const ctrl,
 	switch (port->signature) {
 	case HBA_PxSIG_ATA:
 		printf("ahci: ATA drive on port #%d.\n", portnum);
-#if IS_ENABLED(CONFIG_LP_STORAGE_ATA)
+#if CONFIG(LP_STORAGE_ATA)
 		dev->ata_dev.identify = ahci_identify_device;
 		dev->ata_dev.read_sectors = ahci_ata_read_sectors;
 		return ata_attach_device(&dev->ata_dev, PORT_TYPE_SATA);
@@ -161,7 +161,7 @@ static int ahci_dev_init(hba_ctrl_t *const ctrl,
 		break;
 	case HBA_PxSIG_ATAPI:
 		printf("ahci: ATAPI drive on port #%d.\n", portnum);
-#if IS_ENABLED(CONFIG_LP_STORAGE_ATAPI)
+#if CONFIG(LP_STORAGE_ATAPI)
 		dev->atapi_dev.identify = ahci_identify_device;
 		dev->atapi_dev.packet_read_cmd = ahci_packet_read_cmd;
 		return atapi_attach_device(&dev->atapi_dev, PORT_TYPE_SATA);
@@ -218,7 +218,7 @@ static void ahci_port_probe(hba_ctrl_t *const ctrl,
 	ahci_dev_init(ctrl, port, portnum);
 }
 
-#if IS_ENABLED(CONFIG_LP_STORAGE_AHCI_ONLY_TESTED)
+#if CONFIG(LP_STORAGE_AHCI_ONLY_TESTED)
 static u32 working_controllers[] = {
 	0x8086 | 0x2929 << 16, /* Mobile ICH9 */
 	0x8086 | 0x1c03 << 16, /* Mobile Cougar Point PCH */
@@ -236,7 +236,7 @@ static void ahci_init_pci(pcidev_t dev)
 	const u16 vendor = pci_read_config16(dev, 0x00);
 	const u16 device = pci_read_config16(dev, 0x02);
 
-#if IS_ENABLED(CONFIG_LP_STORAGE_AHCI_ONLY_TESTED)
+#if CONFIG(LP_STORAGE_AHCI_ONLY_TESTED)
 	const u32 vendor_device = pci_read_config32(dev, 0x0);
 	for (i = 0; i < ARRAY_SIZE(working_controllers); ++i)
 		if (vendor_device == working_controllers[i])
diff --git a/payloads/libpayload/drivers/storage/ahci_ata.c b/payloads/libpayload/drivers/storage/ahci_ata.c
index 2c916fda49..94c13e009c 100644
--- a/payloads/libpayload/drivers/storage/ahci_ata.c
+++ b/payloads/libpayload/drivers/storage/ahci_ata.c
@@ -56,7 +56,7 @@ ssize_t ahci_ata_read_sectors(ata_dev_t *const ata_dev,
 		       printf("ahci: Sector count too high (max. 256).\n");
 		       count = 256;
 		}
-#if IS_ENABLED(CONFIG_LP_STORAGE_64BIT_LBA)
+#if CONFIG(LP_STORAGE_64BIT_LBA)
 	} else if (ata_dev->read_cmd == ATA_READ_DMA_EXT) {
 		if (start >= (1ULL << 48)) {
 			printf("ahci: Sector is not 48-bit addressable.\n");
@@ -84,7 +84,7 @@ ssize_t ahci_ata_read_sectors(ata_dev_t *const ata_dev,
 	dev->cmdtable->fis[ 6] = (start >> 16) & 0xff;
 	dev->cmdtable->fis[ 7] = FIS_H2D_DEV_LBA;
 	dev->cmdtable->fis[ 8] = (start >> 24) & 0xff;
-#if IS_ENABLED(CONFIG_LP_STORAGE_64BIT_LBA)
+#if CONFIG(LP_STORAGE_64BIT_LBA)
 	if (ata_dev->read_cmd == ATA_READ_DMA_EXT) {
 		dev->cmdtable->fis[ 9] = (start >> 32) & 0xff;
 		dev->cmdtable->fis[10] = (start >> 40) & 0xff;
diff --git a/payloads/libpayload/drivers/storage/ata.c b/payloads/libpayload/drivers/storage/ata.c
index 80178c313d..91ddf59e60 100644
--- a/payloads/libpayload/drivers/storage/ata.c
+++ b/payloads/libpayload/drivers/storage/ata.c
@@ -212,7 +212,7 @@ int ata_attach_device(ata_dev_t *const dev, const storage_port_t port_type)
 	ata_strncpy(model, id + 27, sizeof(model));
 	printf("ata: Identified %s [%s]\n", model, fw);
 
-#if IS_ENABLED(CONFIG_LP_STORAGE_64BIT_LBA)
+#if CONFIG(LP_STORAGE_64BIT_LBA)
 	if (id[ATA_CMDS_AND_FEATURE_SETS + 1] & (1 << 10)) {
 		printf("ata: Support for LBA-48 enabled.\n");
 		dev->read_cmd = ATA_READ_DMA_EXT;
diff --git a/payloads/libpayload/drivers/storage/storage.c b/payloads/libpayload/drivers/storage/storage.c
index c4cfd40293..a7141ee772 100644
--- a/payloads/libpayload/drivers/storage/storage.c
+++ b/payloads/libpayload/drivers/storage/storage.c
@@ -28,7 +28,7 @@
  */
 
 #include <libpayload.h>
-#if IS_ENABLED(CONFIG_LP_STORAGE_AHCI)
+#if CONFIG(LP_STORAGE_AHCI)
 # include <storage/ahci.h>
 #endif
 #include <storage/storage.h>
@@ -110,7 +110,7 @@ ssize_t storage_read_blocks512(const size_t dev_num,
  */
 void storage_initialize(void)
 {
-#if IS_ENABLED(CONFIG_LP_STORAGE_AHCI)
+#if CONFIG(LP_STORAGE_AHCI)
 	ahci_initialize();
 #endif
 }
diff --git a/payloads/libpayload/drivers/usb/ehci.c b/payloads/libpayload/drivers/usb/ehci.c
index eb59d979a5..30cf191433 100644
--- a/payloads/libpayload/drivers/usb/ehci.c
+++ b/payloads/libpayload/drivers/usb/ehci.c
@@ -850,7 +850,7 @@ ehci_init (unsigned long physical_bar)
 	return controller;
 }
 
-#if IS_ENABLED(CONFIG_LP_USB_PCI)
+#if CONFIG(LP_USB_PCI)
 hci_t *
 ehci_pci_init (pcidev_t addr)
 {
diff --git a/payloads/libpayload/drivers/usb/ehci_rh.c b/payloads/libpayload/drivers/usb/ehci_rh.c
index da8d8aff8b..d3fc9799a9 100644
--- a/payloads/libpayload/drivers/usb/ehci_rh.c
+++ b/payloads/libpayload/drivers/usb/ehci_rh.c
@@ -102,7 +102,7 @@ ehci_rh_scanport (usbdev_t *dev, int port)
 	/* device connected, handle */
 	if (RH_INST(dev)->ports[port] & P_CURR_CONN_STATUS) {
 		mdelay(100); // usb20 spec 9.1.2
-		if (!IS_ENABLED(CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT) &&
+		if (!CONFIG(LP_USB_EHCI_HOSTPC_ROOT_HUB_TT) &&
 				(RH_INST(dev)->ports[port] & P_LINE_STATUS) ==
 				P_LINE_STATUS_LOWSPEED) {
 			ehci_rh_hand_over_port(dev, port);
@@ -138,7 +138,7 @@ ehci_rh_scanport (usbdev_t *dev, int port)
 			ehci_rh_hand_over_port(dev, port);
 			return;
 		}
-		if (IS_ENABLED(CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT)) {
+		if (CONFIG(LP_USB_EHCI_HOSTPC_ROOT_HUB_TT)) {
 			port_speed = (usb_speed)
 				((EHCI_INST(dev->controller)->operation->hostpc
 				>> 25) & 0x03);
diff --git a/payloads/libpayload/drivers/usb/ohci.c b/payloads/libpayload/drivers/usb/ohci.c
index dcf7169f6a..1964689b41 100644
--- a/payloads/libpayload/drivers/usb/ohci.c
+++ b/payloads/libpayload/drivers/usb/ohci.c
@@ -247,7 +247,7 @@ ohci_init (unsigned long physical_bar)
 	return controller;
 }
 
-#if IS_ENABLED(CONFIG_LP_USB_PCI)
+#if CONFIG(LP_USB_PCI)
 hci_t *
 ohci_pci_init (pcidev_t addr)
 {
diff --git a/payloads/libpayload/drivers/usb/usb.c b/payloads/libpayload/drivers/usb/usb.c
index 62604a27ca..9c9854da76 100644
--- a/payloads/libpayload/drivers/usb/usb.c
+++ b/payloads/libpayload/drivers/usb/usb.c
@@ -563,7 +563,7 @@ set_address (hci_t *controller, usb_speed speed, int hubport, int hubaddr)
 		break;
 	case hid_device:
 		usb_debug ("HID\n");
-#if IS_ENABLED(CONFIG_LP_USB_HID)
+#if CONFIG(LP_USB_HID)
 		dev->init = usb_hid_init;
 		return dev->address;
 #else
@@ -581,7 +581,7 @@ set_address (hci_t *controller, usb_speed speed, int hubport, int hubaddr)
 		break;
 	case msc_device:
 		usb_debug ("MSC\n");
-#if IS_ENABLED(CONFIG_LP_USB_MSC)
+#if CONFIG(LP_USB_MSC)
 		dev->init = usb_msc_init;
 		return dev->address;
 #else
@@ -590,7 +590,7 @@ set_address (hci_t *controller, usb_speed speed, int hubport, int hubaddr)
 		break;
 	case hub_device:
 		usb_debug ("hub\n");
-#if IS_ENABLED(CONFIG_LP_USB_HUB)
+#if CONFIG(LP_USB_HUB)
 		dev->init = usb_hub_init;
 		return dev->address;
 #else
diff --git a/payloads/libpayload/drivers/usb/usbhid.c b/payloads/libpayload/drivers/usb/usbhid.c
index 22ed8e7885..072530cc5e 100644
--- a/payloads/libpayload/drivers/usb/usbhid.c
+++ b/payloads/libpayload/drivers/usb/usbhid.c
@@ -142,7 +142,7 @@ struct layout_maps {
 static const struct layout_maps *map;
 
 static const struct layout_maps keyboard_layouts[] = {
-// #if IS_ENABLED(CONFIG_LP_PC_KEYBOARD_LAYOUT_US)
+// #if CONFIG(LP_PC_KEYBOARD_LAYOUT_US)
 { .country = "us", .map = {
 	{ /* No modifier */
 	-1, -1, -1, -1, 'a', 'b', 'c', 'd',
diff --git a/payloads/libpayload/drivers/usb/usbinit.c b/payloads/libpayload/drivers/usb/usbinit.c
index 721fde8a93..0ac27e4456 100644
--- a/payloads/libpayload/drivers/usb/usbinit.c
+++ b/payloads/libpayload/drivers/usb/usbinit.c
@@ -37,7 +37,7 @@
 #include "dwc2.h"
 #include <usb/usbdisk.h>
 
-#if IS_ENABLED(CONFIG_LP_USB_PCI)
+#if CONFIG(LP_USB_PCI)
 /**
  * Initializes USB controller attached to PCI
  *
@@ -72,7 +72,7 @@ static int usb_controller_initialize(int bus, int dev, int func)
 			pciid >> 16, pciid & 0xFFFF, func);
 		switch (prog_if) {
 		case 0x00:
-#if IS_ENABLED(CONFIG_LP_USB_UHCI)
+#if CONFIG(LP_USB_UHCI)
 			usb_debug("UHCI controller\n");
 			uhci_pci_init (pci_device);
 #else
@@ -81,7 +81,7 @@ static int usb_controller_initialize(int bus, int dev, int func)
 			break;
 
 		case 0x10:
-#if IS_ENABLED(CONFIG_LP_USB_OHCI)
+#if CONFIG(LP_USB_OHCI)
 			usb_debug("OHCI controller\n");
 			ohci_pci_init(pci_device);
 #else
@@ -90,7 +90,7 @@ static int usb_controller_initialize(int bus, int dev, int func)
 			break;
 
 		case 0x20:
-#if IS_ENABLED(CONFIG_LP_USB_EHCI)
+#if CONFIG(LP_USB_EHCI)
 			usb_debug("EHCI controller\n");
 			ehci_pci_init(pci_device);
 #else
@@ -99,7 +99,7 @@ static int usb_controller_initialize(int bus, int dev, int func)
 			break;
 
 		case 0x30:
-#if IS_ENABLED(CONFIG_LP_USB_XHCI)
+#if CONFIG(LP_USB_XHCI)
 			usb_debug("xHCI controller\n");
 			xhci_pci_init(pci_device);
 #else
@@ -166,7 +166,7 @@ static void usb_scan_pci_bus(int bus)
  */
 int usb_initialize(void)
 {
-#if IS_ENABLED(CONFIG_LP_USB_PCI)
+#if CONFIG(LP_USB_PCI)
 	usb_scan_pci_bus(0);
 #endif
 	return 0;
@@ -175,19 +175,19 @@ int usb_initialize(void)
 hci_t *usb_add_mmio_hc(hc_type type, void *bar)
 {
 	switch (type) {
-#if IS_ENABLED(CONFIG_LP_USB_OHCI)
+#if CONFIG(LP_USB_OHCI)
 	case OHCI:
 		return ohci_init((unsigned long)bar);
 #endif
-#if IS_ENABLED(CONFIG_LP_USB_EHCI)
+#if CONFIG(LP_USB_EHCI)
 	case EHCI:
 		return ehci_init((unsigned long)bar);
 #endif
-#if IS_ENABLED(CONFIG_LP_USB_DWC2)
+#if CONFIG(LP_USB_DWC2)
 	case DWC2:
 		return dwc2_init(bar);
 #endif
-#if IS_ENABLED(CONFIG_LP_USB_XHCI)
+#if CONFIG(LP_USB_XHCI)
 	case XHCI:
 		return xhci_init((unsigned long)bar);
 #endif
diff --git a/payloads/libpayload/drivers/usb/xhci.c b/payloads/libpayload/drivers/usb/xhci.c
index 3f1064a405..0a69c5137b 100644
--- a/payloads/libpayload/drivers/usb/xhci.c
+++ b/payloads/libpayload/drivers/usb/xhci.c
@@ -88,7 +88,7 @@ xhci_init_cycle_ring(transfer_ring_t *const tr, const size_t ring_size)
 }
 
 /* On Panther Point: switch ports shared with EHCI to xHCI */
-#if IS_ENABLED(CONFIG_LP_USB_PCI)
+#if CONFIG(LP_USB_PCI)
 static void
 xhci_switch_ppt_ports(pcidev_t addr)
 {
@@ -112,7 +112,7 @@ xhci_switch_ppt_ports(pcidev_t addr)
 }
 #endif
 
-#if IS_ENABLED(CONFIG_LP_USB_PCI)
+#if CONFIG(LP_USB_PCI)
 /* On Panther Point: switch all ports back to EHCI */
 static void
 xhci_switchback_ppt_ports(pcidev_t addr)
@@ -297,7 +297,7 @@ _free_xhci:
 	return NULL;
 }
 
-#if IS_ENABLED(CONFIG_LP_USB_PCI)
+#if CONFIG(LP_USB_PCI)
 hci_t *
 xhci_pci_init (pcidev_t addr)
 {
@@ -336,7 +336,7 @@ xhci_reset(hci_t *const controller)
 	 * Without this delay, the subsequent HC register access,
 	 * may result in a system hang very rarely.
 	 */
-	if (IS_ENABLED(CONFIG_LP_ARCH_X86))
+	if (CONFIG(LP_ARCH_X86))
 		mdelay(1);
 
 	xhci_debug("Resetting controller... ");
@@ -426,7 +426,7 @@ xhci_shutdown(hci_t *const controller)
 	xhci_t *const xhci = XHCI_INST(controller);
 	xhci_stop(controller);
 
-#if IS_ENABLED(CONFIG_LP_USB_PCI)
+#if CONFIG(LP_USB_PCI)
         if (controller->pcidev)
 		xhci_switchback_ppt_ports(controller->pcidev);
 #endif
@@ -563,7 +563,7 @@ xhci_enqueue_td(transfer_ring_t *const tr, const int ep, const size_t mps,
 			cur_length = length;
 			packets = 0;
 			length = 0;
-		} else if (!IS_ENABLED(CONFIG_LP_USB_XHCI_MTK_QUIRK)) {
+		} else if (!CONFIG(LP_USB_XHCI_MTK_QUIRK)) {
 			packets -= (residue + cur_length) / mps;
 			residue = (residue + cur_length) % mps;
 			length -= cur_length;
@@ -576,7 +576,7 @@ xhci_enqueue_td(transfer_ring_t *const tr, const int ep, const size_t mps,
 		TRB_SET(TDS, trb, MIN(TRB_MAX_TD_SIZE, packets));
 		TRB_SET(CH, trb, 1);
 
-		if (length && IS_ENABLED(CONFIG_LP_USB_XHCI_MTK_QUIRK)) {
+		if (length && CONFIG(LP_USB_XHCI_MTK_QUIRK)) {
 			/*
 			 * For MTK's xHCI controller, TDS defines a number of
 			 * packets that remain to be transferred for a TD after
diff --git a/payloads/libpayload/drivers/usb/xhci_devconf.c b/payloads/libpayload/drivers/usb/xhci_devconf.c
index b697b0fd0f..99e3037304 100644
--- a/payloads/libpayload/drivers/usb/xhci_devconf.c
+++ b/payloads/libpayload/drivers/usb/xhci_devconf.c
@@ -353,7 +353,7 @@ xhci_finish_ep_config(const endpoint_t *const ep, inputctx_t *const ic)
 	EC_SET(AVRTRB,	epctx, avrtrb);
 	EC_SET(MXESIT,  epctx, EC_GET(MPS, epctx) * EC_GET(MBS, epctx));
 
-	if (IS_ENABLED(CONFIG_LP_USB_XHCI_MTK_QUIRK)) {
+	if (CONFIG(LP_USB_XHCI_MTK_QUIRK)) {
 		/* The MTK xHCI defines some extra SW parameters which are
 		 * put into reserved DWs in Slot and Endpoint Contexts for
 		 * synchronous endpoints. But for non-isochronous transfers,
diff --git a/payloads/libpayload/drivers/usb/xhci_rh.c b/payloads/libpayload/drivers/usb/xhci_rh.c
index ddf6ce80a4..453fa5b409 100644
--- a/payloads/libpayload/drivers/usb/xhci_rh.c
+++ b/payloads/libpayload/drivers/usb/xhci_rh.c
@@ -122,7 +122,7 @@ xhci_rh_reset_port(usbdev_t *const dev, const int port)
 static int
 xhci_rh_enable_port(usbdev_t *const dev, int port)
 {
-	if (IS_ENABLED(CONFIG_LP_USB_XHCI_MTK_QUIRK)) {
+	if (CONFIG(LP_USB_XHCI_MTK_QUIRK)) {
 		xhci_t *const xhci = XHCI_INST(dev->controller);
 		volatile u32 *const portsc =
 			&xhci->opreg->prs[port - 1].portsc;
diff --git a/payloads/libpayload/drivers/video/video.c b/payloads/libpayload/drivers/video/video.c
index b932a63555..9ab7ba20a5 100644
--- a/payloads/libpayload/drivers/video/video.c
+++ b/payloads/libpayload/drivers/video/video.c
@@ -31,27 +31,27 @@
 #include <libpayload.h>
 #include <video_console.h>
 
-#if IS_ENABLED(CONFIG_LP_GEODELX_VIDEO_CONSOLE)
+#if CONFIG(LP_GEODELX_VIDEO_CONSOLE)
 extern struct video_console geodelx_video_console;
 #endif
 
-#if IS_ENABLED(CONFIG_LP_COREBOOT_VIDEO_CONSOLE)
+#if CONFIG(LP_COREBOOT_VIDEO_CONSOLE)
 extern struct video_console coreboot_video_console;
 #endif
 
-#if IS_ENABLED(CONFIG_LP_VGA_VIDEO_CONSOLE)
+#if CONFIG(LP_VGA_VIDEO_CONSOLE)
 extern struct video_console vga_video_console;
 #endif
 
 static struct video_console *console_list[] =
 {
-#if IS_ENABLED(CONFIG_LP_GEODELX_VIDEO_CONSOLE)
+#if CONFIG(LP_GEODELX_VIDEO_CONSOLE)
 	&geodelx_video_console,
 #endif
-#if IS_ENABLED(CONFIG_LP_COREBOOT_VIDEO_CONSOLE)
+#if CONFIG(LP_COREBOOT_VIDEO_CONSOLE)
 	&coreboot_video_console,
 #endif
-#if IS_ENABLED(CONFIG_LP_VGA_VIDEO_CONSOLE)
+#if CONFIG(LP_VGA_VIDEO_CONSOLE)
 	&vga_video_console,
 #endif
 };