From 64925b5128d8ed27bd1780f6cb25805aecc659e6 Mon Sep 17 00:00:00 2001 From: Lijian Zhao Date: Fri, 11 Jan 2019 07:54:48 -0800 Subject: soc/mainboard: Update mainboard UART Kconfig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After f5ca922 (Untangle CBFS microcode updates) got merged, all mainboard using intel apollolake, cannonlake, coffeelake, glk, kabylake, skylake, icelake and whiskeylake get affected. Using INTEL_LPSS_UART_FOR_CONSOLE instead of UART_DEBUG and set default console for each platform. BUG=N/A TEST=Build and test on Sarien platform, by default we can still get console from cbmem, and enable CONSOLE_SERIAL can get logs from UART port 2. Signed-off-by: Lijian Zhao Change-Id: I550a00144cff21420537bb161c64e7a132c5d2de Reviewed-on: https://review.coreboot.org/c/30853 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber Reviewed-by: Bora Guvendik Reviewed-by: Kyösti Mälkki --- src/mainboard/intel/apollolake_rvp/Kconfig | 3 +++ src/mainboard/intel/glkrvp/Kconfig | 1 + src/mainboard/intel/kunimitsu/Kconfig | 5 +++++ src/mainboard/intel/saddlebrook/Kconfig | 1 + 4 files changed, 10 insertions(+) (limited to 'src/mainboard/intel') diff --git a/src/mainboard/intel/apollolake_rvp/Kconfig b/src/mainboard/intel/apollolake_rvp/Kconfig index 4afdf0d742..ed7d77f211 100644 --- a/src/mainboard/intel/apollolake_rvp/Kconfig +++ b/src/mainboard/intel/apollolake_rvp/Kconfig @@ -5,6 +5,7 @@ config BOARD_SPECIFIC_OPTIONS select SOC_INTEL_APOLLOLAKE select BOARD_ROMSIZE_KB_8192 select HAVE_ACPI_TABLES + select INTEL_LPSS_UART_FOR_CONSOLE config MAINBOARD_DIR string @@ -18,4 +19,6 @@ config MAINBOARD_VENDOR string default "Intel" +config UART_FOR_CONSOLE + default 2 endif diff --git a/src/mainboard/intel/glkrvp/Kconfig b/src/mainboard/intel/glkrvp/Kconfig index 948455920a..b3ff2fe226 100644 --- a/src/mainboard/intel/glkrvp/Kconfig +++ b/src/mainboard/intel/glkrvp/Kconfig @@ -7,6 +7,7 @@ config BOARD_INTEL_BASEBOARD_GLKRVP select DRIVERS_I2C_HID select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES + select INTEL_LPSS_UART_FOR_CONSOLE select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select DRIVERS_GENERIC_MAX98357A diff --git a/src/mainboard/intel/kunimitsu/Kconfig b/src/mainboard/intel/kunimitsu/Kconfig index e2a673809c..f4dd4b1057 100644 --- a/src/mainboard/intel/kunimitsu/Kconfig +++ b/src/mainboard/intel/kunimitsu/Kconfig @@ -15,6 +15,7 @@ config BOARD_SPECIFIC_OPTIONS select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE + select INTEL_LPSS_UART_FOR_CONSOLE select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select SOC_INTEL_SKYLAKE @@ -72,4 +73,8 @@ config GBB_HWID string depends on CHROMEOS default "KUNIMITSU TEST 8819" + +config UART_FOR_CONSOLE + int + default 2 endif diff --git a/src/mainboard/intel/saddlebrook/Kconfig b/src/mainboard/intel/saddlebrook/Kconfig index c8113d27b1..650d4deb88 100644 --- a/src/mainboard/intel/saddlebrook/Kconfig +++ b/src/mainboard/intel/saddlebrook/Kconfig @@ -24,6 +24,7 @@ config BOARD_SPECIFIC_OPTIONS select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE + select INTEL_LPSS_UART_FOR_CONSOLE select SERIRQ_CONTINUOUS_MODE select SKYLAKE_SOC_PCH_H select SOC_INTEL_SKYLAKE -- cgit v1.2.3