diff options
| author | danh-arm <dan.handley@arm.com> | 2016-02-18 18:36:00 +0000 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2016-02-18 18:36:00 +0000 |
| commit | 85df7e44ce3974e2c78d99e6ea31f047de6de445 (patch) | |
| tree | 7c7c7583d24faf59bd66adc827ba7dd789877de0 /include/plat | |
| parent | 879599076e80c98c3d76b2c0c1efb6136a2f86b4 (diff) | |
| parent | 74eb26e4098d0a1f5c6ef49c1355e99d80027f36 (diff) | |
Merge pull request #523 from jcastillo-arm/jc/genfw-791
ARM platforms: rationalise memory attributes of shared memory
Diffstat (limited to 'include/plat')
| -rw-r--r-- | include/plat/arm/common/arm_def.h | 6 | ||||
| -rw-r--r-- | include/plat/arm/css/common/css_def.h | 4 |
2 files changed, 1 insertions, 9 deletions
diff --git a/include/plat/arm/common/arm_def.h b/include/plat/arm/common/arm_def.h index 4c843560..8d753637 100644 --- a/include/plat/arm/common/arm_def.h +++ b/include/plat/arm/common/arm_def.h @@ -151,14 +151,10 @@ #define ARM_G0_IRQS ARM_IRQ_SEC_SGI_0, \ ARM_IRQ_SEC_SGI_6 -#define ARM_SHARED_RAM_ATTR ((PLAT_ARM_SHARED_RAM_CACHED ? \ - MT_MEMORY : MT_DEVICE) \ - | MT_RW | MT_SECURE) - #define ARM_MAP_SHARED_RAM MAP_REGION_FLAT( \ ARM_SHARED_RAM_BASE, \ ARM_SHARED_RAM_SIZE, \ - ARM_SHARED_RAM_ATTR) + MT_DEVICE | MT_RW | MT_SECURE) #define ARM_MAP_NS_DRAM1 MAP_REGION_FLAT( \ ARM_NS_DRAM1_BASE, \ diff --git a/include/plat/arm/css/common/css_def.h b/include/plat/arm/css/common/css_def.h index 3d6884a8..f92126ba 100644 --- a/include/plat/arm/css/common/css_def.h +++ b/include/plat/arm/css/common/css_def.h @@ -37,8 +37,6 @@ /************************************************************************* * Definitions common to all ARM Compute SubSystems (CSS) *************************************************************************/ -#define MHU_PAYLOAD_CACHED 0 - #define NSROM_BASE 0x1f000000 #define NSROM_SIZE 0x00001000 @@ -141,8 +139,6 @@ #define SCP_BL2U_BASE BL31_BASE #endif /* CSS_LOAD_SCP_IMAGES */ -#define PLAT_ARM_SHARED_RAM_CACHED MHU_PAYLOAD_CACHED - /* Load address of Non-Secure Image for CSS platform ports */ #define PLAT_ARM_NS_IMAGE_OFFSET 0xE0000000 |