summaryrefslogtreecommitdiff
path: root/src/include/console/cbmem_console.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/cbmem_console.h
parent7b811d5e3661874dfeca01901f3641eb70a95b1d (diff)
downloadcoreboot-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/cbmem_console.h')
-rw-r--r--src/include/console/cbmem_console.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/include/console/cbmem_console.h b/src/include/console/cbmem_console.h
index f8b398221e..a8519d28a9 100644
--- a/src/include/console/cbmem_console.h
+++ b/src/include/console/cbmem_console.h
@@ -21,10 +21,11 @@
void cbmemc_init(void);
void cbmemc_tx_byte(unsigned char data);
-#define __CBMEM_CONSOLE_ENABLE__ (CONFIG_CONSOLE_CBMEM && \
+#define __CBMEM_CONSOLE_ENABLE__ (IS_ENABLED(CONFIG_CONSOLE_CBMEM) && \
(ENV_RAMSTAGE || ENV_VERSTAGE || ENV_POSTCAR || \
(IS_ENABLED(CONFIG_EARLY_CBMEM_INIT) && \
- (ENV_ROMSTAGE || (ENV_BOOTBLOCK && CONFIG_BOOTBLOCK_CONSOLE)))\
+ (ENV_ROMSTAGE || \
+ (ENV_BOOTBLOCK && IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE))))\
))
#if __CBMEM_CONSOLE_ENABLE__