GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/amd/picasso: rename PICASSO_UART Kconfig option 

The PICASSO_UART Kconfig option is about using the internal MMIO UART
controllers in Picasso for console, so rename it to PICASSO_CONSOLE_UART

Change-Id: I38ac9ee96af826fe49307b4d0e055a43fcbd4334
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42429
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
This commit is contained in:
Felix Held 2020-06-16 15:35:20 +02:00 committed by Felix Held
parent ca481ee87f
commit 097e449013
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mainboard/google/zork/Kconfig
View File

@ -29,7 +29,7 @@ config BOARD_SPECIFIC_OPTIONS
select GFXUMA select GFXUMA
select GOOGLE_SMBIOS_MAINBOARD_VERSION select GOOGLE_SMBIOS_MAINBOARD_VERSION
select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_CHROMEOS
select PICASSO_UART select PICASSO_CONSOLE_UART
select MAINBOARD_HAS_I2C_TPM_CR50 select MAINBOARD_HAS_I2C_TPM_CR50
select MAINBOARD_HAS_TPM2 select MAINBOARD_HAS_TPM2
select PCIEXP_ASPM select PCIEXP_ASPM

10
src/soc/amd/picasso/Kconfig
View File

@ -254,8 +254,8 @@ config PICASSO_ACPI_IO_BASE
help help
Base address for the ACPI registers. Base address for the ACPI registers.
config PICASSO_UART config PICASSO_CONSOLE_UART
bool "UART controller on Picasso" bool "Use Picasso UART controller for console"
default n default n
select DRIVERS_UART_8250MEM select DRIVERS_UART_8250MEM
select DRIVERS_UART_8250MEM_32 select DRIVERS_UART_8250MEM_32
@ -270,7 +270,7 @@ config PICASSO_UART
choice PICASSO_UART_CLOCK_SOURCE choice PICASSO_UART_CLOCK_SOURCE
prompt "UART Frequency" prompt "UART Frequency"
depends on PICASSO_UART depends on PICASSO_CONSOLE_UART
default PICASSO_UART_48MZ default PICASSO_UART_48MZ
config PICASSO_UART_48MZ config PICASSO_UART_48MZ
@ -288,7 +288,7 @@ endchoice
config PICASSO_UART_LEGACY config PICASSO_UART_LEGACY
bool "Decode legacy I/O range" bool "Decode legacy I/O range"
depends on PICASSO_UART depends on PICASSO_CONSOLE_UART # TODO: shouldn't depend on this
help help
Assign I/O 3F8, 2F8, etc. to a Picasso UART. Only a single UART may Assign I/O 3F8, 2F8, etc. to a Picasso UART. Only a single UART may
decode legacy addresses and this option enables the one used for the decode legacy addresses and this option enables the one used for the
@ -296,7 +296,7 @@ config PICASSO_UART_LEGACY
of MMIO. The MMIO decode is still present when this option is used. of MMIO. The MMIO decode is still present when this option is used.
config CONSOLE_UART_BASE_ADDRESS config CONSOLE_UART_BASE_ADDRESS
depends on CONSOLE_SERIAL && PICASSO_UART depends on CONSOLE_SERIAL && PICASSO_CONSOLE_UART
hex hex
default 0xfedc9000 if UART_FOR_CONSOLE = 0 default 0xfedc9000 if UART_FOR_CONSOLE = 0
default 0xfedca000 if UART_FOR_CONSOLE = 1 default 0xfedca000 if UART_FOR_CONSOLE = 1

4
src/soc/amd/picasso/aoac.c
View File

@ -76,13 +76,13 @@ void enable_aoac_devices(void)
for (i = 0; i < ARRAY_SIZE(aoac_devs); i++) for (i = 0; i < ARRAY_SIZE(aoac_devs); i++)
power_on_aoac_device(aoac_devs[i]); power_on_aoac_device(aoac_devs[i]);
if (CONFIG(PICASSO_UART)) if (CONFIG(PICASSO_CONSOLE_UART))
power_on_aoac_device(FCH_AOAC_UART_FOR_CONSOLE); power_on_aoac_device(FCH_AOAC_UART_FOR_CONSOLE);
/* Wait for AOAC devices to indicate power and clock OK */ /* Wait for AOAC devices to indicate power and clock OK */
for (i = 0; i < ARRAY_SIZE(aoac_devs); i++) for (i = 0; i < ARRAY_SIZE(aoac_devs); i++)
wait_for_aoac_enabled(aoac_devs[i]); wait_for_aoac_enabled(aoac_devs[i]);
if (CONFIG(PICASSO_UART)) if (CONFIG(PICASSO_CONSOLE_UART))
wait_for_aoac_enabled(FCH_AOAC_UART_FOR_CONSOLE); wait_for_aoac_enabled(FCH_AOAC_UART_FOR_CONSOLE);
} }

2
src/soc/amd/picasso/southbridge.c
View File

@ -152,7 +152,7 @@ void fch_pre_init(void)
*/ */
clear_uart_legacy_config(); clear_uart_legacy_config();
if (CONFIG(PICASSO_UART)) if (CONFIG(PICASSO_CONSOLE_UART))
set_uart_config(CONFIG_UART_FOR_CONSOLE); set_uart_config(CONFIG_UART_FOR_CONSOLE);
} }

6
src/soc/amd/picasso/uart.c
View File

@ -31,14 +31,14 @@ static const struct _uart_info {
}; };
/* /*
* Don't provide uart_platform_base and uart_platform_refclk functions if PICASSO_UART * Don't provide uart_platform_base and uart_platform_refclk functions if PICASSO_CONSOLE_UART
* isn't selected. Those two functions are used by the console UART driver and need to be * isn't selected. Those two functions are used by the console UART driver and need to be
* provided exactly once and only by the UART that is used for console. * provided exactly once and only by the UART that is used for console.
* *
* TODO: Replace the #if block by factoring out the two functions into a different compilation * TODO: Replace the #if block by factoring out the two functions into a different compilation
* unit. * unit.
*/ */
#if CONFIG(PICASSO_UART) #if CONFIG(PICASSO_CONSOLE_UART)
uintptr_t uart_platform_base(int idx) uintptr_t uart_platform_base(int idx)
{ {
@ -53,7 +53,7 @@ unsigned int uart_platform_refclk(void)
return CONFIG(PICASSO_UART_48MZ) ? 48000000 : 115200 * 16; return CONFIG(PICASSO_UART_48MZ) ? 48000000 : 115200 * 16;
} }
#endif /* PICASSO_UART */ #endif /* PICASSO_CONSOLE_UART */
void clear_uart_legacy_config(void) void clear_uart_legacy_config(void)
{ {