GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

src/console: add IS_ENABLED() around Kconfig symbol references 

Some of these can be changed from #if to if(), but that will happen
in a follow-on commmit.

Change-Id: I5a674cd7a360a0dd040c859ec1f8d760d7c83364
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/20130
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
This commit is contained in:
Martin Roth 2017-06-09 09:27:08 -06:00
parent 6a3d0bfc1f
commit 53de6cd1c3
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/console/console.c
View File

@ -80,7 +80,7 @@ void console_write_line(uint8_t *buffer, size_t number_of_bytes)
} }
#if CONFIG_GDB_STUB && (ENV_ROMSTAGE || ENV_RAMSTAGE) #if IS_ENABLED(CONFIG_GDB_STUB) && (ENV_ROMSTAGE || ENV_RAMSTAGE)
void gdb_hw_init(void) void gdb_hw_init(void)
{ {
__gdb_hw_init(); __gdb_hw_init();

4
src/console/init.c
View File

@ -33,7 +33,7 @@ static int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL;
static inline int get_log_level(void) static inline int get_log_level(void)
{ {
if (CONSOLE_LEVEL_CONST) if (IS_ENABLED(CONSOLE_LEVEL_CONST))
return CONFIG_DEFAULT_CONSOLE_LOGLEVEL; return CONFIG_DEFAULT_CONSOLE_LOGLEVEL;
return console_loglevel; return console_loglevel;
@ -65,7 +65,7 @@ asmlinkage void console_init(void)
{ {
init_log_level(); init_log_level();
#if CONFIG_EARLY_PCI_BRIDGE && !defined(__SMM__) #if IS_ENABLED(CONFIG_EARLY_PCI_BRIDGE) && !defined(__SMM__)
pci_early_bridge_init(); pci_early_bridge_init();
#endif #endif

22
src/console/post.c
View File

@ -38,7 +38,7 @@ void __attribute__((weak)) mainboard_post(uint8_t value)
#define mainboard_post(x) #define mainboard_post(x)
#endif #endif
#if CONFIG_CMOS_POST #if IS_ENABLED(CONFIG_CMOS_POST)
DECLARE_SPIN_LOCK(cmos_post_lock) DECLARE_SPIN_LOCK(cmos_post_lock)
@ -46,7 +46,7 @@ DECLARE_SPIN_LOCK(cmos_post_lock)
void cmos_post_log(void) void cmos_post_log(void)
{ {
u8 code = 0; u8 code = 0;
#if CONFIG_CMOS_POST_EXTRA #if IS_ENABLED(CONFIG_CMOS_POST_EXTRA)
u32 extra = 0; u32 extra = 0;
#endif #endif
@ -56,13 +56,13 @@ void cmos_post_log(void)
switch (cmos_read(CMOS_POST_BANK_OFFSET)) { switch (cmos_read(CMOS_POST_BANK_OFFSET)) {
case CMOS_POST_BANK_0_MAGIC: case CMOS_POST_BANK_0_MAGIC:
code = cmos_read(CMOS_POST_BANK_1_OFFSET); code = cmos_read(CMOS_POST_BANK_1_OFFSET);
#if CONFIG_CMOS_POST_EXTRA #if IS_ENABLED(CONFIG_CMOS_POST_EXTRA)
extra = cmos_read32(CMOS_POST_BANK_1_EXTRA); extra = cmos_read32(CMOS_POST_BANK_1_EXTRA);
#endif #endif
break; break;
case CMOS_POST_BANK_1_MAGIC: case CMOS_POST_BANK_1_MAGIC:
code = cmos_read(CMOS_POST_BANK_0_OFFSET); code = cmos_read(CMOS_POST_BANK_0_OFFSET);
#if CONFIG_CMOS_POST_EXTRA #if IS_ENABLED(CONFIG_CMOS_POST_EXTRA)
extra = cmos_read32(CMOS_POST_BANK_0_EXTRA); extra = cmos_read32(CMOS_POST_BANK_0_EXTRA);
#endif #endif
break; break;
@ -80,9 +80,9 @@ void cmos_post_log(void)
default: default:
printk(BIOS_WARNING, "POST: Unexpected post code " printk(BIOS_WARNING, "POST: Unexpected post code "
"in previous boot: 0x%02x\n", code); "in previous boot: 0x%02x\n", code);
#if CONFIG_ELOG #if IS_ENABLED(CONFIG_ELOG)
elog_add_event_word(ELOG_TYPE_LAST_POST_CODE, code); elog_add_event_word(ELOG_TYPE_LAST_POST_CODE, code);
#if CONFIG_CMOS_POST_EXTRA #if IS_ENABLED(CONFIG_CMOS_POST_EXTRA)
if (extra) if (extra)
elog_add_event_dword(ELOG_TYPE_POST_EXTRA, extra); elog_add_event_dword(ELOG_TYPE_POST_EXTRA, extra);
#endif #endif
@ -90,7 +90,7 @@ void cmos_post_log(void)
} }
} }
#if CONFIG_CMOS_POST_EXTRA #if IS_ENABLED(CONFIG_CMOS_POST_EXTRA)
void post_log_extra(u32 value) void post_log_extra(u32 value)
{ {
spin_lock(&cmos_post_lock); spin_lock(&cmos_post_lock);
@ -144,14 +144,14 @@ static void cmos_post_code(u8 value)
void post_code(uint8_t value) void post_code(uint8_t value)
{ {
#if !CONFIG_NO_POST #if !IS_ENABLED(CONFIG_NO_POST)
#if CONFIG_CONSOLE_POST #if IS_ENABLED(CONFIG_CONSOLE_POST)
printk(BIOS_EMERG, "POST: 0x%02x\n", value); printk(BIOS_EMERG, "POST: 0x%02x\n", value);
#endif #endif
#if CONFIG_CMOS_POST #if IS_ENABLED(CONFIG_CMOS_POST)
cmos_post_code(value); cmos_post_code(value);
#endif #endif
#if CONFIG_POST_IO #if IS_ENABLED(CONFIG_POST_IO)
outb(value, CONFIG_POST_IO_PORT); outb(value, CONFIG_POST_IO_PORT);
#endif #endif
#endif #endif