From 513a1a81f778b9fddbb55a36a38b2dd855215327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Sun, 3 Jun 2018 12:29:50 +0300 Subject: arch/x86 cbmem: Drop tests for LATE_CBMEM_INIT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove all cases in code where we tested for EARLY_CBMEM_INIT or LATE_CBMEM_INIT being set. This also removes all references to LATE_CBMEM_INIT in comments. Change-Id: I4e47fb5c8a947d268f4840cfb9c0d3596fb9ab39 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/26827 Reviewed-by: Nico Huber Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/console/init.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/console') diff --git a/src/console/init.c b/src/console/init.c index 89f908f0c6..8f71b09881 100644 --- a/src/console/init.c +++ b/src/console/init.c @@ -35,8 +35,7 @@ static int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; static inline int get_log_level(void) { - if (!IS_ENABLED(CONFIG_LATE_CBMEM_INIT) && - car_get_var(console_inited) == 0) + if (car_get_var(console_inited) == 0) return -1; if (CONSOLE_LEVEL_CONST) return get_console_loglevel(); @@ -79,8 +78,7 @@ asmlinkage void console_init(void) console_hw_init(); - if (!IS_ENABLED(CONFIG_LATE_CBMEM_INIT)) - car_set_var(console_inited, 1); + 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); -- cgit v1.2.3