diff options
| author | Dimitris Papastamos <dimitris.papastamos@arm.com> | 2018-08-03 10:56:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-03 10:56:47 +0100 |
| commit | f68bc8a1c210bbdb36201a74528a96e93707eb45 (patch) | |
| tree | 69f0ab721acd24c017f8d18629b0385576d30f19 /include | |
| parent | f943ce74aee9a52fac1febfce8acaa28696e532d (diff) | |
| parent | 2ecaafd2e832593e3f5b0a14c166ff88e4bebe43 (diff) | |
Merge pull request #1506 from danielboulby-arm/db/SeparateCodeAndROData
Fix build for SEPARATE_CODE_AND_RODATA=0
Diffstat (limited to 'include')
| -rw-r--r-- | include/plat/arm/common/arm_def.h | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/include/plat/arm/common/arm_def.h b/include/plat/arm/common/arm_def.h index 9a661d7a..47f2ac21 100644 --- a/include/plat/arm/common/arm_def.h +++ b/include/plat/arm/common/arm_def.h @@ -241,16 +241,25 @@ ARM_EL3_TZC_DRAM1_SIZE, \ MT_MEMORY | MT_RW | MT_SECURE) +/* + * If SEPARATE_CODE_AND_RODATA=1 we define a region for each section + * otherwise one region is defined containing both. + */ #if SEPARATE_CODE_AND_RODATA -#define ARM_MAP_BL_CODE MAP_REGION_FLAT( \ +#define ARM_MAP_BL_RO MAP_REGION_FLAT( \ BL_CODE_BASE, \ BL_CODE_END - BL_CODE_BASE, \ - MT_CODE | MT_SECURE) -#define ARM_MAP_BL_RO_DATA MAP_REGION_FLAT( \ + MT_CODE | MT_SECURE), \ + MAP_REGION_FLAT( \ BL_RO_DATA_BASE, \ BL_RO_DATA_END \ - BL_RO_DATA_BASE, \ MT_RO_DATA | MT_SECURE) +#else +#define ARM_MAP_BL_RO MAP_REGION_FLAT( \ + BL_CODE_BASE, \ + BL_CODE_END - BL_CODE_BASE, \ + MT_CODE | MT_SECURE) #endif #if USE_COHERENT_MEM #define ARM_MAP_BL_COHERENT_RAM MAP_REGION_FLAT( \ @@ -261,14 +270,10 @@ #endif /* - * The number of regions like RO(code), coherent and data required by + * The max number of regions like RO(code), coherent and data required by * different BL stages which need to be mapped in the MMU. */ -#if USE_COHERENT_MEM # define ARM_BL_REGIONS 4 -#else -# define ARM_BL_REGIONS 3 -#endif #define MAX_MMAP_REGIONS (PLAT_ARM_MMAP_ENTRIES + \ ARM_BL_REGIONS) |