Arthur Heymans has uploaded this change for review.

View Change

soc/intel/apollolake: Don't use CAR_GLOBAL

All platforms using this code have NO_CAR_GLOBAL_MIGRATION.

Change-Id: I0f393385aa94f18c2e05af3b5a54999575323d18
Signed-off-by: Arthur Heymans <>
M src/soc/intel/apollolake/meminit.c
M src/soc/intel/apollolake/mmap_boot.c
M src/soc/intel/apollolake/romstage.c
3 files changed, 5 insertions(+), 5 deletions(-)

git pull ssh:// refs/changes/10/30510/1
diff --git a/src/soc/intel/apollolake/meminit.c b/src/soc/intel/apollolake/meminit.c
index 889bbde..a230222 100644
--- a/src/soc/intel/apollolake/meminit.c
+++ b/src/soc/intel/apollolake/meminit.c
@@ -21,7 +21,7 @@
#include <fsp/soc_binding.h>
#include <string.h>

-static size_t memory_size_mib CAR_GLOBAL;
+static size_t memory_size_mib;

size_t memory_in_system_in_mib(void)
diff --git a/src/soc/intel/apollolake/mmap_boot.c b/src/soc/intel/apollolake/mmap_boot.c
index 1c3077e..8174502 100644
--- a/src/soc/intel/apollolake/mmap_boot.c
+++ b/src/soc/intel/apollolake/mmap_boot.c
@@ -57,10 +57,10 @@

-static size_t bios_size CAR_GLOBAL;
+static size_t bios_size;

-static struct mem_region_device shadow_dev CAR_GLOBAL;
-static struct xlate_region_device real_dev CAR_GLOBAL;
+static struct mem_region_device shadow_dev;
+static struct xlate_region_device real_dev;

static void bios_mmap_init(void)
diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c
index 4f4f9f5..4133946 100644
--- a/src/soc/intel/apollolake/romstage.c
+++ b/src/soc/intel/apollolake/romstage.c
@@ -58,7 +58,7 @@
0x8d, 0xe6, 0xc0, 0x44, 0x64, 0x1d, 0xe9, 0x42,

-static uint32_t fsp_version CAR_GLOBAL;
+static uint32_t fsp_version;

/* High Performance Event Timer Configuration */
#define P2SB_HPTC 0x60

To view, visit change 30510. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I0f393385aa94f18c2e05af3b5a54999575323d18
Gerrit-Change-Number: 30510
Gerrit-PatchSet: 1
Gerrit-Owner: Arthur Heymans <>
Gerrit-Reviewer: Arthur Heymans <>
Gerrit-Reviewer: Patrick Rudolph <>
Gerrit-MessageType: newchange