summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2016-09-16 16:20:24 -0500
committerAaron Durbin <adurbin@chromium.org>2016-09-19 17:01:37 +0200
commitc701393e207cd09c6ce232960c7c647bef27055f (patch)
treea8f18547bc8645a4d4475a7edf2828a48589272a
parentdfe614ff9fea97b712e10f4977f2343a1f070d3e (diff)
downloadcoreboot-c701393e207cd09c6ce232960c7c647bef27055f.tar.xz
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>
-rw-r--r--src/console/Makefile.inc4
-rw-r--r--src/include/console/console.h5
2 files changed, 5 insertions, 4 deletions
diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc
index 68afb8a18f..059dea544c 100644
--- a/src/console/Makefile.inc
+++ b/src/console/Makefile.inc
@@ -18,8 +18,8 @@ romstage-y += init.c console.c
romstage-y += post.c
romstage-y += die.c
-postcar-y += vtxprintf.c printk.c
-postcar-y += init.c console.c
+postcar-$(CONFIG_POSTCAR_CONSOLE) += vtxprintf.c printk.c
+postcar-$(CONFIG_POSTCAR_CONSOLE) += init.c console.c
postcar-y += post.c
postcar-y += die.c
diff --git a/src/include/console/console.h b/src/include/console/console.h
index 2392ddfe42..013ef2083e 100644
--- a/src/include/console/console.h
+++ b/src/include/console/console.h
@@ -40,8 +40,9 @@ void mainboard_post(u8 value);
void __attribute__ ((noreturn)) die(const char *msg);
#define __CONSOLE_ENABLE__ \
- ((ENV_BOOTBLOCK && CONFIG_BOOTBLOCK_CONSOLE) || \
- ENV_VERSTAGE || ENV_ROMSTAGE || ENV_RAMSTAGE || ENV_POSTCAR || \
+ ((ENV_BOOTBLOCK && IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE)) || \
+ (ENV_POSTCAR && IS_ENABLED(CONFIG_POSTCAR_CONSOLE)) || \
+ ENV_VERSTAGE || ENV_ROMSTAGE || ENV_RAMSTAGE || \
(ENV_SMM && CONFIG_DEBUG_SMI))
#if __CONSOLE_ENABLE__