summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2019-11-20 22:07:40 +0100
committerPatrick Georgi <pgeorgi@google.com>2019-11-29 09:20:27 +0000
commit48ae50c3d278f414154f4ef31f581294b4bc2c5e (patch)
tree18d120bab828af501a8c331a6bcd441b5a81e54c
parent22be29e23b278bc0dd344832a8e3cab1eeb07f7a (diff)
downloadcoreboot-48ae50c3d278f414154f4ef31f581294b4bc2c5e.tar.xz
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>
-rw-r--r--src/console/init.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/console/init.c b/src/console/init.c
index d4818580e4..911dbd0546 100644
--- a/src/console/init.c
+++ b/src/console/init.c
@@ -12,7 +12,6 @@
* GNU General Public License for more details.
*/
-#include <arch/early_variables.h>
#include <commonlib/helpers.h>
#include <console/console.h>
#include <console/uart.h>
@@ -24,12 +23,12 @@
/* Mutable console log level only allowed when RAM comes online. */
#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 inline int get_log_level(void)
{
- if (car_get_var(console_inited) == 0)
+ if (console_inited == 0)
return -1;
if (CONSOLE_LEVEL_CONST)
return get_console_loglevel();
@@ -78,14 +77,14 @@ asmlinkage void console_init(void)
init_log_level();
if (CONFIG(DEBUG_CONSOLE_INIT))
- car_set_var(console_inited, 1);
+ console_inited = 1;
if (CONFIG(EARLY_PCI_BRIDGE) && !ENV_SMM && !ENV_RAMSTAGE)
pci_early_bridge_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",
coreboot_version, coreboot_extra_version, coreboot_build,