GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

console/init.c: Drop CAR_GLOBAL_MIGRATION support 

Change-Id: If1150a811a41add88b80fbecda4a66c2bd322825
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37047
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Arthur Heymans 2019-11-20 22:07:40 +01:00 committed by Patrick Georgi
parent 22be29e23b
commit 48ae50c3d2
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/console/init.c
View File

@ -12,7 +12,6 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <arch/early_variables.h>
#include <commonlib/helpers.h> #include <commonlib/helpers.h>
#include <console/console.h> #include <console/console.h>
#include <console/uart.h> #include <console/uart.h>
@ -24,12 +23,12 @@
/* Mutable console log level only allowed when RAM comes online. */ /* Mutable console log level only allowed when RAM comes online. */
#define CONSOLE_LEVEL_CONST !ENV_STAGE_HAS_DATA_SECTION #define CONSOLE_LEVEL_CONST !ENV_STAGE_HAS_DATA_SECTION
static int console_inited CAR_GLOBAL; static int console_inited;
static int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; static int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL;
static inline int get_log_level(void) static inline int get_log_level(void)
{ {
if (car_get_var(console_inited) == 0) if (console_inited == 0)
return -1; return -1;
if (CONSOLE_LEVEL_CONST) if (CONSOLE_LEVEL_CONST)
return get_console_loglevel(); return get_console_loglevel();
@ -78,14 +77,14 @@ asmlinkage void console_init(void)
init_log_level(); init_log_level();
if (CONFIG(DEBUG_CONSOLE_INIT)) if (CONFIG(DEBUG_CONSOLE_INIT))
car_set_var(console_inited, 1); console_inited = 1;
if (CONFIG(EARLY_PCI_BRIDGE) && !ENV_SMM && !ENV_RAMSTAGE) if (CONFIG(EARLY_PCI_BRIDGE) && !ENV_SMM && !ENV_RAMSTAGE)
pci_early_bridge_init(); pci_early_bridge_init();
console_hw_init(); console_hw_init();
car_set_var(console_inited, 1); console_inited = 1;
printk(BIOS_NOTICE, "\n\ncoreboot-%s%s %s " ENV_STRING " starting (log level: %i)...\n", printk(BIOS_NOTICE, "\n\ncoreboot-%s%s %s " ENV_STRING " starting (log level: %i)...\n",
coreboot_version, coreboot_extra_version, coreboot_build, coreboot_version, coreboot_extra_version, coreboot_build,