diff options
| author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-06-29 15:47:34 -0700 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-06-30 18:55:15 +0200 |
| commit | 1b4d39428eac80bc76713b1f21a2c85e8900c1b8 (patch) | |
| tree | e2b9dfea6be47c785fa55964950c691643d0a232 /payloads/libpayload/drivers/usb/usbinit.c | |
| parent | de60c8899680f362a908d68efe9e4154ab3380be (diff) | |
libpayload: Make Kconfig bools use IS_ENABLED()
This will make the code work with the different styles
of Kconfig (emit unset bools vs don't emit unset bools)
Roughly, the patch does this, and a little bit of fixing up:
perl -pi -e 's,ifdef (CONFIG_LP_.+?)\b,if IS_ENABLED\($1\),g' `find . -name *.[ch]`
perl -pi -e 's,ifndef (CONFIG_LP_.+?)\b,if !IS_ENABLED\($1\),g' `find . -name *.[ch]`
Change-Id: Ib8a839b056a1f806a8597052e1b571ea3d18a79f
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/10711
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'payloads/libpayload/drivers/usb/usbinit.c')
| -rw-r--r-- | payloads/libpayload/drivers/usb/usbinit.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/payloads/libpayload/drivers/usb/usbinit.c b/payloads/libpayload/drivers/usb/usbinit.c index 7a5828def7..721fde8a93 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> -#ifdef CONFIG_LP_USB_PCI +#if IS_ENABLED(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: -#ifdef CONFIG_LP_USB_UHCI +#if IS_ENABLED(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: -#ifdef CONFIG_LP_USB_OHCI +#if IS_ENABLED(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: -#ifdef CONFIG_LP_USB_EHCI +#if IS_ENABLED(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: -#ifdef CONFIG_LP_USB_XHCI +#if IS_ENABLED(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) { -#ifdef CONFIG_LP_USB_PCI +#if IS_ENABLED(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) { -#ifdef CONFIG_LP_USB_OHCI +#if IS_ENABLED(CONFIG_LP_USB_OHCI) case OHCI: return ohci_init((unsigned long)bar); #endif -#ifdef CONFIG_LP_USB_EHCI +#if IS_ENABLED(CONFIG_LP_USB_EHCI) case EHCI: return ehci_init((unsigned long)bar); #endif -#ifdef CONFIG_LP_USB_DWC2 +#if IS_ENABLED(CONFIG_LP_USB_DWC2) case DWC2: return dwc2_init(bar); #endif -#ifdef CONFIG_LP_USB_XHCI +#if IS_ENABLED(CONFIG_LP_USB_XHCI) case XHCI: return xhci_init((unsigned long)bar); #endif |