sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel: Replace UART_BASE() and friends with a Kconfig

Browse Source 
Re-add the Kconfig CONSOLE_UART_BASE_ADDRESS. It was lost by accident
on APL at least. It is used outside of soc/intel/ scope, e.g. to con-
figure SeaBIOS.

As we only ever configure a single UART for the coreboot console, we
don't need different addresses for each possible UART. Which saves
us a lot of code.

Change-Id: I28e1d98aa37a6acb57b98b8882fc4fa131d5d309
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33098
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
This commit is contained in:
Nico Huber
2019-05-29 23:33:06 +02:00
parent 10ed374d7d
commit 9995418166
10 changed files with 25 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/soc/intel/common/acpi/acpi_debug.asl
View File

@@ -59,7 +59,7 @@ Method (APRT, 1, Serialized)
#if CONFIG(DRIVERS_UART_8250MEM_32)
OperationRegion (UBAR, SystemMemory,
UART_BASE_0_ADDR(CONFIG_UART_FOR_CONSOLE), 24)
CONFIG_CONSOLE_UART_BASE_ADDRESS, 24)
Field (UBAR, AnyAcc, NoLock, Preserve)
{
TDR, 8, /* Transmit Data Register BAR + 0x000 */

9
src/soc/intel/common/block/uart/uart.c
View File

@@ -47,7 +47,7 @@ static void uart_lpss_init(uintptr_t baseaddr)
uintptr_t uart_platform_base(int idx)
{
if (idx == CONFIG_UART_FOR_CONSOLE)
return UART_BASE_0_ADDR(CONFIG_UART_FOR_CONSOLE);
return CONFIG_CONSOLE_UART_BASE_ADDRESS;
return 0;
}
#endif
@@ -137,8 +137,7 @@ static void uart_configure_gpio_pads(void)
void uart_bootblock_init(void)
{
/* Program UART BAR0, command, reset and clock register */
uart_common_init(uart_get_device(),
UART_BASE(CONFIG_UART_FOR_CONSOLE));
uart_common_init(uart_get_device(), CONFIG_CONSOLE_UART_BASE_ADDRESS);
/* Configure the 2 pads per UART. */
uart_configure_gpio_pads();
@@ -155,8 +154,8 @@ static void uart_read_resources(struct device *dev)
uart_is_debug_controller(dev)) {
struct resource *res = find_resource(dev, PCI_BASE_ADDRESS_0);
/* Need to set the base and size for the resource allocator. */
res->base = UART_BASE(CONFIG_UART_FOR_CONSOLE);
res->size = UART_BASE_SIZE;
res->base = CONFIG_CONSOLE_UART_BASE_ADDRESS;
res->size = 0x1000;
res->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED |
IORESOURCE_FIXED;
}