commit 936c33b88272d5ad0f5b040c00d98c30e2395ba1
author Mate Toth-Pal <mate.toth-pal@arm.com> Tue Apr 10 14:02:07 2018 +0200
committer Mate Toth-Pal <mate.toth-pal@arm.com> Thu Jul 12 14:38:07 2018 +0200
tree a6ff0a87df39073c0dbbd03c5a7456438c084b18
parent e1475330b310a4efad34f04a878d2b8846b481a4

Platform: Move isolation hw code to SPM hal

Moves code related to hardware specific aspects of MPU, PPC, MPC and SAU
to SPM hal. Leaves the code parts that use cmse defined interface to
access these peripherals in secure_sw folder.

Change-Id: I594847686cac51ee0f9fae217152b6e90723bb9e
Signed-off-by: Mate Toth-Pal <mate.toth-pal@arm.com>

secure_fw/spm/spm_db.h

diff --git a/secure_fw/spm/spm_db.h b/secure_fw/spm/spm_db.h
index d267f6d..4b3b413 100644
--- a/secure_fw/spm/spm_db.h
+++ b/secure_fw/spm/spm_db.h
@@ -18,18 +18,6 @@
 struct spm_partition_static_data_t {
     uint32_t partition_id;
     uint32_t partition_flags;
-#if TFM_LVL != 1
-    uint32_t code_start;
-    uint32_t code_limit;
-    uint32_t ro_start;
-    uint32_t ro_limit;
-    uint32_t rw_start;
-    uint32_t rw_limit;
-    uint32_t zi_start;
-    uint32_t zi_limit;
-    uint32_t stack_bottom;
-    uint32_t stack_top;
-#endif
     sp_init_function partition_init;
 };
 
@@ -37,10 +25,24 @@
  * Holds the fields that define a partition for SPM. The fields are further
  * divided to structures, to keep the related fields close to each other.
  */
-struct tfm_spm_partition_desc_t {
+struct spm_partition_desc_t {
     struct spm_partition_static_data_t static_data;
     struct spm_partition_runtime_data_t runtime_data;
-    struct tfm_spm_partition_platform_data_t platform_data;
+    struct tfm_spm_partition_platform_data_t *platform_data;
+#if TFM_LVL != 1
+    struct tfm_spm_partition_memory_data_t memory_data;
+#endif
 };
 
+/* Macros to pick linker symbols and allow to form the partition data base */
+#define REGION(a, b, c) a##b##c
+#define REGION_NAME(a, b, c) REGION(a, b, c)
+#if TFM_LVL == 1
+#define REGION_DECLARE(a, b, c)
+#else
+#define REGION_DECLARE(a, b, c) extern uint32_t REGION_NAME(a, b, c)
+#define PART_REGION_ADDR(partition, region) \
+    (uint32_t)&REGION_NAME(Image$$, partition, region)
+#endif
+
 #endif /* __SPM_DB_H__ */