diff options
Diffstat (limited to 'src/mainboard/ocp')
| -rw-r--r-- | src/mainboard/ocp/deltalake/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/ocp/deltalake/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/mainboard/ocp/deltalake/romstage.c | 6 | ||||
| -rw-r--r-- | src/mainboard/ocp/deltalake/uartio_vpd.c | 17 | ||||
| -rw-r--r-- | src/mainboard/ocp/deltalake/vpd.h | 4 |
5 files changed, 1 insertions, 28 deletions
diff --git a/src/mainboard/ocp/deltalake/Kconfig b/src/mainboard/ocp/deltalake/Kconfig index dbf4a2ed6d..74212f9c1d 100644 --- a/src/mainboard/ocp/deltalake/Kconfig +++ b/src/mainboard/ocp/deltalake/Kconfig @@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS select IPMI_OCP select MEMORY_MAPPED_TPM select MAINBOARD_HAS_TPM2 - select OVERRIDE_UART_FOR_CONSOLE config UART_FOR_CONSOLE int diff --git a/src/mainboard/ocp/deltalake/Makefile.inc b/src/mainboard/ocp/deltalake/Makefile.inc index 08db2c778e..245a6d68aa 100644 --- a/src/mainboard/ocp/deltalake/Makefile.inc +++ b/src/mainboard/ocp/deltalake/Makefile.inc @@ -8,5 +8,4 @@ romstage-$(CONFIG_IPMI_KCS_ROMSTAGE) += ipmi.c ramstage-y += ramstage.c ipmi.c ramstage-$(CONFIG_HAVE_ACPI_TABLES) += fadt.c all-$(CONFIG_CONSOLE_OVERRIDE_LOGLEVEL) += loglevel_vpd.c -all-$(CONFIG_OVERRIDE_UART_FOR_CONSOLE) += uartio_vpd.c CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/include diff --git a/src/mainboard/ocp/deltalake/romstage.c b/src/mainboard/ocp/deltalake/romstage.c index 2efed1ca84..23bbffeb78 100644 --- a/src/mainboard/ocp/deltalake/romstage.c +++ b/src/mainboard/ocp/deltalake/romstage.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include <console/console.h> -#include <console/uart.h> #include <drivers/ipmi/ipmi_if.h> #include <drivers/ipmi/ocp/ipmi_ocp.h> #include <drivers/vpd/vpd.h> @@ -60,10 +59,7 @@ static void mainboard_config_upd(FSPM_UPD *mupd) "SerialIoUartDebugEnable to %d\n", FSP_LOG, FSP_LOG_DEFAULT); mupd->FspmConfig.SerialIoUartDebugEnable = FSP_LOG_DEFAULT; } - - /* Select UART IO of FSP */ - static const unsigned int bases[] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 }; - mupd->FspmConfig.SerialIoUartDebugIoBase = bases[get_uart_for_console()]; + mupd->FspmConfig.SerialIoUartDebugIoBase = 0x2f8; if (mupd->FspmConfig.SerialIoUartDebugEnable) { /* FSP debug log level */ diff --git a/src/mainboard/ocp/deltalake/uartio_vpd.c b/src/mainboard/ocp/deltalake/uartio_vpd.c deleted file mode 100644 index 4c2d876c7d..0000000000 --- a/src/mainboard/ocp/deltalake/uartio_vpd.c +++ /dev/null @@ -1,17 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <drivers/vpd/vpd.h> -#include <console/uart.h> - -#include "vpd.h" - -unsigned int get_uart_for_console(void) -{ - int val_int = COREBOOT_UART_IO_DEFAULT; - - if (vpd_get_int(COREBOOT_UART_IO, VPD_RW_THEN_RO, (int *const) &val_int)) { - if (val_int > 3) - val_int = COREBOOT_UART_IO_DEFAULT; - } - return val_int; -} diff --git a/src/mainboard/ocp/deltalake/vpd.h b/src/mainboard/ocp/deltalake/vpd.h index fb33ef26f5..f9271343a3 100644 --- a/src/mainboard/ocp/deltalake/vpd.h +++ b/src/mainboard/ocp/deltalake/vpd.h @@ -37,10 +37,6 @@ #define FSPM_MEMREFRESHWATERMARK "fspm_mem_refresh_watermark" #define FSPM_MEMREFRESHWATERMARK_DEFAULT 1 -/* coreboot uart io select: 0 = 0x3f8, 1 = 0x2f8, 2 = 0x3e8, 3 = 0x2e8 */ -#define COREBOOT_UART_IO "coreboot_uart_io" -#define COREBOOT_UART_IO_DEFAULT 1 - /* FSP dimm frequency limit, 0:Auto, 1:DDR_1333, 2:DDR_1600, 3:DDR_1866, 4:DDR_2133, * 5:DDR_2400, 6:DDR_2666, 7:DDR_2933, 8:DDR_3200 */ #define FSP_DIMM_FREQ "fsp_dimm_freq" |