[coreboot-gerrit] Patch set updated for coreboot: soc/intel/skylake: Initialize UART based on CONFIG_UART_DEBUG

[Boon Tiong Teo (boon.tiong.teo@intel.com)]

Boon Tiong Teo (boon.tiong.teo at intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17349

-gerrit

commit 97bce62ab2dc12df8eadb84f125dacd33e08fc65
Author: Teo Boon Tiong <boon.tiong.teo at intel.com>
Date:   Thu Nov 10 21:06:51 2016 +0800

    soc/intel/skylake: Initialize UART based on CONFIG_UART_DEBUG
    
    Current implementation checks for CONFIG_BOOTBLOCK_CONSOLE and then
    initializes UART. If only CONFIG_BOOTBLOCK_CONSOLE
    is enabled without enabling CONFIG_UART_DEBUG, there are
    compilation issues. This is the case when using SIO UART for Skylake
    DT platform. Hence initialize UART when CONFIG_UART_DEBUG is enabled
    and not based on CONFIG_BOOTBLOCK_CONSOLE.
    
    Also move BOOTBLOCK_CONSOLE out from UART_DEBUG to CPU_SPECIFIC_OPTIONS
    as part of the fix needed.
    
    Change-Id: Id422a55a68d64a06fc874bddca46b0ef5be6d596
    Signed-off-by: Teo Boon Tiong <boon.tiong.teo at intel.com>
---
 src/soc/intel/skylake/Kconfig               | 2 +-
 src/soc/intel/skylake/bootblock/bootblock.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index 04dbf0e..fa76b54 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -52,6 +52,7 @@ config CPU_SPECIFIC_OPTIONS
 	select TSC_CONSTANT_RATE
 	select TSC_SYNC_MFENCE
 	select UDELAY_TSC
+	select BOOTBLOCK_CONSOLE
 
 config MAINBOARD_USES_FSP2_0
 	bool
@@ -182,7 +183,6 @@ config VGA_BIOS_ID
 config UART_DEBUG
 	bool "Enable UART debug port."
 	default n
-	select BOOTBLOCK_CONSOLE
 	select CONSOLE_SERIAL
 	select DRIVERS_UART
 	select DRIVERS_UART_8250MEM_32
diff --git a/src/soc/intel/skylake/bootblock/bootblock.c b/src/soc/intel/skylake/bootblock/bootblock.c
index b00fcf7..ea41b4b 100644
--- a/src/soc/intel/skylake/bootblock/bootblock.c
+++ b/src/soc/intel/skylake/bootblock/bootblock.c
@@ -28,7 +28,7 @@ void bootblock_soc_early_init(void)
 	bootblock_pch_early_init();
 	bootblock_cpu_init();
 
-	if (IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE))
+	if (IS_ENABLED(CONFIG_UART_DEBUG))
 		pch_uart_init();
 }