diff options
| author | Nico Huber <nico.huber@secunet.com> | 2017-05-18 16:12:07 +0200 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2017-05-22 11:07:57 +0200 |
| commit | afa9aefce00551d5d6227ad0081389b972dd767f (patch) | |
| tree | 537a06325971eb751349878089899bf950e65ddf /src/include/console/usb.h | |
| parent | 7b811d5e3661874dfeca01901f3641eb70a95b1d (diff) | |
| download | coreboot-afa9aefce00551d5d6227ad0081389b972dd767f.tar.xz | |
include/console: Use IS_ENABLED() macro
Change-Id: I3d0c61c37399e96c1d154c1d3af5c47db967a07a
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/19763
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Philippe Mathieu-Daudé <philippe.mathieu.daude@gmail.com>
Diffstat (limited to 'src/include/console/usb.h')
| -rw-r--r-- | src/include/console/usb.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/include/console/usb.h b/src/include/console/usb.h index 1b153ef8e6..c67144d039 100644 --- a/src/include/console/usb.h +++ b/src/include/console/usb.h @@ -27,8 +27,9 @@ void usb_tx_flush(int idx); unsigned char usb_rx_byte(int idx); int usb_can_rx_byte(int idx); -#define __CONSOLE_USB_ENABLE__ (CONFIG_CONSOLE_USB && \ - ((ENV_ROMSTAGE && CONFIG_USBDEBUG_IN_ROMSTAGE) || ENV_RAMSTAGE)) +#define __CONSOLE_USB_ENABLE__ (IS_ENABLED(CONFIG_CONSOLE_USB) && \ + ((ENV_ROMSTAGE && IS_ENABLED(CONFIG_USBDEBUG_IN_ROMSTAGE)) || \ + ENV_RAMSTAGE)) #define USB_PIPE_FOR_CONSOLE 0 #define USB_PIPE_FOR_GDB 0 @@ -47,8 +48,9 @@ static inline void __usb_tx_flush(void) {} #endif /* */ -#if 0 && CONFIG_GDB_STUB && \ - ((ENV_ROMSTAGE && CONFIG_USBDEBUG_IN_ROMSTAGE) || ENV_RAMSTAGE) +#if 0 && IS_ENABLED(CONFIG_GDB_STUB) && \ + ((ENV_ROMSTAGE && IS_ENABLED(CONFIG_USBDEBUG_IN_ROMSTAGE)) \ + || ENV_RAMSTAGE) static inline void __gdb_hw_init(void) { usbdebug_init(); } static inline void __gdb_tx_byte(u8 data) { |