aboutsummaryrefslogtreecommitdiff
path: root/src/include/console/uart.h
diff options
context:
space:
mode:
authorNico Huber <nico.huber@secunet.com>2017-05-18 16:12:07 +0200
committerNico Huber <nico.h@gmx.de>2017-05-22 11:07:57 +0200
commitafa9aefce00551d5d6227ad0081389b972dd767f (patch)
tree537a06325971eb751349878089899bf950e65ddf /src/include/console/uart.h
parent7b811d5e3661874dfeca01901f3641eb70a95b1d (diff)
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/uart.h')
-rw-r--r--src/include/console/uart.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/include/console/uart.h b/src/include/console/uart.h
index 07ac763932..744eb625f4 100644
--- a/src/include/console/uart.h
+++ b/src/include/console/uart.h
@@ -55,9 +55,9 @@ static inline void *uart_platform_baseptr(int idx)
void oxford_remap(unsigned int new_base);
-#define __CONSOLE_SERIAL_ENABLE__ (CONFIG_CONSOLE_SERIAL && \
+#define __CONSOLE_SERIAL_ENABLE__ (IS_ENABLED(CONFIG_CONSOLE_SERIAL) && \
(ENV_BOOTBLOCK || ENV_ROMSTAGE || ENV_RAMSTAGE || ENV_VERSTAGE || \
- ENV_POSTCAR || (ENV_SMM && CONFIG_DEBUG_SMI)))
+ ENV_POSTCAR || (ENV_SMM && IS_ENABLED(CONFIG_DEBUG_SMI))))
#if __CONSOLE_SERIAL_ENABLE__
static inline void __uart_init(void)
@@ -78,7 +78,7 @@ static inline void __uart_tx_byte(u8 data) {}
static inline void __uart_tx_flush(void) {}
#endif
-#if CONFIG_GDB_STUB && (ENV_ROMSTAGE || ENV_RAMSTAGE)
+#if IS_ENABLED(CONFIG_GDB_STUB) && (ENV_ROMSTAGE || ENV_RAMSTAGE)
#define CONFIG_UART_FOR_GDB CONFIG_UART_FOR_CONSOLE
static inline void __gdb_hw_init(void) { uart_init(CONFIG_UART_FOR_GDB); }
static inline void __gdb_tx_byte(u8 data)