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

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( 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 
---
M src/commonlib/include/commonlib/cbmem_id.h
M src/console/printk.c
M src/include/rules.h
3 files changed, 2 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/55/37055/1

diff --git a/src/commonlib/include/commonlib/cbmem_id.h b/src/commonlib/include/commonlib/cbmem_id.h
index b063cd1..6835d86 100644
--- a/src/commonlib/include/commonlib/cbmem_id.h
+++ b/src/commonlib/include/commonlib/cbmem_id.h
@@ -20,7 +20,6 @@
 #define CBMEM_ID_AFTER_CAR	0xc4787a93
 #define CBMEM_ID_AGESA_RUNTIME	0x41474553
 #define CBMEM_ID_AMDMCT_MEMINFO 0x494D454E
-#define CBMEM_ID_CAR_GLOBALS	0xcac4e6a3
 #define CBMEM_ID_CBTABLE	0x43425442
 #define CBMEM_ID_CBTABLE_FWD	0x43425443
 #define CBMEM_ID_CONSOLE	0x434f4e53
@@ -88,7 +87,6 @@
    { CBMEM_ID_AGESA_RUNTIME,	"AGESA RSVD " }, \
    { CBMEM_ID_AFTER_CAR,		"AFTER CAR  " }, \
    { CBMEM_ID_AMDMCT_MEMINFO,	"AMDMEM INFO" }, \
-	{ CBMEM_ID_CAR_GLOBALS,		"CAR GLOBALS" }, \
    { CBMEM_ID_CBTABLE,		"COREBOOT   " }, \
    { CBMEM_ID_CBTABLE_FWD,		"COREBOOTFWD" }, \
    { CBMEM_ID_CONSOLE,		"CONSOLE    " }, \
diff --git a/src/console/printk.c b/src/console/printk.c
index 4f9f547..dc3077d 100644
--- a/src/console/printk.c
+++ b/src/console/printk.c
@@ -27,8 +27,7 @@
 DECLARE_SPIN_LOCK(console_lock)
 #endif

-#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/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