summaryrefslogtreecommitdiff
path: root/src/cpu/x86
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-08-22 09:44:44 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-08-26 22:52:10 +0000
commita165c07ed7ffdfc0d64eadb911a1cf576b26b0f0 (patch)
tree888e587fab34e184f8b9b363676ba913980f8418 /src/cpu/x86
parent19e1d631e3b93cf4553e003062934def5f091656 (diff)
downloadcoreboot-a165c07ed7ffdfc0d64eadb911a1cf576b26b0f0.tar.xz
arch/x86: Simplify <arch/early_variables.h>
This enables the use of .bss section for ENV_BOOTBLOCK and ENV_VERSTAGE even with CAR_GLOBAL_MIGRATION=y. In practice, boards with CAR_GLOBAL_MIGRATION=y currently build with romcc-bootblock so they will not be using .bss. Change-Id: Ie9dc14f3e528d3e4f48304f4d7de50df448a8af6 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/35016 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'src/cpu/x86')
-rw-r--r--src/cpu/x86/pae/pgtbl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cpu/x86/pae/pgtbl.c b/src/cpu/x86/pae/pgtbl.c
index f54a1c35db..4673de6296 100644
--- a/src/cpu/x86/pae/pgtbl.c
+++ b/src/cpu/x86/pae/pgtbl.c
@@ -363,7 +363,7 @@ static int read_from_cbfs(const char *name, void *buf, size_t size)
int paging_enable_for_car(const char *pdpt_name, const char *pt_name)
{
- if (!ENV_CACHE_AS_RAM)
+ if (!preram_symbols_available())
return -1;
if (read_from_cbfs(pdpt_name, _pdpt, REGION_SIZE(pdpt))) {
@@ -383,7 +383,7 @@ int paging_enable_for_car(const char *pdpt_name, const char *pt_name)
static void *get_pdpt_addr(void)
{
- if (ENV_CACHE_AS_RAM)
+ if (preram_symbols_available())
return _pdpt;
return (void *)(uintptr_t)read_cr3();
}