soc/intel: Clean mess around UART_DEBUG
Everything is wrong here, the Kconfig symbols are only the tip of the iceberg. Based on Kconfig prompts the SoC code performed pad configu- rations! I don't see why the person who configures coreboot should have the board schematics at hand. As a mitigation, we remove the prompts for UART_DEBUG, which is renamed to INTEL_LPSS_UART_FOR_CONSOLE (because the former didn't really say what it's about), and for UART_FOR_CONSOLE in case the former is selec- ted. Change-Id: Ibe2ed3cab0bb04bb23989c22da45299f088c758b Signed-off-by: Nico Huber <nico.h@gmx.de> Reviewed-on: https://review.coreboot.org/c/29573 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
This commit is contained in:
parent
3910c4e488
commit
a96e66a76f
|
@ -48,8 +48,16 @@ if CONSOLE_SERIAL
|
||||||
comment "device-specific UART"
|
comment "device-specific UART"
|
||||||
depends on HAVE_UART_SPECIAL
|
depends on HAVE_UART_SPECIAL
|
||||||
|
|
||||||
|
config FIXED_UART_FOR_CONSOLE
|
||||||
|
bool
|
||||||
|
help
|
||||||
|
Select to remove the prompt from UART_FOR_CONSOLE in case a
|
||||||
|
specific UART has to be used (e.g. when the platform code
|
||||||
|
performs dangerous configurations).
|
||||||
|
|
||||||
config UART_FOR_CONSOLE
|
config UART_FOR_CONSOLE
|
||||||
int "Index for UART port to use for console"
|
int
|
||||||
|
prompt "Index for UART port to use for console" if !FIXED_UART_FOR_CONSOLE
|
||||||
default 0
|
default 0
|
||||||
help
|
help
|
||||||
Select an I/O port to use for serial console:
|
Select an I/O port to use for serial console:
|
||||||
|
|
|
@ -5,7 +5,7 @@ config BOARD_SPECIFIC_OPTIONS
|
||||||
select SOC_INTEL_APOLLOLAKE
|
select SOC_INTEL_APOLLOLAKE
|
||||||
select BOARD_ROMSIZE_KB_16384
|
select BOARD_ROMSIZE_KB_16384
|
||||||
select HAVE_ACPI_TABLES
|
select HAVE_ACPI_TABLES
|
||||||
select UART_DEBUG
|
select INTEL_LPSS_UART_FOR_CONSOLE
|
||||||
|
|
||||||
config MAINBOARD_DIR
|
config MAINBOARD_DIR
|
||||||
string
|
string
|
||||||
|
@ -24,7 +24,6 @@ config FMDFILE
|
||||||
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/leafhill.$(CONFIG_COREBOOT_ROMSIZE_KB).fmd"
|
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/leafhill.$(CONFIG_COREBOOT_ROMSIZE_KB).fmd"
|
||||||
|
|
||||||
config UART_FOR_CONSOLE
|
config UART_FOR_CONSOLE
|
||||||
int "Number of UART port to use for serial log"
|
|
||||||
default 2
|
default 2
|
||||||
|
|
||||||
config NEED_IFWI
|
config NEED_IFWI
|
||||||
|
|
|
@ -5,7 +5,7 @@ config BOARD_SPECIFIC_OPTIONS
|
||||||
select SOC_INTEL_APOLLOLAKE
|
select SOC_INTEL_APOLLOLAKE
|
||||||
select BOARD_ROMSIZE_KB_16384
|
select BOARD_ROMSIZE_KB_16384
|
||||||
select HAVE_ACPI_TABLES
|
select HAVE_ACPI_TABLES
|
||||||
select UART_DEBUG
|
select INTEL_LPSS_UART_FOR_CONSOLE
|
||||||
|
|
||||||
config MAINBOARD_DIR
|
config MAINBOARD_DIR
|
||||||
string
|
string
|
||||||
|
@ -20,7 +20,6 @@ config FMDFILE
|
||||||
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/minnow3.fmd"
|
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/minnow3.fmd"
|
||||||
|
|
||||||
config UART_FOR_CONSOLE
|
config UART_FOR_CONSOLE
|
||||||
int "Number of UART port to use for serial log"
|
|
||||||
default 2
|
default 2
|
||||||
|
|
||||||
config NEED_IFWI
|
config NEED_IFWI
|
||||||
|
|
|
@ -169,14 +169,6 @@ config DRIVERS_I2C_DESIGNWARE_CLOCK_MHZ
|
||||||
int
|
int
|
||||||
default 133
|
default 133
|
||||||
|
|
||||||
config UART_DEBUG
|
|
||||||
bool "Enable SoC UART debug port selected by UART_FOR_CONSOLE."
|
|
||||||
default n
|
|
||||||
select CONSOLE_SERIAL
|
|
||||||
select DRIVERS_UART
|
|
||||||
select DRIVERS_UART_8250MEM_32
|
|
||||||
select NO_UART_ON_SUPERIO
|
|
||||||
|
|
||||||
# 32KiB bootblock is all that is mapped in by the CSE at top of 4GiB.
|
# 32KiB bootblock is all that is mapped in by the CSE at top of 4GiB.
|
||||||
config C_ENV_BOOTBLOCK_SIZE
|
config C_ENV_BOOTBLOCK_SIZE
|
||||||
hex
|
hex
|
||||||
|
|
|
@ -18,14 +18,14 @@ bootblock-y += lpc.c
|
||||||
bootblock-y += mmap_boot.c
|
bootblock-y += mmap_boot.c
|
||||||
bootblock-y += pmutil.c
|
bootblock-y += pmutil.c
|
||||||
bootblock-y += spi.c
|
bootblock-y += spi.c
|
||||||
bootblock-$(CONFIG_UART_DEBUG) += uart.c
|
bootblock-y += uart.c
|
||||||
|
|
||||||
romstage-y += car.c
|
romstage-y += car.c
|
||||||
romstage-$(CONFIG_PLATFORM_USES_FSP2_0) += romstage.c
|
romstage-$(CONFIG_PLATFORM_USES_FSP2_0) += romstage.c
|
||||||
romstage-y += gspi.c
|
romstage-y += gspi.c
|
||||||
romstage-y += heci.c
|
romstage-y += heci.c
|
||||||
romstage-y += i2c.c
|
romstage-y += i2c.c
|
||||||
romstage-$(CONFIG_UART_DEBUG) += uart.c
|
romstage-y += uart.c
|
||||||
romstage-y += memmap.c
|
romstage-y += memmap.c
|
||||||
romstage-y += meminit.c
|
romstage-y += meminit.c
|
||||||
ifeq ($(CONFIG_SOC_INTEL_GLK),y)
|
ifeq ($(CONFIG_SOC_INTEL_GLK),y)
|
||||||
|
@ -42,7 +42,7 @@ smm-y += mmap_boot.c
|
||||||
smm-y += pmutil.c
|
smm-y += pmutil.c
|
||||||
smm-y += smihandler.c
|
smm-y += smihandler.c
|
||||||
smm-y += spi.c
|
smm-y += spi.c
|
||||||
smm-$(CONFIG_UART_DEBUG) += uart.c
|
smm-y += uart.c
|
||||||
smm-y += elog.c
|
smm-y += elog.c
|
||||||
|
|
||||||
ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c
|
ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c
|
||||||
|
@ -57,7 +57,7 @@ ramstage-y += i2c.c
|
||||||
ramstage-y += lpc.c
|
ramstage-y += lpc.c
|
||||||
ramstage-y += memmap.c
|
ramstage-y += memmap.c
|
||||||
ramstage-y += mmap_boot.c
|
ramstage-y += mmap_boot.c
|
||||||
ramstage-$(CONFIG_UART_DEBUG) += uart.c
|
ramstage-y += uart.c
|
||||||
ramstage-y += nhlt.c
|
ramstage-y += nhlt.c
|
||||||
ramstage-y += spi.c
|
ramstage-y += spi.c
|
||||||
ramstage-y += systemagent.c
|
ramstage-y += systemagent.c
|
||||||
|
@ -74,7 +74,7 @@ postcar-y += spi.c
|
||||||
postcar-y += i2c.c
|
postcar-y += i2c.c
|
||||||
postcar-$(CONFIG_RESET_ON_INVALID_RAMSTAGE_CACHE) += heci.c
|
postcar-$(CONFIG_RESET_ON_INVALID_RAMSTAGE_CACHE) += heci.c
|
||||||
postcar-$(CONFIG_RESET_ON_INVALID_RAMSTAGE_CACHE) += reset.c
|
postcar-$(CONFIG_RESET_ON_INVALID_RAMSTAGE_CACHE) += reset.c
|
||||||
postcar-$(CONFIG_UART_DEBUG) += uart.c
|
postcar-y += uart.c
|
||||||
postcar-$(CONFIG_VBOOT_MEASURED_BOOT) += gspi.c
|
postcar-$(CONFIG_VBOOT_MEASURED_BOOT) += gspi.c
|
||||||
|
|
||||||
verstage-y += car.c
|
verstage-y += car.c
|
||||||
|
@ -83,7 +83,7 @@ verstage-y += gspi.c
|
||||||
verstage-y += heci.c
|
verstage-y += heci.c
|
||||||
verstage-y += memmap.c
|
verstage-y += memmap.c
|
||||||
verstage-y += mmap_boot.c
|
verstage-y += mmap_boot.c
|
||||||
verstage-$(CONFIG_UART_DEBUG) += uart.c
|
verstage-y += uart.c
|
||||||
verstage-y += pmutil.c
|
verstage-y += pmutil.c
|
||||||
verstage-y += reset.c
|
verstage-y += reset.c
|
||||||
verstage-y += spi.c
|
verstage-y += spi.c
|
||||||
|
|
|
@ -95,7 +95,7 @@ void bootblock_soc_early_init(void)
|
||||||
pmc_global_reset_enable(0);
|
pmc_global_reset_enable(0);
|
||||||
|
|
||||||
/* Prepare UART for serial console. */
|
/* Prepare UART for serial console. */
|
||||||
if (IS_ENABLED(CONFIG_UART_DEBUG))
|
if (IS_ENABLED(CONFIG_INTEL_LPSS_UART_FOR_CONSOLE))
|
||||||
uart_bootblock_init();
|
uart_bootblock_init();
|
||||||
|
|
||||||
if (IS_ENABLED(CONFIG_TPM_ON_FAST_SPI))
|
if (IS_ENABLED(CONFIG_TPM_ON_FAST_SPI))
|
||||||
|
|
|
@ -222,7 +222,7 @@ static void dump_cse_version(void *unused)
|
||||||
* Print ME version only if UART debugging is enabled. Else, it takes
|
* Print ME version only if UART debugging is enabled. Else, it takes
|
||||||
* ~0.6 second to talk to ME and get this information.
|
* ~0.6 second to talk to ME and get this information.
|
||||||
*/
|
*/
|
||||||
if (!IS_ENABLED(CONFIG_UART_DEBUG))
|
if (!IS_ENABLED(CONFIG_CONSOLE_SERIAL))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
msg.mkhi_hdr.fields.group_id = MKHI_GROUP_ID_GEN;
|
msg.mkhi_hdr.fields.group_id = MKHI_GROUP_ID_GEN;
|
||||||
|
|
|
@ -278,7 +278,7 @@ asmlinkage void car_stage_entry(void)
|
||||||
static void fill_console_params(FSPM_UPD *mupd)
|
static void fill_console_params(FSPM_UPD *mupd)
|
||||||
{
|
{
|
||||||
if (IS_ENABLED(CONFIG_CONSOLE_SERIAL)) {
|
if (IS_ENABLED(CONFIG_CONSOLE_SERIAL)) {
|
||||||
if (IS_ENABLED(CONFIG_UART_DEBUG)) {
|
if (IS_ENABLED(CONFIG_INTEL_LPSS_UART_FOR_CONSOLE)) {
|
||||||
mupd->FspmConfig.SerialDebugPortDevice =
|
mupd->FspmConfig.SerialDebugPortDevice =
|
||||||
CONFIG_UART_FOR_CONSOLE;
|
CONFIG_UART_FOR_CONSOLE;
|
||||||
/* use MMIO port type */
|
/* use MMIO port type */
|
||||||
|
|
|
@ -77,23 +77,6 @@ config CPU_SPECIFIC_OPTIONS
|
||||||
select DISPLAY_FSP_VERSION_INFO
|
select DISPLAY_FSP_VERSION_INFO
|
||||||
select FSP_T_XIP if FSP_CAR
|
select FSP_T_XIP if FSP_CAR
|
||||||
|
|
||||||
config UART_DEBUG
|
|
||||||
bool "Enable UART debug port."
|
|
||||||
default n
|
|
||||||
select CONSOLE_SERIAL
|
|
||||||
select BOOTBLOCK_CONSOLE
|
|
||||||
select DRIVERS_UART
|
|
||||||
select DRIVERS_UART_8250MEM_32
|
|
||||||
select NO_UART_ON_SUPERIO
|
|
||||||
|
|
||||||
config UART_FOR_CONSOLE
|
|
||||||
int "Index for LPSS UART port to use for console"
|
|
||||||
default 2 if DRIVERS_UART_8250MEM_32
|
|
||||||
default 0
|
|
||||||
help
|
|
||||||
Index for LPSS UART port to use for console:
|
|
||||||
0 = LPSS UART0, 1 = LPSS UART1, 2 = LPSS UART2
|
|
||||||
|
|
||||||
config DCACHE_RAM_BASE
|
config DCACHE_RAM_BASE
|
||||||
default 0xfef00000
|
default 0xfef00000
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ bootblock-y += memmap.c
|
||||||
bootblock-y += spi.c
|
bootblock-y += spi.c
|
||||||
bootblock-y += lpc.c
|
bootblock-y += lpc.c
|
||||||
bootblock-y += p2sb.c
|
bootblock-y += p2sb.c
|
||||||
bootblock-$(CONFIG_UART_DEBUG) += uart.c
|
bootblock-y += uart.c
|
||||||
|
|
||||||
romstage-$(CONFIG_SOC_INTEL_CANNONLAKE_MEMCFG_INIT) += cnl_memcfg_init.c
|
romstage-$(CONFIG_SOC_INTEL_CANNONLAKE_MEMCFG_INIT) += cnl_memcfg_init.c
|
||||||
romstage-y += gspi.c
|
romstage-y += gspi.c
|
||||||
|
@ -29,7 +29,7 @@ romstage-y += memmap.c
|
||||||
romstage-y += pmutil.c
|
romstage-y += pmutil.c
|
||||||
romstage-y += reset.c
|
romstage-y += reset.c
|
||||||
romstage-y += spi.c
|
romstage-y += spi.c
|
||||||
romstage-$(CONFIG_UART_DEBUG) += uart.c
|
romstage-y += uart.c
|
||||||
|
|
||||||
ramstage-y += acpi.c
|
ramstage-y += acpi.c
|
||||||
ramstage-y += chip.c
|
ramstage-y += chip.c
|
||||||
|
@ -51,27 +51,27 @@ ramstage-$(CONFIG_PLATFORM_USES_FSP2_0) += reset.c
|
||||||
ramstage-y += smmrelocate.c
|
ramstage-y += smmrelocate.c
|
||||||
ramstage-y += spi.c
|
ramstage-y += spi.c
|
||||||
ramstage-y += systemagent.c
|
ramstage-y += systemagent.c
|
||||||
ramstage-$(CONFIG_UART_DEBUG) += uart.c
|
ramstage-y += uart.c
|
||||||
ramstage-y += vr_config.c
|
ramstage-y += vr_config.c
|
||||||
ramstage-y += sd.c
|
ramstage-y += sd.c
|
||||||
|
|
||||||
smm-y += p2sb.c
|
smm-y += p2sb.c
|
||||||
smm-y += pmutil.c
|
smm-y += pmutil.c
|
||||||
smm-y += smihandler.c
|
smm-y += smihandler.c
|
||||||
smm-$(CONFIG_UART_DEBUG) += uart.c
|
smm-y += uart.c
|
||||||
|
|
||||||
postcar-y += memmap.c
|
postcar-y += memmap.c
|
||||||
postcar-y += pmutil.c
|
postcar-y += pmutil.c
|
||||||
postcar-y += i2c.c
|
postcar-y += i2c.c
|
||||||
postcar-y += gspi.c
|
postcar-y += gspi.c
|
||||||
postcar-y += spi.c
|
postcar-y += spi.c
|
||||||
postcar-$(CONFIG_UART_DEBUG) += uart.c
|
postcar-y += uart.c
|
||||||
|
|
||||||
verstage-y += gspi.c
|
verstage-y += gspi.c
|
||||||
verstage-y += i2c.c
|
verstage-y += i2c.c
|
||||||
verstage-y += pmutil.c
|
verstage-y += pmutil.c
|
||||||
verstage-y += spi.c
|
verstage-y += spi.c
|
||||||
verstage-$(CONFIG_UART_DEBUG) += uart.c
|
verstage-y += uart.c
|
||||||
|
|
||||||
ifeq ($(CONFIG_SOC_INTEL_CANNONLAKE_PCH_H),y)
|
ifeq ($(CONFIG_SOC_INTEL_CANNONLAKE_PCH_H),y)
|
||||||
bootblock-y += gpio_cnp_h.c
|
bootblock-y += gpio_cnp_h.c
|
||||||
|
|
|
@ -53,7 +53,7 @@ void bootblock_soc_early_init(void)
|
||||||
bootblock_pch_early_init();
|
bootblock_pch_early_init();
|
||||||
bootblock_cpu_init();
|
bootblock_cpu_init();
|
||||||
pch_early_iorange_init();
|
pch_early_iorange_init();
|
||||||
if (IS_ENABLED(CONFIG_UART_DEBUG))
|
if (IS_ENABLED(CONFIG_INTEL_LPSS_UART_FOR_CONSOLE))
|
||||||
uart_bootblock_init();
|
uart_bootblock_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -15,3 +15,14 @@ config SOC_INTEL_COMMON_BLOCK_UART_LPSS_CLK_N_VAL
|
||||||
hex
|
hex
|
||||||
help
|
help
|
||||||
Clock m-divisor value for m/n divider
|
Clock m-divisor value for m/n divider
|
||||||
|
|
||||||
|
config INTEL_LPSS_UART_FOR_CONSOLE
|
||||||
|
bool
|
||||||
|
depends on SOC_INTEL_COMMON_BLOCK_UART
|
||||||
|
select DRIVERS_UART_8250MEM_32
|
||||||
|
select FIXED_UART_FOR_CONSOLE
|
||||||
|
help
|
||||||
|
Selected by mainboards that use one of the SoC's LPSS UARTS
|
||||||
|
for the coreboot console.
|
||||||
|
WARNING: UART_FOR_CONSOLE has to be set to a correct value,
|
||||||
|
otherwise wrong pad configurations might be selected.
|
||||||
|
|
|
@ -88,12 +88,11 @@ void uart_common_init(struct device *device, uintptr_t baseaddr)
|
||||||
struct device *uart_get_device(void)
|
struct device *uart_get_device(void)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* This function will get called even if UART_DEBUG config options is
|
* This function will get called even if INTEL_LPSS_UART_FOR_CONSOLE
|
||||||
* not selected.
|
* config option is not selected.
|
||||||
* By default returning NULL in case CONFIG_UART_DEBUG option is not
|
* By default return NULL in this case to avoid compilation errors.
|
||||||
* selected to avoid compilation errors.
|
|
||||||
*/
|
*/
|
||||||
if (!IS_ENABLED(CONFIG_UART_DEBUG))
|
if (!IS_ENABLED(CONFIG_INTEL_LPSS_UART_FOR_CONSOLE))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
int console_index = uart_get_valid_index();
|
int console_index = uart_get_valid_index();
|
||||||
|
@ -157,7 +156,8 @@ static void uart_read_resources(struct device *dev)
|
||||||
pci_dev_read_resources(dev);
|
pci_dev_read_resources(dev);
|
||||||
|
|
||||||
/* Set the configured UART base address for the debug port */
|
/* Set the configured UART base address for the debug port */
|
||||||
if (IS_ENABLED(CONFIG_UART_DEBUG) && uart_is_debug_controller(dev)) {
|
if (IS_ENABLED(CONFIG_INTEL_LPSS_UART_FOR_CONSOLE) &&
|
||||||
|
uart_is_debug_controller(dev)) {
|
||||||
struct resource *res = find_resource(dev, PCI_BASE_ADDRESS_0);
|
struct resource *res = find_resource(dev, PCI_BASE_ADDRESS_0);
|
||||||
/* Need to set the base and size for the resource allocator. */
|
/* Need to set the base and size for the resource allocator. */
|
||||||
res->base = UART_BASE(CONFIG_UART_FOR_CONSOLE);
|
res->base = UART_BASE(CONFIG_UART_FOR_CONSOLE);
|
||||||
|
|
|
@ -62,23 +62,6 @@ config CPU_SPECIFIC_OPTIONS
|
||||||
select UDK_2017_BINDING
|
select UDK_2017_BINDING
|
||||||
select DISPLAY_FSP_VERSION_INFO
|
select DISPLAY_FSP_VERSION_INFO
|
||||||
|
|
||||||
config UART_DEBUG
|
|
||||||
bool "Enable UART debug port."
|
|
||||||
default n
|
|
||||||
select CONSOLE_SERIAL
|
|
||||||
select BOOTBLOCK_CONSOLE
|
|
||||||
select DRIVERS_UART
|
|
||||||
select DRIVERS_UART_8250MEM_32
|
|
||||||
select NO_UART_ON_SUPERIO
|
|
||||||
|
|
||||||
config UART_FOR_CONSOLE
|
|
||||||
int "Index for LPSS UART port to use for console"
|
|
||||||
default 2 if DRIVERS_UART_8250MEM_32
|
|
||||||
default 0
|
|
||||||
help
|
|
||||||
Index for LPSS UART port to use for console:
|
|
||||||
0 = LPSS UART0, 1 = LPSS UART1, 2 = LPSS UART2
|
|
||||||
|
|
||||||
config DCACHE_RAM_BASE
|
config DCACHE_RAM_BASE
|
||||||
default 0xfef00000
|
default 0xfef00000
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@ bootblock-y += memmap.c
|
||||||
bootblock-y += spi.c
|
bootblock-y += spi.c
|
||||||
bootblock-y += lpc.c
|
bootblock-y += lpc.c
|
||||||
bootblock-y += p2sb.c
|
bootblock-y += p2sb.c
|
||||||
bootblock-$(CONFIG_UART_DEBUG) += uart.c
|
bootblock-y += uart.c
|
||||||
|
|
||||||
romstage-y += gpio.c
|
romstage-y += gpio.c
|
||||||
romstage-y += gspi.c
|
romstage-y += gspi.c
|
||||||
|
@ -30,7 +30,7 @@ romstage-y += memmap.c
|
||||||
romstage-y += pmutil.c
|
romstage-y += pmutil.c
|
||||||
romstage-y += reset.c
|
romstage-y += reset.c
|
||||||
romstage-y += spi.c
|
romstage-y += spi.c
|
||||||
romstage-$(CONFIG_UART_DEBUG) += uart.c
|
romstage-y += uart.c
|
||||||
|
|
||||||
ramstage-y += acpi.c
|
ramstage-y += acpi.c
|
||||||
ramstage-y += chip.c
|
ramstage-y += chip.c
|
||||||
|
@ -52,27 +52,27 @@ ramstage-$(CONFIG_PLATFORM_USES_FSP2_0) += reset.c
|
||||||
ramstage-y += smmrelocate.c
|
ramstage-y += smmrelocate.c
|
||||||
ramstage-y += spi.c
|
ramstage-y += spi.c
|
||||||
ramstage-y += systemagent.c
|
ramstage-y += systemagent.c
|
||||||
ramstage-$(CONFIG_UART_DEBUG) += uart.c
|
ramstage-y += uart.c
|
||||||
ramstage-y += sd.c
|
ramstage-y += sd.c
|
||||||
|
|
||||||
smm-y += gpio.c
|
smm-y += gpio.c
|
||||||
smm-y += p2sb.c
|
smm-y += p2sb.c
|
||||||
smm-y += pmutil.c
|
smm-y += pmutil.c
|
||||||
smm-y += smihandler.c
|
smm-y += smihandler.c
|
||||||
smm-$(CONFIG_UART_DEBUG) += uart.c
|
smm-y += uart.c
|
||||||
|
|
||||||
postcar-y += memmap.c
|
postcar-y += memmap.c
|
||||||
postcar-y += pmutil.c
|
postcar-y += pmutil.c
|
||||||
postcar-y += i2c.c
|
postcar-y += i2c.c
|
||||||
postcar-y += gspi.c
|
postcar-y += gspi.c
|
||||||
postcar-y += spi.c
|
postcar-y += spi.c
|
||||||
postcar-$(CONFIG_UART_DEBUG) += uart.c
|
postcar-y += uart.c
|
||||||
|
|
||||||
verstage-y += gspi.c
|
verstage-y += gspi.c
|
||||||
verstage-y += i2c.c
|
verstage-y += i2c.c
|
||||||
verstage-y += pmutil.c
|
verstage-y += pmutil.c
|
||||||
verstage-y += spi.c
|
verstage-y += spi.c
|
||||||
verstage-$(CONFIG_UART_DEBUG) += uart.c
|
verstage-y += uart.c
|
||||||
|
|
||||||
CPPFLAGS_common += -I$(src)/soc/intel/icelake
|
CPPFLAGS_common += -I$(src)/soc/intel/icelake
|
||||||
CPPFLAGS_common += -I$(src)/soc/intel/icelake/include
|
CPPFLAGS_common += -I$(src)/soc/intel/icelake/include
|
||||||
|
|
|
@ -32,7 +32,7 @@ void bootblock_soc_early_init(void)
|
||||||
bootblock_pch_early_init();
|
bootblock_pch_early_init();
|
||||||
bootblock_cpu_init();
|
bootblock_cpu_init();
|
||||||
pch_early_iorange_init();
|
pch_early_iorange_init();
|
||||||
if (IS_ENABLED(CONFIG_UART_DEBUG))
|
if (IS_ENABLED(CONFIG_INTEL_LPSS_UART_FOR_CONSOLE))
|
||||||
uart_bootblock_init();
|
uart_bootblock_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -182,22 +182,6 @@ config VGA_BIOS_ID
|
||||||
string
|
string
|
||||||
default "8086,0406"
|
default "8086,0406"
|
||||||
|
|
||||||
config UART_DEBUG
|
|
||||||
bool "Enable UART debug port."
|
|
||||||
default n
|
|
||||||
select CONSOLE_SERIAL
|
|
||||||
select DRIVERS_UART
|
|
||||||
select DRIVERS_UART_8250MEM_32
|
|
||||||
select NO_UART_ON_SUPERIO
|
|
||||||
|
|
||||||
config UART_FOR_CONSOLE
|
|
||||||
int "Index for LPSS UART port to use for console"
|
|
||||||
default 2 if DRIVERS_UART_8250MEM
|
|
||||||
default 0
|
|
||||||
help
|
|
||||||
Index for LPSS UART port to use for console:
|
|
||||||
0 = LPSS UART0, 1 = LPSS UART1, 2 = LPSS UART2
|
|
||||||
|
|
||||||
config SKYLAKE_SOC_PCH_H
|
config SKYLAKE_SOC_PCH_H
|
||||||
bool
|
bool
|
||||||
default n
|
default n
|
||||||
|
|
|
@ -22,13 +22,13 @@ bootblock-y += p2sb.c
|
||||||
bootblock-y += pmutil.c
|
bootblock-y += pmutil.c
|
||||||
bootblock-y += spi.c
|
bootblock-y += spi.c
|
||||||
bootblock-y += lpc.c
|
bootblock-y += lpc.c
|
||||||
bootblock-$(CONFIG_UART_DEBUG) += uart.c
|
bootblock-y += uart.c
|
||||||
|
|
||||||
verstage-y += gspi.c
|
verstage-y += gspi.c
|
||||||
verstage-y += pmutil.c
|
verstage-y += pmutil.c
|
||||||
verstage-y += i2c.c
|
verstage-y += i2c.c
|
||||||
verstage-y += spi.c
|
verstage-y += spi.c
|
||||||
verstage-$(CONFIG_UART_DEBUG) += uart.c
|
verstage-y += uart.c
|
||||||
|
|
||||||
romstage-y += gpio.c
|
romstage-y += gpio.c
|
||||||
romstage-y += gspi.c
|
romstage-y += gspi.c
|
||||||
|
@ -40,7 +40,7 @@ romstage-y += pmc.c
|
||||||
romstage-y += pmutil.c
|
romstage-y += pmutil.c
|
||||||
romstage-$(CONFIG_PLATFORM_USES_FSP2_0) += reset.c
|
romstage-$(CONFIG_PLATFORM_USES_FSP2_0) += reset.c
|
||||||
romstage-y += spi.c
|
romstage-y += spi.c
|
||||||
romstage-$(CONFIG_UART_DEBUG) += uart.c
|
romstage-y += uart.c
|
||||||
|
|
||||||
ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c
|
ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c
|
||||||
ramstage-$(CONFIG_PLATFORM_USES_FSP1_1) += chip.c
|
ramstage-$(CONFIG_PLATFORM_USES_FSP1_1) += chip.c
|
||||||
|
@ -67,7 +67,7 @@ ramstage-y += smmrelocate.c
|
||||||
ramstage-y += spi.c
|
ramstage-y += spi.c
|
||||||
ramstage-y += systemagent.c
|
ramstage-y += systemagent.c
|
||||||
ramstage-y += thermal.c
|
ramstage-y += thermal.c
|
||||||
ramstage-$(CONFIG_UART_DEBUG) += uart.c
|
ramstage-y += uart.c
|
||||||
ramstage-y += vr_config.c
|
ramstage-y += vr_config.c
|
||||||
|
|
||||||
smm-y += elog.c
|
smm-y += elog.c
|
||||||
|
@ -75,13 +75,13 @@ smm-y += gpio.c
|
||||||
smm-y += p2sb.c
|
smm-y += p2sb.c
|
||||||
smm-y += pmutil.c
|
smm-y += pmutil.c
|
||||||
smm-y += smihandler.c
|
smm-y += smihandler.c
|
||||||
smm-$(CONFIG_UART_DEBUG) += uart.c
|
smm-y += uart.c
|
||||||
|
|
||||||
postcar-y += memmap.c
|
postcar-y += memmap.c
|
||||||
postcar-y += gspi.c
|
postcar-y += gspi.c
|
||||||
postcar-y += spi.c
|
postcar-y += spi.c
|
||||||
postcar-y += i2c.c
|
postcar-y += i2c.c
|
||||||
postcar-$(CONFIG_UART_DEBUG) += uart.c
|
postcar-y += uart.c
|
||||||
|
|
||||||
|
|
||||||
# Skylake D0
|
# Skylake D0
|
||||||
|
|
|
@ -32,7 +32,7 @@ void bootblock_soc_early_init(void)
|
||||||
bootblock_cpu_init();
|
bootblock_cpu_init();
|
||||||
pch_early_iorange_init();
|
pch_early_iorange_init();
|
||||||
|
|
||||||
if (IS_ENABLED(CONFIG_UART_DEBUG))
|
if (IS_ENABLED(CONFIG_INTEL_LPSS_UART_FOR_CONSOLE))
|
||||||
uart_bootblock_init();
|
uart_bootblock_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -239,7 +239,7 @@ static void print_me_version(void *unused)
|
||||||
* Print ME version only if UART debugging is enabled. Else, it takes ~1
|
* Print ME version only if UART debugging is enabled. Else, it takes ~1
|
||||||
* second to talk to ME and get this information.
|
* second to talk to ME and get this information.
|
||||||
*/
|
*/
|
||||||
if (!IS_ENABLED(CONFIG_UART_DEBUG))
|
if (!IS_ENABLED(CONFIG_CONSOLE_SERIAL))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
hfs.data = me_read_config32(PCI_ME_HFSTS1);
|
hfs.data = me_read_config32(PCI_ME_HFSTS1);
|
||||||
|
|
Loading…
Reference in New Issue