From 403b70adb912a8b26b329f986d636047228a3d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Niew=C3=B6hner?= Date: Sun, 3 Nov 2019 00:55:06 +0100 Subject: mb/supermicro/x11-lga1151-series: use new console delay Kconfig option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This replaces the hardcoded delay by the new Kconfig option. Change-Id: I8bf4ef7ad9beea7b3dc22e1567623a423597eff9 Signed-off-by: Michael Niewöhner Reviewed-on: https://review.coreboot.org/c/coreboot/+/36592 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- src/mainboard/supermicro/x11-lga1151-series/Kconfig | 1 + src/mainboard/supermicro/x11-lga1151-series/bootblock.c | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/mainboard/supermicro/x11-lga1151-series/Kconfig b/src/mainboard/supermicro/x11-lga1151-series/Kconfig index da8038ba5c..a3ed8af972 100644 --- a/src/mainboard/supermicro/x11-lga1151-series/Kconfig +++ b/src/mainboard/supermicro/x11-lga1151-series/Kconfig @@ -13,6 +13,7 @@ config BOARD_SUPERMICRO_BASEBOARD_X11_LGA1151_SERIES select GENERATE_SMBIOS_TABLES select IPMI_KCS select MAINBOARD_NO_FSP_GOP + select SUPERIO_ASPEED_HAS_UART_DELAY_WORKAROUND if BOARD_SUPERMICRO_BASEBOARD_X11_LGA1151_SERIES diff --git a/src/mainboard/supermicro/x11-lga1151-series/bootblock.c b/src/mainboard/supermicro/x11-lga1151-series/bootblock.c index 27653f5ae0..fe76512de1 100644 --- a/src/mainboard/supermicro/x11-lga1151-series/bootblock.c +++ b/src/mainboard/supermicro/x11-lga1151-series/bootblock.c @@ -32,13 +32,8 @@ static void early_config_gpio(void) static void early_config_superio(void) { const pnp_devfn_t serial_dev = PNP_DEV(0x2e, AST2400_SUART1); - if (CONFIG(CONSOLE_SERIAL)) { + if (CONFIG(CONSOLE_SERIAL)) aspeed_enable_serial(serial_dev, CONFIG_TTYS0_BASE); - /* The serial output is garbeled before this timeout. - * FIXME: Find out why and remove delay. - */ - mdelay(1000); - } } void bootblock_mainboard_early_init(void) -- cgit v1.2.3