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

console: honor CONFIG_POSTCAR_CONSOLE 

The declarations for console_init() were unconditionally
exposed even though there is a Kconfig option. Correct this
by honoring the CONFIG_POSTCAR_CONSOLE condition.

BUG=chrome-os-partner:57513

Change-Id: Id45ae3d7c05a9f4ebcf85c446fc68a709513bb0f
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/16617
Tested-by: build bot (Jenkins)
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
Aaron Durbin 2016-09-16 16:20:24 -05:00
parent dfe614ff9f
commit c701393e20
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/console/Makefile.inc
View File

@ -18,8 +18,8 @@ romstage-y += init.c console.c
romstage-y += post.c romstage-y += post.c
romstage-y += die.c romstage-y += die.c
postcar-y += vtxprintf.c printk.c postcar-$(CONFIG_POSTCAR_CONSOLE) += vtxprintf.c printk.c
postcar-y += init.c console.c postcar-$(CONFIG_POSTCAR_CONSOLE) += init.c console.c
postcar-y += post.c postcar-y += post.c
postcar-y += die.c postcar-y += die.c

5
src/include/console/console.h
View File

@ -40,8 +40,9 @@ void mainboard_post(u8 value);
void __attribute__ ((noreturn)) die(const char *msg); void __attribute__ ((noreturn)) die(const char *msg);
#define __CONSOLE_ENABLE__ \ #define __CONSOLE_ENABLE__ \
((ENV_BOOTBLOCK && CONFIG_BOOTBLOCK_CONSOLE) || \ ((ENV_BOOTBLOCK && IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE)) || \
ENV_VERSTAGE || ENV_ROMSTAGE || ENV_RAMSTAGE || ENV_POSTCAR || \ (ENV_POSTCAR && IS_ENABLED(CONFIG_POSTCAR_CONSOLE)) || \
ENV_VERSTAGE || ENV_ROMSTAGE || ENV_RAMSTAGE || \
(ENV_SMM && CONFIG_DEBUG_SMI)) (ENV_SMM && CONFIG_DEBUG_SMI))
#if __CONSOLE_ENABLE__ #if __CONSOLE_ENABLE__