[coreboot-gerrit] Change in coreboot[master]: console/init.c: Drop CAR_GLOBAL_MIGRATION support

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37047 )

Change subject: console/init.c: Drop CAR_GLOBAL_MIGRATION support
......................................................................

console/init.c: Drop CAR_GLOBAL_MIGRATION support

Change-Id: If1150a811a41add88b80fbecda4a66c2bd322825
Signed-off-by: Arthur Heymans 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37047
Reviewed-by: Kyösti Mälkki 
Tested-by: build bot (Jenkins) 
---
M src/console/init.c
1 file changed, 4 insertions(+), 5 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Kyösti Mälkki: Looks good to me, approved

diff --git a/src/console/init.c b/src/console/init.c
index d481858..911dbd0 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 @@
    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,