From 6acc05ed310fcd81bea9288df8c4cb4471a8bbbe Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Thu, 12 May 2022 18:01:13 +0200 Subject: rules.h: Use more consistent naming Use 'ENV' consistently and drop the redundant 'STAGE' in the naming. Change-Id: I51f2a7e70eefad12aa214e92f23e5fd2edf46698 Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/64296 Tested-by: build bot (Jenkins) Reviewed-by: Raul Rangel --- src/include/rules.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/include/rules.h') diff --git a/src/include/rules.h b/src/include/rules.h index 02b55c5f8a72..8ccfe28e66be 100644 --- a/src/include/rules.h +++ b/src/include/rules.h @@ -268,15 +268,15 @@ /* Indicates memory layout is determined with arch/x86/car.ld. */ #define ENV_CACHE_AS_RAM (ENV_ROMSTAGE_OR_BEFORE && !CONFIG(RESET_VECTOR_IN_RAM)) /* No .data sections with execute-in-place from ROM. */ -#define ENV_STAGE_HAS_DATA_SECTION !ENV_CACHE_AS_RAM +#define ENV_HAS_DATA_SECTION !ENV_CACHE_AS_RAM #else /* Both .data and .bss, sometimes SRAM not DRAM. */ -#define ENV_STAGE_HAS_DATA_SECTION 1 +#define ENV_HAS_DATA_SECTION 1 #define ENV_CACHE_AS_RAM 0 #endif /* Currently rmodules, ramstage and smm have heap. */ -#define ENV_STAGE_HAS_HEAP_SECTION (ENV_RMODULE || ENV_RAMSTAGE || ENV_SMM) +#define ENV_HAS_HEAP_SECTION (ENV_RMODULE || ENV_RAMSTAGE || ENV_SMM) /* Set USER_SPACE in the makefile for the rare code that runs in userspace */ #if defined(__USER_SPACE__) @@ -293,21 +293,21 @@ #endif #if ENV_X86 -#define STAGE_HAS_SPINLOCKS !ENV_ROMSTAGE_OR_BEFORE +#define ENV_HAS_SPINLOCKS !ENV_ROMSTAGE_OR_BEFORE #elif ENV_RISCV -#define STAGE_HAS_SPINLOCKS 1 +#define ENV_HAS_SPINLOCKS 1 #else -#define STAGE_HAS_SPINLOCKS 0 +#define ENV_HAS_SPINLOCKS 0 #endif /* When set is included for the spinlock implementation. */ -#define ENV_STAGE_SUPPORTS_SMP (CONFIG(SMP) && STAGE_HAS_SPINLOCKS) +#define ENV_SUPPORTS_SMP (CONFIG(SMP) && ENV_HAS_SPINLOCKS) #if ENV_X86 && CONFIG(COOP_MULTITASKING) && (ENV_RAMSTAGE || ENV_ROMSTAGE) /* TODO: Enable in all x86 stages */ -#define ENV_STAGE_SUPPORTS_COOP 1 +#define ENV_SUPPORTS_COOP 1 #else -#define ENV_STAGE_SUPPORTS_COOP 0 +#define ENV_SUPPORTS_COOP 0 #endif /** -- cgit v1.2.3