From cd49cce7b70e80b4acc49b56bb2bb94370b4d867 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Tue, 5 Mar 2019 16:53:33 -0800 Subject: coreboot: Replace all IS_ENABLED(CONFIG_XXX) with CONFIG(XXX) This patch is a raw application of find src/ -type f | xargs sed -i -e 's/IS_ENABLED\s*(CONFIG_/CONFIG(/g' Change-Id: I6262d6d5c23cabe23c242b4f38d446b74fe16b88 Signed-off-by: Julius Werner Reviewed-on: https://review.coreboot.org/c/coreboot/+/31774 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/drivers/usb/ehci_debug.c | 10 +++++----- src/drivers/usb/gadget.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/drivers/usb') diff --git a/src/drivers/usb/ehci_debug.c b/src/drivers/usb/ehci_debug.c index d867d6c972..638b7c7e58 100644 --- a/src/drivers/usb/ehci_debug.c +++ b/src/drivers/usb/ehci_debug.c @@ -35,7 +35,7 @@ struct ehci_debug_info { struct dbgp_pipe ep_pipe[DBGP_MAX_ENDPOINTS]; } __packed; -#if IS_ENABLED(CONFIG_DEBUG_CONSOLE_INIT) +#if CONFIG(DEBUG_CONSOLE_INIT) /* When selected, you can debug the connection of usbdebug dongle. * EHCI port register bits and USB packets are dumped on console, * assuming some other console already works. @@ -217,7 +217,7 @@ static void dbgp_print_data(struct ehci_dbg_port *ehci_debug) int len; u32 ctrl, lo, hi; - if (!IS_ENABLED(CONFIG_DEBUG_CONSOLE_INIT) || dbgp_enabled()) + if (!CONFIG(DEBUG_CONSOLE_INIT) || dbgp_enabled()) return; ctrl = read32(&ehci_debug->control); @@ -720,7 +720,7 @@ static void migrate_ehci_debug(int is_recovery) return; } - if (IS_ENABLED(CONFIG_USBDEBUG_IN_PRE_RAM)) { + if (CONFIG(USBDEBUG_IN_PRE_RAM)) { /* Use state in CBMEM. */ dbg_info_cbmem = cbmem_find(CBMEM_ID_EHCI_DEBUG); if (dbg_info_cbmem) @@ -759,13 +759,13 @@ void usbdebug_init(void) * CBMEM_INIT_HOOKs for postcar and ramstage as we recover state * from CBMEM. */ - if (IS_ENABLED(CONFIG_USBDEBUG_IN_PRE_RAM) + if (CONFIG(USBDEBUG_IN_PRE_RAM) && (ENV_ROMSTAGE || ENV_BOOTBLOCK)) usbdebug_hw_init(false); /* USB console init is done early in ramstage if it was * not done in romstage, this does not require CBMEM. */ - if (!IS_ENABLED(CONFIG_USBDEBUG_IN_PRE_RAM) && ENV_RAMSTAGE) + if (!CONFIG(USBDEBUG_IN_PRE_RAM) && ENV_RAMSTAGE) usbdebug_hw_init(false); } diff --git a/src/drivers/usb/gadget.c b/src/drivers/usb/gadget.c index 3254a8a1c2..61e103160b 100644 --- a/src/drivers/usb/gadget.c +++ b/src/drivers/usb/gadget.c @@ -342,7 +342,7 @@ int dbgp_probe_gadget(struct ehci_dbg_port *ehci_debug, struct dbgp_pipe *pipe) } } - if (IS_ENABLED(CONFIG_USBDEBUG_DONGLE_FTDI_FT232H)) { + if (CONFIG(USBDEBUG_DONGLE_FTDI_FT232H)) { ret = probe_for_ftdi(ehci_debug, pipe); } else { ret = probe_for_debug_descriptor(ehci_debug, pipe); -- cgit v1.2.3