Move mem-protect definitions to board specific files

Having these definitions in board_arm_def.h forces to
all the arm platforms to use the same definition for
PLAT_ARM_MEM_PROT_ADDR.

This macro also enables the mem-protect mechanism,
which means that all the arm platform has enabled
mem-protect and they cannot get rid of it.

Change-Id: Id29d2c51cbe6edc15f010a9f5a20c42266c48a08
Signed-off-by: Roberto Vargas <roberto.vargas@arm.com>

diff --git a/include/plat/arm/board/common/board_arm_def.h b/include/plat/arm/board/common/board_arm_def.h
index 2d8e4c139f2b117dd41487014c82e8f357ca77ad..6900fe66b3a452f090dcb6c99a9c6e20af9880ef 100644 (file)
--- a/include/plat/arm/board/common/board_arm_def.h
+++ b/include/plat/arm/board/common/board_arm_def.h
@@ -122,14 +122,6 @@
 #define PLAT_ARM_NVM_BASE              V2M_FLASH0_BASE
 #define PLAT_ARM_NVM_SIZE              (V2M_FLASH0_SIZE - V2M_FLASH_BLOCK_SIZE)
 
-/* PSCI memory protect definitions:
- * This variable is stored in a non-secure flash because some ARM reference
- * platforms do not have secure NVRAM. Real systems that provided MEM_PROTECT
- * support must use a secure NVRAM to store the PSCI MEM_PROTECT definitions.
- */
-#define PLAT_ARM_MEM_PROT_ADDR         (V2M_FLASH0_BASE + \
-                                        V2M_FLASH0_SIZE - V2M_FLASH_BLOCK_SIZE)
-
 /*
  * Map mem_protect flash region with read and write permissions
  */

diff --git a/plat/arm/board/fvp/fvp_def.h b/plat/arm/board/fvp/fvp_def.h
index 5ac5d3cdbb9d76728673e28d45107fd593853b19..acf3cf4696d0445554e5880f7181adf3126ef933 100644 (file)
--- a/plat/arm/board/fvp/fvp_def.h
+++ b/plat/arm/board/fvp/fvp_def.h
@@ -142,4 +142,15 @@
 #define FVP_NSAID_HDLCD0               2
 #define FVP_NSAID_CLCD                 7
 
+/*******************************************************************************
+ * Memprotect definitions
+ ******************************************************************************/
+/* PSCI memory protect definitions:
+ * This variable is stored in a non-secure flash because some ARM reference
+ * platforms do not have secure NVRAM. Real systems that provided MEM_PROTECT
+ * support must use a secure NVRAM to store the PSCI MEM_PROTECT definitions.
+ */
+#define PLAT_ARM_MEM_PROT_ADDR         (V2M_FLASH0_BASE + \
+                                        V2M_FLASH0_SIZE - V2M_FLASH_BLOCK_SIZE)
+
 #endif /* __FVP_DEF_H__ */

diff --git a/plat/arm/board/juno/juno_def.h b/plat/arm/board/juno/juno_def.h
index d2834e1b7129a7883416b802a29b4b0b8dc18a7b..63e2456973c688e18d674570bb9dacc27ce1e4bd 100644 (file)
--- a/plat/arm/board/juno/juno_def.h
+++ b/plat/arm/board/juno/juno_def.h
@@ -79,4 +79,15 @@
 #define JUNO_IRQ_GPU_SMMU_1            73
 #define JUNO_IRQ_ETR_SMMU              75
 
+/*******************************************************************************
+ * Memprotect definitions
+ ******************************************************************************/
+/* PSCI memory protect definitions:
+ * This variable is stored in a non-secure flash because some ARM reference
+ * platforms do not have secure NVRAM. Real systems that provided MEM_PROTECT
+ * support must use a secure NVRAM to store the PSCI MEM_PROTECT definitions.
+ */
+#define PLAT_ARM_MEM_PROT_ADDR         (V2M_FLASH0_BASE + \
+                                        V2M_FLASH0_SIZE - V2M_FLASH_BLOCK_SIZE)
+
 #endif /* __JUNO_DEF_H__ */

diff --git a/plat/arm/css/sgi/include/platform_def.h b/plat/arm/css/sgi/include/platform_def.h
index 0f024076dcabb6029d689b5e760fac46828e5f0d..84ef2c424ceb32c50ae1652a33d8b36e5c7ba3df 100644 (file)
--- a/plat/arm/css/sgi/include/platform_def.h
+++ b/plat/arm/css/sgi/include/platform_def.h
@@ -96,4 +96,16 @@
                GET_SSC_VERSION_CONFIG(mmio_read_32(SSC_VERSION))
 #endif /* __ASSEMBLY__ */
 
+/*******************************************************************************
+ * Memprotect definitions
+ ******************************************************************************/
+/* PSCI memory protect definitions:
+ * This variable is stored in a non-secure flash because some ARM reference
+ * platforms do not have secure NVRAM. Real systems that provided MEM_PROTECT
+ * support must use a secure NVRAM to store the PSCI MEM_PROTECT definitions.
+ */
+#define PLAT_ARM_MEM_PROT_ADDR         (V2M_FLASH0_BASE + \
+                                        V2M_FLASH0_SIZE - V2M_FLASH_BLOCK_SIZE)
+
+
 #endif /* __PLATFORM_DEF_H__ */