[coreboot-gerrit] Change in coreboot[master]: kill CAR_GLOBAL_MIGRATION leftovers

[Patrick Georgi (Code Review)]

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

Change subject: kill CAR_GLOBAL_MIGRATION leftovers
......................................................................

kill CAR_GLOBAL_MIGRATION leftovers

Change-Id: Ia3b2c10af63cd0cab42dc39f479cb69bc4df9124
Signed-off-by: Arthur Heymans 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37055
Reviewed-by: Angel Pons 
Reviewed-by: HAOUAS Elyes 
Reviewed-by: Kyösti Mälkki 
Tested-by: build bot (Jenkins) 
---
M src/arch/x86/Kconfig
M src/console/printk.c
M src/cpu/Kconfig
M src/include/rules.h
4 files changed, 2 insertions(+), 12 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Kyösti Mälkki: Looks good to me, approved
  HAOUAS Elyes: Looks good to me, but someone else must approve
  Angel Pons: Looks good to me, approved

diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index a788bc0..0e6f486 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -219,7 +219,6 @@
 config POSTCAR_STAGE
    def_bool y
    depends on ARCH_X86
-	depends on !CAR_GLOBAL_MIGRATION

config VERSTAGE_DEBUG_SPINLOOP
    bool
diff --git a/src/console/printk.c b/src/console/printk.c
index fd590fa..a08dd2f 100644
--- a/src/console/printk.c
+++ b/src/console/printk.c
@@ -25,8 +25,7 @@

DECLARE_SPIN_LOCK(console_lock)

-#define TRACK_CONSOLE_TIME (CONFIG(HAVE_MONOTONIC_TIMER) && \
-	(ENV_RAMSTAGE || !CONFIG(CAR_GLOBAL_MIGRATION)))
+#define TRACK_CONSOLE_TIME (CONFIG(HAVE_MONOTONIC_TIMER))

static struct mono_time mt_start, mt_stop;
 static long console_usecs;
diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig
index 3c0bf89..1ad7ef1 100644
--- a/src/cpu/Kconfig
+++ b/src/cpu/Kconfig
@@ -6,14 +6,6 @@

if ARCH_X86

-config CAR_GLOBAL_MIGRATION
-	bool
-	default n
-	help
-	  This option is selected if there is need to migrate CAR globals.
-	  All stages which use CAR globals can directly access the variables
-	  from their linked addresses.
-
 config DCACHE_RAM_BASE
    hex

diff --git a/src/include/rules.h b/src/include/rules.h
index 9e13ee6..fa60ede 100644
--- a/src/include/rules.h
+++ b/src/include/rules.h
@@ -258,7 +258,7 @@
 /* No .data sections with execute-in-place from ROM.  */
 #define ENV_STAGE_HAS_DATA_SECTION	!ENV_CACHE_AS_RAM
 /* No .bss sections for stage with CAR teardown. */
-#define ENV_STAGE_HAS_BSS_SECTION	!(ENV_ROMSTAGE && CONFIG(CAR_GLOBAL_MIGRATION))
+#define ENV_STAGE_HAS_BSS_SECTION	1
 #else
 /* Both .data and .bss, sometimes SRAM not DRAM. */
 #define ENV_STAGE_HAS_DATA_SECTION	1