From 084b8e4f9725323c13fe512b01b15bcfec9b42a6 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Fri, 24 Nov 2023 13:38:02 +0200 Subject: [PATCH] x86: Only enable EFI_CONSOLE if UART console is not enabled Most x86 build configurations enable the UART console. Since EFI console has also defaulted to enabled, this means that the EFI covers the early part of the boot until UART takes over. This is all fine, except that enabling EFI console has the effect of disabling PRINTK_SYNC. This in turn has the effect of causing garbled output over UART, which has led to several bug reports on x86 platforms (in particular on up_squared). Since EFI console should really only be used for early platform bringup and debugging purposes, it's not really ideal to unconditionally have it enabled by default. Instead, change the default enabling to be conditional to the UART console being disabled. Fixes #54861 Fixes #55071 Signed-off-by: Johan Hedberg --- arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index d7ccfca7ec..7f852742fb 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -472,7 +472,7 @@ config X86_EFI_CONSOLE bool depends on X86_EFI && X86_64 && !X86_VERY_EARLY_CONSOLE select EFI_CONSOLE - default y + default y if !UART_CONSOLE help This enables the use of the UEFI console device as the Zephyr printk handler. It requires that no interferences