aboutsummaryrefslogtreecommitdiff
path: root/src/soc/intel/apollolake/romstage.c
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2018-12-29 14:00:46 +0100
committerPatrick Georgi <pgeorgi@google.com>2019-05-29 20:02:57 +0000
commit6d6945b807469675f872124f33250d2e5c0f14b8 (patch)
tree7416743fc4df7b0ed1d805abaff12cf64f603660 /src/soc/intel/apollolake/romstage.c
parent87c4f11c64713c8a90d7a6ffe997da891c9758d4 (diff)
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 <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/coreboot/+/30510 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Diffstat (limited to 'src/soc/intel/apollolake/romstage.c')
-rw-r--r--src/soc/intel/apollolake/romstage.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c
index c976ac2d6f..5bf501dcfa 100644
--- a/src/soc/intel/apollolake/romstage.c
+++ b/src/soc/intel/apollolake/romstage.c
@@ -17,7 +17,6 @@
*/
#include <arch/cpu.h>
-#include <arch/early_variables.h>
#include <device/pci_ops.h>
#include <arch/symbols.h>
#include <assert.h>
@@ -57,7 +56,7 @@ static const uint8_t hob_variable_guid[16] = {
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
@@ -236,7 +235,7 @@ asmlinkage void car_stage_entry(void)
&var_size);
if (new_var_data)
mrc_cache_stash_data(MRC_VARIABLE_DATA,
- car_get_var(fsp_version), new_var_data,
+ fsp_version, new_var_data,
var_size);
else
printk(BIOS_ERR, "Failed to determine variable data\n");
@@ -410,7 +409,7 @@ void platform_fsp_memory_init_params_cb(FSPM_UPD *mupd, uint32_t version)
mupd->FspmConfig.VariableNvsBufferPtr = rdev_mmap_full(&rdev);
}
- car_set_var(fsp_version, version);
+ fsp_version = version;
}