[coreboot-gerrit] Patch set updated for coreboot: console: honor CONFIG_POSTCAR_CONSOLE

[Aaron Durbin (adurbin@chromium.org)]

Aaron Durbin (adurbin at chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16617

-gerrit

commit 8f363bda1ef20315900b2fcbfeb068e70e1a7b7f
Author: Aaron Durbin <adurbin at chromium.org>
Date:   Fri Sep 16 16:20:24 2016 -0500

    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 at chromium.org>
---
 src/console/Makefile.inc      | 4 ++--
 src/include/console/console.h | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc
index 68afb8a..059dea5 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 2392ddf..013ef20 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__