[coreboot-gerrit] Change in ...coreboot[master]: mainboard/intel: Update mainboard UART Kconfig

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/30913 )

Change subject: mainboard/intel: Update mainboard UART Kconfig
......................................................................

mainboard/intel: Update mainboard UART Kconfig

After a96e66a (soc/intel: Clean mess around UART_DEBUG) got merged,
all mainboard using intel cannonlake,coffeelake, kabylake, skylake,
icelake and whiskeylake get affected.

Using INTEL_LPSS_UART_FOR_CONSOLE instead of UART_DEBUG
and set default console for each platform.

TEST=Intel client and IoT team has verified that LPSS uart
is working fine on CNL, WHL and ICL RVPs.

Change-Id: I0381a6616f03c74c98f837e3c008459fefd4818c
Signed-off-by: Subrata Banik 
Reviewed-on: https://review.coreboot.org/c/30913
Reviewed-by: Patrick Georgi 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/intel/cannonlake_rvp/Kconfig
M src/mainboard/intel/coffeelake_rvp/Kconfig
M src/mainboard/intel/icelake_rvp/Kconfig
M src/mainboard/intel/kblrvp/Kconfig
4 files changed, 17 insertions(+), 3 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Patrick Georgi: Looks good to me, approved

diff --git a/src/mainboard/intel/cannonlake_rvp/Kconfig b/src/mainboard/intel/cannonlake_rvp/Kconfig
index 15d56c3..d86e485 100644
--- a/src/mainboard/intel/cannonlake_rvp/Kconfig
+++ b/src/mainboard/intel/cannonlake_rvp/Kconfig
@@ -12,6 +12,7 @@
    select DRIVERS_I2C_GENERIC
    select SOC_INTEL_CANNONLAKE
    select MAINBOARD_USES_IFD_EC_REGION
+	select INTEL_LPSS_UART_FOR_CONSOLE

config MAINBOARD_DIR
    string
@@ -65,4 +66,8 @@
 config VBOOT
    select VBOOT_LID_SWITCH
    select VBOOT_MOCK_SECDATA
+
+config UART_FOR_CONSOLE
+	int
+	default 2
 endif
diff --git a/src/mainboard/intel/coffeelake_rvp/Kconfig b/src/mainboard/intel/coffeelake_rvp/Kconfig
index 95eeeff..db36474 100644
--- a/src/mainboard/intel/coffeelake_rvp/Kconfig
+++ b/src/mainboard/intel/coffeelake_rvp/Kconfig
@@ -7,7 +7,7 @@
    select GENERIC_SPD_BIN
    select HAVE_ACPI_RESUME
    select HAVE_ACPI_TABLES
-	select INTEL_LPSS_UART_FOR_CONSOLE if BOARD_INTEL_WHISKEYLAKE_RVP
+	select INTEL_LPSS_UART_FOR_CONSOLE
    select MAINBOARD_HAS_CHROMEOS
    select GENERIC_SPD_BIN
    select DRIVERS_I2C_HID
@@ -51,8 +51,7 @@

config UART_FOR_CONSOLE
    int
-	default 2 if BOARD_INTEL_WHISKEYLAKE_RVP
-	default 0
+	default 2

config DEVICETREE
    string
diff --git a/src/mainboard/intel/icelake_rvp/Kconfig b/src/mainboard/intel/icelake_rvp/Kconfig
index da9c077..7cc4e53 100644
--- a/src/mainboard/intel/icelake_rvp/Kconfig
+++ b/src/mainboard/intel/icelake_rvp/Kconfig
@@ -14,6 +14,7 @@
    select SOC_INTEL_COMMON_BLOCK_HDA_VERB
    select SOC_INTEL_ICELAKE
    select MAINBOARD_USES_IFD_EC_REGION
+	select INTEL_LPSS_UART_FOR_CONSOLE

config MAINBOARD_DIR
    string
@@ -51,4 +52,8 @@
 config VBOOT
    select VBOOT_LID_SWITCH
    select VBOOT_MOCK_SECDATA
+
+config UART_FOR_CONSOLE
+	int
+	default 2
 endif
diff --git a/src/mainboard/intel/kblrvp/Kconfig b/src/mainboard/intel/kblrvp/Kconfig
index c3a0400..3795cce 100644
--- a/src/mainboard/intel/kblrvp/Kconfig
+++ b/src/mainboard/intel/kblrvp/Kconfig
@@ -15,6 +15,7 @@
    select MAINBOARD_HAS_CHROMEOS
    select GENERIC_SPD_BIN
    select MAINBOARD_HAS_LPC_TPM
+	select INTEL_LPSS_UART_FOR_CONSOLE

config VBOOT
    select VBOOT_LID_SWITCH
@@ -84,4 +85,8 @@
 config DIMM_SPD_SIZE
    int
    default 512 if BOARD_INTEL_KBLRVP8 || BOARD_INTEL_KBLRVP11 #DDR4
+
+config UART_FOR_CONSOLE
+	int
+	default 2
 endif