summaryrefslogtreecommitdiff
path: root/src/include/console/usb.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/include/console/usb.h')
-rw-r--r--src/include/console/usb.h10
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)
{