diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/rules.h | 12 | ||||
| -rw-r--r-- | src/include/symbols.h | 5 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/include/rules.h b/src/include/rules.h index ae8118ebb4..02c36f2b25 100644 --- a/src/include/rules.h +++ b/src/include/rules.h @@ -274,16 +274,16 @@ #if ENV_X86 /* 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_HAS_DATA_SECTION !ENV_CACHE_AS_RAM #else -/* Both .data and .bss, sometimes SRAM not DRAM. */ -#define ENV_HAS_DATA_SECTION 1 #define ENV_CACHE_AS_RAM 0 #endif -/* Indicates if the stage uses the _bss region defined in arch/x86/car.ld */ -#define ENV_SEPARATE_BSS (ENV_CACHE_AS_RAM && (ENV_BOOTBLOCK || !CONFIG(NO_XIP_EARLY_STAGES))) +/* Indicates .data section support. */ +#define ENV_HAS_DATA_SECTION 1 + +/* Indicates if the stage uses the _data and _bss regions defined in + * arch/x86/car.ld */ +#define ENV_SEPARATE_DATA_AND_BSS (ENV_CACHE_AS_RAM && (ENV_BOOTBLOCK || !CONFIG(NO_XIP_EARLY_STAGES))) /* Currently rmodules, ramstage and smm have heap. */ #define ENV_HAS_HEAP_SECTION (ENV_RMODULE || ENV_RAMSTAGE || ENV_SMM) diff --git a/src/include/symbols.h b/src/include/symbols.h index a03af08463..5410798f06 100644 --- a/src/include/symbols.h +++ b/src/include/symbols.h @@ -50,6 +50,11 @@ DECLARE_REGION(heap) DECLARE_REGION(asan_shadow) #endif +#if ENV_SEPARATE_DATA_AND_BSS +DECLARE_REGION(data) +DECLARE_REGION(data_load) +#endif + /* Regions for execution units. */ DECLARE_REGION(payload) |