Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/70500 )
Change subject: mb/ocp: Provide better defaults for UART ......................................................................
mb/ocp: Provide better defaults for UART
The baudrate of the SOC console is always 57600 and on tiogapass the 0x2f8 COM port is also used by the SOL console.
Change-Id: Ia7bf9fbe10ec66f49c2c7b41938a1a33967c131a Signed-off-by: Arthur Heymans arthur@aheymans.xyz Reviewed-on: https://review.coreboot.org/c/coreboot/+/70500 Reviewed-by: Jonathan Zhang jonzhang@fb.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/ocp/deltalake/Kconfig M src/mainboard/ocp/deltalake/Makefile.inc A src/mainboard/ocp/deltalake/console.c M src/mainboard/ocp/tiogapass/Kconfig M src/mainboard/ocp/tiogapass/Makefile.inc A src/mainboard/ocp/tiogapass/console.c 6 files changed, 49 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Jonathan Zhang: Looks good to me, approved
diff --git a/src/mainboard/ocp/deltalake/Kconfig b/src/mainboard/ocp/deltalake/Kconfig index 74212f9..6abffd4 100644 --- a/src/mainboard/ocp/deltalake/Kconfig +++ b/src/mainboard/ocp/deltalake/Kconfig @@ -16,11 +16,15 @@ select IPMI_OCP select MEMORY_MAPPED_TPM select MAINBOARD_HAS_TPM2 + select UART_OVERRIDE_BAUDRATE
config UART_FOR_CONSOLE int default 1
+config TTYS0_BAUD + default 57600 + config POWER_STATE_DEFAULT_ON_AFTER_FAILURE default n
diff --git a/src/mainboard/ocp/deltalake/Makefile.inc b/src/mainboard/ocp/deltalake/Makefile.inc index 245a6d6..c1dc8d7 100644 --- a/src/mainboard/ocp/deltalake/Makefile.inc +++ b/src/mainboard/ocp/deltalake/Makefile.inc @@ -8,4 +8,5 @@ ramstage-y += ramstage.c ipmi.c ramstage-$(CONFIG_HAVE_ACPI_TABLES) += fadt.c all-$(CONFIG_CONSOLE_OVERRIDE_LOGLEVEL) += loglevel_vpd.c +all-y += console.c CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/include diff --git a/src/mainboard/ocp/deltalake/console.c b/src/mainboard/ocp/deltalake/console.c new file mode 100644 index 0000000..2cbeb3d --- /dev/null +++ b/src/mainboard/ocp/deltalake/console.c @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <console/uart.h> + +unsigned int get_uart_baudrate(void) +{ + /* SOL console baud rate. */ + return 57600; +} diff --git a/src/mainboard/ocp/tiogapass/Kconfig b/src/mainboard/ocp/tiogapass/Kconfig index 74ab25c..886743c 100644 --- a/src/mainboard/ocp/tiogapass/Kconfig +++ b/src/mainboard/ocp/tiogapass/Kconfig @@ -13,6 +13,7 @@ select OCP_DMI select SOC_INTEL_SKYLAKE_SP select SUPERIO_ASPEED_AST2400 + select UART_OVERRIDE_BAUDRATE select VPD
config MAINBOARD_DIR @@ -28,4 +29,11 @@ config FMDFILE default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/board.fmd"
+config UART_FOR_CONSOLE + int + default 1 + +config TTYS0_BAUD + default 57600 + endif # BOARD_OCP_TIOGAPASS diff --git a/src/mainboard/ocp/tiogapass/Makefile.inc b/src/mainboard/ocp/tiogapass/Makefile.inc index f481288..bcf0e6c 100644 --- a/src/mainboard/ocp/tiogapass/Makefile.inc +++ b/src/mainboard/ocp/tiogapass/Makefile.inc @@ -4,4 +4,6 @@ romstage-y += ipmi.c ramstage-y += ramstage.c ipmi.c
+all-y += console.c + CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/include diff --git a/src/mainboard/ocp/tiogapass/console.c b/src/mainboard/ocp/tiogapass/console.c new file mode 100644 index 0000000..2cbeb3d --- /dev/null +++ b/src/mainboard/ocp/tiogapass/console.c @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <console/uart.h> + +unsigned int get_uart_baudrate(void) +{ + /* SOL console baud rate. */ + return 57600; +}