diff options
| author | Teo Boon Tiong <boon.tiong.teo@intel.com> | 2016-11-10 21:06:51 +0800 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2016-11-28 06:58:16 +0100 |
| commit | 673a4d0f4d06bfb6556756c97300b4cea336d484 (patch) | |
| tree | e6c24e95af0cf94b2c1438779ef48a23e6e1c5dd /src/soc/intel/skylake | |
| parent | cfa1fd2b20065b748a9e3b8281a1dc70c19fbd18 (diff) | |
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@intel.com>
Reviewed-on: https://review.coreboot.org/17349
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/soc/intel/skylake')
| -rw-r--r-- | src/soc/intel/skylake/Kconfig | 2 | ||||
| -rw-r--r-- | 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 988547c8a8..1778daecd6 100644 --- a/src/soc/intel/skylake/Kconfig +++ b/src/soc/intel/skylake/Kconfig @@ -13,6 +13,7 @@ config CPU_SPECIFIC_OPTIONS select ARCH_ROMSTAGE_X86_32 select ARCH_VERSTAGE_X86_32 select ACPI_NHLT + select BOOTBLOCK_CONSOLE select BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY if BOOT_DEVICE_SPI_FLASH select BOOT_DEVICE_SUPPORTS_WRITES select CACHE_MRC_SETTINGS @@ -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 b00fcf74ab..ea41b4bcb2 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(); } |