From a165c07ed7ffdfc0d64eadb911a1cf576b26b0f0 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Thu, 22 Aug 2019 09:44:44 +0300 Subject: arch/x86: Simplify MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/35016 Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner --- src/cpu/x86/pae/pgtbl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/cpu') 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(); } -- cgit v1.2.3