From 64b29990dcf6af87f50ea77cd0cb3d742e5d5b75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Thu, 31 May 2018 07:03:29 +0300 Subject: [PATCH] console: Fix regression on LATE_CBMEM_INIT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix regression after commit 6032018 console: only allow console messages after initialization Fix it so that the two remaining platforms that are being moved to EARLY_CBMEM_INIT have chance to send board-status with non-dirty tags before and after the conversion is made. This also leaves us with a record in the repository where LATE_CBMEM_INIT was known to work on some platform. Change-Id: Ie874f986a2c474bba117d7d6ae959decec8060a8 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/26743 Reviewed-by: Aaron Durbin Reviewed-by: Furquan Shaikh Tested-by: build bot (Jenkins) --- src/console/init.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/console/init.c b/src/console/init.c index 8f71b09881..89f908f0c6 100644 --- a/src/console/init.c +++ b/src/console/init.c @@ -35,7 +35,8 @@ static int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; static inline int get_log_level(void) { - if (car_get_var(console_inited) == 0) + if (!IS_ENABLED(CONFIG_LATE_CBMEM_INIT) && + car_get_var(console_inited) == 0) return -1; if (CONSOLE_LEVEL_CONST) return get_console_loglevel(); @@ -78,7 +79,8 @@ asmlinkage void console_init(void) console_hw_init(); - car_set_var(console_inited, 1); + if (!IS_ENABLED(CONFIG_LATE_CBMEM_INIT)) + car_set_var(console_inited, 1); printk(BIOS_NOTICE, "\n\ncoreboot-%s%s %s " ENV_STRING " starting...\n", coreboot_version, coreboot_extra_version, coreboot_build);