summaryrefslogtreecommitdiff
path: root/src/console
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2018-06-03 12:29:50 +0300
committerPatrick Georgi <pgeorgi@google.com>2018-12-22 11:48:37 +0000
commit513a1a81f778b9fddbb55a36a38b2dd855215327 (patch)
treedd63ac840d855d65222f988e8dc1d8e5fa136df7 /src/console
parent8616442150f6a4777ccad9c5b29b8bbfa4be5067 (diff)
downloadcoreboot-513a1a81f778b9fddbb55a36a38b2dd855215327.tar.xz
arch/x86 cbmem: Drop tests for LATE_CBMEM_INIT
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 <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/26827 Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/console')
-rw-r--r--src/console/init.c6
1 files changed, 2 insertions, 4 deletions
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);