diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2018-12-29 19:43:21 +0100 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2019-01-08 15:24:16 +0100 |
| commit | 0560efb93eeba9cf16dc837893a07430e638dcc5 (patch) | |
| tree | f1b1e7e5d0384501e62ecbe3ecb2b3aadab941e6 /include/plat | |
| parent | c8719032600e9aade27b674c2d117563079e8e07 (diff) | |
services/spm_deprecated: update ARM platform specific asserts
Update some asserts that refer to #defines that only occur in
ARM platforms, preventing this code to be used on other platforms.
Instead, use a platform agnostic name, and update all the existing
users.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Diffstat (limited to 'include/plat')
| -rw-r--r-- | include/plat/arm/common/arm_spm_def.h | 10 | ||||
| -rw-r--r-- | include/plat/arm/common/plat_arm.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/plat/arm/common/arm_spm_def.h b/include/plat/arm/common/arm_spm_def.h index bdcbc96a..c17b5652 100644 --- a/include/plat/arm/common/arm_spm_def.h +++ b/include/plat/arm/common/arm_spm_def.h @@ -88,12 +88,12 @@ * requests. Mapped as RW and NS. Placed after the shared memory between EL3 and * S-EL0. */ -#define ARM_SP_IMAGE_NS_BUF_BASE (PLAT_SPM_BUF_BASE + PLAT_SPM_BUF_SIZE) -#define ARM_SP_IMAGE_NS_BUF_SIZE ULL(0x10000) +#define PLAT_SP_IMAGE_NS_BUF_BASE (PLAT_SPM_BUF_BASE + PLAT_SPM_BUF_SIZE) +#define PLAT_SP_IMAGE_NS_BUF_SIZE ULL(0x10000) #define ARM_SP_IMAGE_NS_BUF_MMAP MAP_REGION2( \ - ARM_SP_IMAGE_NS_BUF_BASE, \ - ARM_SP_IMAGE_NS_BUF_BASE, \ - ARM_SP_IMAGE_NS_BUF_SIZE, \ + PLAT_SP_IMAGE_NS_BUF_BASE, \ + PLAT_SP_IMAGE_NS_BUF_BASE, \ + PLAT_SP_IMAGE_NS_BUF_SIZE, \ MT_RW_DATA | MT_NS | MT_USER, \ PAGE_SIZE) diff --git a/include/plat/arm/common/plat_arm.h b/include/plat/arm/common/plat_arm.h index 62816082..d1c03be6 100644 --- a/include/plat/arm/common/plat_arm.h +++ b/include/plat/arm/common/plat_arm.h @@ -46,8 +46,8 @@ typedef struct arm_tzc_regions_info { PLAT_ARM_TZC_NS_DEV_ACCESS}, \ {ARM_DRAM2_BASE, ARM_DRAM2_END, ARM_TZC_NS_DRAM_S_ACCESS, \ PLAT_ARM_TZC_NS_DEV_ACCESS}, \ - {ARM_SP_IMAGE_NS_BUF_BASE, (ARM_SP_IMAGE_NS_BUF_BASE + \ - ARM_SP_IMAGE_NS_BUF_SIZE) - 1, TZC_REGION_S_NONE, \ + {PLAT_SP_IMAGE_NS_BUF_BASE, (PLAT_SP_IMAGE_NS_BUF_BASE + \ + PLAT_SP_IMAGE_NS_BUF_SIZE) - 1, TZC_REGION_S_NONE, \ PLAT_ARM_TZC_NS_DEV_ACCESS} #else |