summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2022-12-08 14:51:11 +0100
committerFelix Held <felix-coreboot@felixheld.de>2022-12-12 13:51:46 +0000
commite0f08727e1aacf861156c6e5a3aebdc105696680 (patch)
tree9417370250ec2102918e548dd423b3df061a1f7e
parentf339b63b02193c5f562882170655199fc31a41da (diff)
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>
-rw-r--r--src/mainboard/ocp/deltalake/Kconfig4
-rw-r--r--src/mainboard/ocp/deltalake/Makefile.inc1
-rw-r--r--src/mainboard/ocp/deltalake/console.c9
-rw-r--r--src/mainboard/ocp/tiogapass/Kconfig8
-rw-r--r--src/mainboard/ocp/tiogapass/Makefile.inc2
-rw-r--r--src/mainboard/ocp/tiogapass/console.c9
6 files changed, 33 insertions, 0 deletions
diff --git a/src/mainboard/ocp/deltalake/Kconfig b/src/mainboard/ocp/deltalake/Kconfig
index 74212f9c1d..6abffd4e69 100644
--- a/src/mainboard/ocp/deltalake/Kconfig
+++ b/src/mainboard/ocp/deltalake/Kconfig
@@ -16,11 +16,15 @@ config BOARD_SPECIFIC_OPTIONS
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 245a6d68aa..c1dc8d7e6a 100644
--- a/src/mainboard/ocp/deltalake/Makefile.inc
+++ b/src/mainboard/ocp/deltalake/Makefile.inc
@@ -8,4 +8,5 @@ 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-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 0000000000..2cbeb3d48f
--- /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 74ab25cab6..886743c6df 100644
--- a/src/mainboard/ocp/tiogapass/Kconfig
+++ b/src/mainboard/ocp/tiogapass/Kconfig
@@ -13,6 +13,7 @@ config BOARD_SPECIFIC_OPTIONS
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 MAINBOARD_FAMILY
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 f481288cf0..bcf0e6c00f 100644
--- a/src/mainboard/ocp/tiogapass/Makefile.inc
+++ b/src/mainboard/ocp/tiogapass/Makefile.inc
@@ -4,4 +4,6 @@ bootblock-y += bootblock.c
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 0000000000..2cbeb3d48f
--- /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;
+}