summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configs/config.intel_harcuvar1
-rw-r--r--payloads/libpayload/include/coreboot_tables.h8
-rw-r--r--src/commonlib/include/commonlib/coreboot_tables.h8
-rw-r--r--src/drivers/uart/Kconfig11
-rw-r--r--src/drivers/uart/pl011.c1
-rw-r--r--src/drivers/uart/uart8250io.c1
-rw-r--r--src/drivers/uart/uart8250mem.c1
-rw-r--r--src/lib/coreboot_table.c1
-rw-r--r--src/mainboard/emulation/qemu-power8/uart.c1
-rw-r--r--src/soc/intel/quark/Kconfig8
-rw-r--r--src/soc/mediatek/common/uart.c1
-rw-r--r--src/soc/nvidia/tegra124/uart.c1
-rw-r--r--src/soc/nvidia/tegra210/uart.c1
-rw-r--r--src/soc/qualcomm/ipq40xx/uart.c1
-rw-r--r--src/soc/qualcomm/qcs405/uart.c1
-rw-r--r--src/soc/samsung/exynos5250/uart.c1
-rw-r--r--src/soc/samsung/exynos5420/uart.c1
-rw-r--r--src/soc/ti/am335x/uart.c1
-rw-r--r--tests/lib/coreboot_table-test.c3
19 files changed, 0 insertions, 52 deletions
diff --git a/configs/config.intel_harcuvar b/configs/config.intel_harcuvar
index 5c7de12cc0..347681737b 100644
--- a/configs/config.intel_harcuvar
+++ b/configs/config.intel_harcuvar
@@ -4,7 +4,6 @@ CONFIG_CBFS_SIZE=0x800000
CONFIG_BOARD_INTEL_HARCUVAR=y
# CONFIG_DRIVERS_UART_8250IO is not set
CONFIG_ENABLE_HSUART=y
-CONFIG_UART_PCI_ADDR=0x8000d000
#Sample settings for Denverton-NS FSP.
#CONFIG_ADD_FSP_BINARIES=y
diff --git a/payloads/libpayload/include/coreboot_tables.h b/payloads/libpayload/include/coreboot_tables.h
index a8fd5cd321..5f6a223bca 100644
--- a/payloads/libpayload/include/coreboot_tables.h
+++ b/payloads/libpayload/include/coreboot_tables.h
@@ -191,14 +191,6 @@ struct cb_serial {
* decisions as to which dividers to select and their values
* to eventually arrive at the desired console baud-rate. */
u32 input_hertz;
-
- /* UART PCI address: bus, device, function
- * 1 << 31 - Valid bit, PCI UART in use
- * Bus << 20
- * Device << 15
- * Function << 12
- */
- u32 uart_pci_addr;
};
struct cb_console {
diff --git a/src/commonlib/include/commonlib/coreboot_tables.h b/src/commonlib/include/commonlib/coreboot_tables.h
index 3f7ff2df29..6b5eb59cf8 100644
--- a/src/commonlib/include/commonlib/coreboot_tables.h
+++ b/src/commonlib/include/commonlib/coreboot_tables.h
@@ -197,14 +197,6 @@ struct lb_serial {
* decisions as to which dividers to select and their values
* to eventually arrive at the desired console baud-rate. */
uint32_t input_hertz;
-
- /* UART PCI address: bus, device, function
- * 1 << 31 - Valid bit, PCI UART in use
- * Bus << 20
- * Device << 15
- * Function << 12
- */
- uint32_t uart_pci_addr;
};
struct lb_console {
diff --git a/src/drivers/uart/Kconfig b/src/drivers/uart/Kconfig
index beba4012e2..a2a7f9f59b 100644
--- a/src/drivers/uart/Kconfig
+++ b/src/drivers/uart/Kconfig
@@ -75,14 +75,3 @@ config UART_USE_REFCLK_AS_INPUT_CLOCK
default n
help
Use uart_platform_refclk to specify the input clock value.
-
-config UART_PCI_ADDR
- hex "UART's PCI bus, device, function address"
- default 0x0
- help
- Specify zero if the UART is connected to another bus type.
- For PCI based UARTs, build the value as:
- * 1 << 31 - Valid bit, PCI UART in use
- * Bus << 20
- * Device << 15
- * Function << 12
diff --git a/src/drivers/uart/pl011.c b/src/drivers/uart/pl011.c
index 0a73d829ad..3653262700 100644
--- a/src/drivers/uart/pl011.c
+++ b/src/drivers/uart/pl011.c
@@ -43,7 +43,6 @@ void uart_fill_lb(void *data)
serial.baud = get_uart_baudrate();
serial.regwidth = 1;
serial.input_hertz = uart_platform_refclk();
- serial.uart_pci_addr = CONFIG_UART_PCI_ADDR;
lb_add_serial(&serial, data);
lb_add_console(LB_TAG_CONSOLE_SERIAL8250MEM, data);
diff --git a/src/drivers/uart/uart8250io.c b/src/drivers/uart/uart8250io.c
index aa8c969530..79df37ce93 100644
--- a/src/drivers/uart/uart8250io.c
+++ b/src/drivers/uart/uart8250io.c
@@ -114,7 +114,6 @@ void uart_fill_lb(void *data)
serial.baud = get_uart_baudrate();
serial.regwidth = 1;
serial.input_hertz = uart_platform_refclk();
- serial.uart_pci_addr = CONFIG_UART_PCI_ADDR;
lb_add_serial(&serial, data);
lb_add_console(LB_TAG_CONSOLE_SERIAL8250, data);
diff --git a/src/drivers/uart/uart8250mem.c b/src/drivers/uart/uart8250mem.c
index 1834095014..79e786bf12 100644
--- a/src/drivers/uart/uart8250mem.c
+++ b/src/drivers/uart/uart8250mem.c
@@ -146,7 +146,6 @@ void uart_fill_lb(void *data)
else
serial.regwidth = sizeof(uint8_t);
serial.input_hertz = uart_platform_refclk();
- serial.uart_pci_addr = CONFIG_UART_PCI_ADDR;
lb_add_serial(&serial, data);
lb_add_console(LB_TAG_CONSOLE_SERIAL8250MEM, data);
diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c
index 2a7ccc5f55..4df703958f 100644
--- a/src/lib/coreboot_table.c
+++ b/src/lib/coreboot_table.c
@@ -109,7 +109,6 @@ void lb_add_serial(struct lb_serial *new_serial, void *data)
serial->baud = new_serial->baud;
serial->regwidth = new_serial->regwidth;
serial->input_hertz = new_serial->input_hertz;
- serial->uart_pci_addr = new_serial->uart_pci_addr;
}
void lb_add_console(uint16_t consoletype, void *data)
diff --git a/src/mainboard/emulation/qemu-power8/uart.c b/src/mainboard/emulation/qemu-power8/uart.c
index 4b1bf3287e..a2f9116875 100644
--- a/src/mainboard/emulation/qemu-power8/uart.c
+++ b/src/mainboard/emulation/qemu-power8/uart.c
@@ -37,7 +37,6 @@ void uart_fill_lb(void *data)
serial.baud = 115200;
serial.regwidth = 1;
serial.input_hertz = uart_platform_refclk();
- serial.uart_pci_addr = CONFIG_UART_PCI_ADDR;
lb_add_serial(&serial, data);
lb_add_console(LB_TAG_CONSOLE_SERIAL8250MEM, data);
diff --git a/src/soc/intel/quark/Kconfig b/src/soc/intel/quark/Kconfig
index 2ecdd37a15..9783c1d1ee 100644
--- a/src/soc/intel/quark/Kconfig
+++ b/src/soc/intel/quark/Kconfig
@@ -63,14 +63,6 @@ config TTYS0_LCS
default 3
depends on ENABLE_BUILTIN_HSUART0 || ENABLE_BUILTIN_HSUART1
-# Console: PCI UART bus 0 << 20, device 20 << 15, function x << 12
-# Valid bit, PCI UART in use: 1 << 31
-config UART_PCI_ADDR
- hex
- default 0x800a1000 if ENABLE_BUILTIN_HSUART0
- default 0x800a5000 if ENABLE_BUILTIN_HSUART1
- depends on ENABLE_BUILTIN_HSUART0 || ENABLE_BUILTIN_HSUART1
-
#####
# Debug support
# The following options provide debug support for the Quark coreboot
diff --git a/src/soc/mediatek/common/uart.c b/src/soc/mediatek/common/uart.c
index ba3c71a8c6..11c3452ce2 100644
--- a/src/soc/mediatek/common/uart.c
+++ b/src/soc/mediatek/common/uart.c
@@ -167,7 +167,6 @@ void uart_fill_lb(void *data)
serial.baud = get_uart_baudrate();
serial.regwidth = 4;
serial.input_hertz = UART_HZ;
- serial.uart_pci_addr = CONFIG_UART_PCI_ADDR;
lb_add_serial(&serial, data);
lb_add_console(LB_TAG_CONSOLE_SERIAL8250MEM, data);
diff --git a/src/soc/nvidia/tegra124/uart.c b/src/soc/nvidia/tegra124/uart.c
index aba8dd954d..77d6de2c9d 100644
--- a/src/soc/nvidia/tegra124/uart.c
+++ b/src/soc/nvidia/tegra124/uart.c
@@ -122,7 +122,6 @@ void uart_fill_lb(void *data)
serial.baud = get_uart_baudrate();
serial.regwidth = 4;
serial.input_hertz = uart_platform_refclk();
- serial.uart_pci_addr = CONFIG_UART_PCI_ADDR;
lb_add_serial(&serial, data);
lb_add_console(LB_TAG_CONSOLE_SERIAL8250MEM, data);
diff --git a/src/soc/nvidia/tegra210/uart.c b/src/soc/nvidia/tegra210/uart.c
index 98c3d4ca9c..b2cdf67aa2 100644
--- a/src/soc/nvidia/tegra210/uart.c
+++ b/src/soc/nvidia/tegra210/uart.c
@@ -109,7 +109,6 @@ void uart_fill_lb(void *data)
serial.baud = get_uart_baudrate();
serial.regwidth = 4;
serial.input_hertz = uart_platform_refclk();
- serial.uart_pci_addr = CONFIG_UART_PCI_ADDR;
lb_add_serial(&serial, data);
lb_add_console(LB_TAG_CONSOLE_SERIAL8250MEM, data);
diff --git a/src/soc/qualcomm/ipq40xx/uart.c b/src/soc/qualcomm/ipq40xx/uart.c
index 9c506111fa..c04a773bce 100644
--- a/src/soc/qualcomm/ipq40xx/uart.c
+++ b/src/soc/qualcomm/ipq40xx/uart.c
@@ -265,7 +265,6 @@ void uart_fill_lb(void *data)
serial.baud = get_uart_baudrate();
serial.regwidth = 1;
serial.input_hertz = uart_platform_refclk();
- serial.uart_pci_addr = CONFIG_UART_PCI_ADDR;
lb_add_serial(&serial, data);
lb_add_console(LB_TAG_CONSOLE_SERIAL8250MEM, data);
diff --git a/src/soc/qualcomm/qcs405/uart.c b/src/soc/qualcomm/qcs405/uart.c
index 97f9e76520..007a98093f 100644
--- a/src/soc/qualcomm/qcs405/uart.c
+++ b/src/soc/qualcomm/qcs405/uart.c
@@ -266,7 +266,6 @@ void uart_fill_lb(void *data)
serial.baud = get_uart_baudrate();
serial.regwidth = 1;
serial.input_hertz = uart_platform_refclk();
- serial.uart_pci_addr = CONFIG_UART_PCI_ADDR;
lb_add_serial(&serial, data);
lb_add_console(LB_TAG_CONSOLE_SERIAL8250MEM, data);
diff --git a/src/soc/samsung/exynos5250/uart.c b/src/soc/samsung/exynos5250/uart.c
index ef03c04f23..7943651d85 100644
--- a/src/soc/samsung/exynos5250/uart.c
+++ b/src/soc/samsung/exynos5250/uart.c
@@ -140,7 +140,6 @@ void uart_fill_lb(void *data)
serial.baud = get_uart_baudrate();
serial.regwidth = 4;
serial.input_hertz = uart_platform_refclk();
- serial.uart_pci_addr = CONFIG_UART_PCI_ADDR;
lb_add_serial(&serial, data);
lb_add_console(LB_TAG_CONSOLE_SERIAL8250MEM, data);
diff --git a/src/soc/samsung/exynos5420/uart.c b/src/soc/samsung/exynos5420/uart.c
index 16a4b11da3..12681834bf 100644
--- a/src/soc/samsung/exynos5420/uart.c
+++ b/src/soc/samsung/exynos5420/uart.c
@@ -131,7 +131,6 @@ void uart_fill_lb(void *data)
serial.baud = get_uart_baudrate();
serial.regwidth = 4;
serial.input_hertz = uart_platform_refclk();
- serial.uart_pci_addr = 0;
lb_add_serial(&serial, data);
lb_add_console(LB_TAG_CONSOLE_SERIAL8250MEM, data);
diff --git a/src/soc/ti/am335x/uart.c b/src/soc/ti/am335x/uart.c
index e3648a93a6..136d785059 100644
--- a/src/soc/ti/am335x/uart.c
+++ b/src/soc/ti/am335x/uart.c
@@ -178,7 +178,6 @@ void uart_fill_lb(void *data)
serial.baud = get_uart_baudrate();
serial.regwidth = 2;
serial.input_hertz = uart_platform_refclk();
- serial.uart_pci_addr = CONFIG_UART_PCI_ADDR;
lb_add_serial(&serial, data);
lb_add_console(LB_TAG_CONSOLE_SERIAL8250MEM, data);
diff --git a/tests/lib/coreboot_table-test.c b/tests/lib/coreboot_table-test.c
index 20438efa74..52575522e9 100644
--- a/tests/lib/coreboot_table-test.c
+++ b/tests/lib/coreboot_table-test.c
@@ -127,7 +127,6 @@ static void test_lb_add_serial(void **state)
serial.baud = 115200;
serial.regwidth = 1;
serial.input_hertz = 115200 * 16;
- serial.uart_pci_addr = 0x0;
lb_add_serial(&serial, header);
assert_int_equal(1, header->table_entries);
@@ -244,7 +243,6 @@ void uart_fill_lb(void *data)
serial.baud = 115200;
serial.regwidth = 1;
serial.input_hertz = 115200 * 16;
- serial.uart_pci_addr = 0x0;
lb_add_serial(&serial, data);
lb_add_console(LB_TAG_CONSOLE_SERIAL8250MEM, data);
@@ -419,7 +417,6 @@ static void test_write_tables(void **state)
assert_int_equal(115200, serial->baud);
assert_int_equal(1, serial->regwidth);
assert_int_equal(115200 * 16, serial->input_hertz);
- assert_int_equal(0x0, serial->uart_pci_addr);
break;
case LB_TAG_CONSOLE:
assert_int_equal(sizeof(struct lb_console), record->size);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 00:50:01 +0000