From afa9aefce00551d5d6227ad0081389b972dd767f Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Thu, 18 May 2017 16:12:07 +0200 Subject: include/console: Use IS_ENABLED() macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3d0c61c37399e96c1d154c1d3af5c47db967a07a Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/19763 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) Reviewed-by: Philippe Mathieu-Daudé --- src/include/console/cbmem_console.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/include/console/cbmem_console.h') 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__ -- cgit v1.2.3