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/include/rules.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/include') diff --git a/src/include/rules.h b/src/include/rules.h index 8a6945b94c..9fd7dc32da 100644 --- a/src/include/rules.h +++ b/src/include/rules.h @@ -274,8 +274,8 @@ #define ENV_CACHE_AS_RAM ENV_ROMSTAGE_OR_BEFORE /* No .data sections with execute-in-place from ROM. */ #define ENV_STAGE_HAS_DATA_SECTION !ENV_CACHE_AS_RAM -/* No .bss sections with execute-in-place from ROM. */ -#define ENV_STAGE_HAS_BSS_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)) #else /* Both .data and .bss, sometimes SRAM not DRAM. */ #define ENV_STAGE_HAS_DATA_SECTION 1 -- cgit v1.2.3