aboutsummaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorMingyang Sun <mingyang.sun@arm.com>2021-06-01 10:46:26 +0800
committerMingyang Sun <mingyang.sun@arm.com>2021-06-08 15:14:53 +0800
commit8d004f7772630c50c691966257ff1dfcaf79f3f3 (patch)
tree775455715669613bd80b0141cf27756f9495a5e8 /platform
parent61f8fbc280ebb103ac48ecda84dd2ef77852dc69 (diff)
downloadtrusted-firmware-m-8d004f7772630c50c691966257ff1dfcaf79f3f3.tar.gz
SPM: Rename 'static_info' to 'load_info'
Change the static data name to 'load_info' since they are used for loading partition and services. Change-Id: I061c55e570086930a852374207864d0a2fb9c06d Signed-off-by: Mingyang Sun <mingyang.sun@arm.com>
Diffstat (limited to 'platform')
-rw-r--r--platform/ext/common/armclang/tfm_common_s.sct6
-rw-r--r--platform/ext/common/armclang/tfm_isolation_l3.sct.template6
-rw-r--r--platform/ext/common/gcc/tfm_common_s.ld10
-rw-r--r--platform/ext/common/gcc/tfm_isolation_l3.ld.template10
-rw-r--r--platform/ext/common/iar/tfm_common_s.icf9
-rw-r--r--platform/ext/target/nordic_nrf/common/core/gcc/nordic_nrf_s.ld10
6 files changed, 25 insertions, 26 deletions
diff --git a/platform/ext/common/armclang/tfm_common_s.sct b/platform/ext/common/armclang/tfm_common_s.sct
index ded5aabe7..c7d66b4b0 100644
--- a/platform/ext/common/armclang/tfm_common_s.sct
+++ b/platform/ext/common/armclang/tfm_common_s.sct
@@ -34,9 +34,9 @@ LR_CODE S_CODE_START S_CODE_SIZE {
*psa_lifecycle.* (+RO)
}
- /**** Section for holding partition static data */
- TFM_SP_STATIC_LIST +0 ALIGN 4 {
- *(.partition_info)
+ /**** Section for holding partition RO load data */
+ TFM_SP_LOAD_LIST +0 ALIGN 4 {
+ *(.part_load)
}
/**** PSA RoT RO part (CODE + RODATA) start here */
diff --git a/platform/ext/common/armclang/tfm_isolation_l3.sct.template b/platform/ext/common/armclang/tfm_isolation_l3.sct.template
index c25534bdc..dcb67ae64 100644
--- a/platform/ext/common/armclang/tfm_isolation_l3.sct.template
+++ b/platform/ext/common/armclang/tfm_isolation_l3.sct.template
@@ -40,9 +40,9 @@ LR_CODE S_CODE_START {
* (+RO)
}
- /**** Section for holding partition static data */
- TFM_SP_STATIC_LIST +0 ALIGN 4 {
- *(.partition_info)
+ /**** Section for holding partition RO load data */
+ TFM_SP_LOAD_LIST +0 ALIGN 4 {
+ *(.part_load)
}
/**** PSA RoT CODE + RO-data starts here */
diff --git a/platform/ext/common/gcc/tfm_common_s.ld b/platform/ext/common/gcc/tfm_common_s.ld
index e29fbd668..5cdb16cd3 100644
--- a/platform/ext/common/gcc/tfm_common_s.ld
+++ b/platform/ext/common/gcc/tfm_common_s.ld
@@ -141,13 +141,13 @@ SECTIONS
Image$$TFM_UNPRIV_CODE$$RO$$Base = ADDR(.TFM_UNPRIV_CODE);
Image$$TFM_UNPRIV_CODE$$RO$$Limit = ADDR(.TFM_UNPRIV_CODE) + SIZEOF(.TFM_UNPRIV_CODE);
- /**** Section for holding partition static RO data */
- .TFM_SP_STATIC_LIST : ALIGN(4)
+ /**** Section for holding partition RO load data */
+ .TFM_SP_LOAD_LIST : ALIGN(4)
{
- KEEP(*(.partition_info))
+ KEEP(*(.part_load))
} > FLASH
- Image$$TFM_SP_STATIC_LIST$$RO$$Base = ADDR(.TFM_SP_STATIC_LIST);
- Image$$TFM_SP_STATIC_LIST$$RO$$Limit = ADDR(.TFM_SP_STATIC_LIST) + SIZEOF(.TFM_SP_STATIC_LIST);
+ Image$$TFM_SP_LOAD_LIST$$RO$$Base = ADDR(.TFM_SP_LOAD_LIST);
+ Image$$TFM_SP_LOAD_LIST$$RO$$Limit = ADDR(.TFM_SP_LOAD_LIST) + SIZEOF(.TFM_SP_LOAD_LIST);
. = ALIGN(32);
/**** PSA RoT RO part (CODE + RODATA) start here */
diff --git a/platform/ext/common/gcc/tfm_isolation_l3.ld.template b/platform/ext/common/gcc/tfm_isolation_l3.ld.template
index ccbe7bcf0..438425681 100644
--- a/platform/ext/common/gcc/tfm_isolation_l3.ld.template
+++ b/platform/ext/common/gcc/tfm_isolation_l3.ld.template
@@ -101,13 +101,13 @@ SECTIONS
. = ALIGN(32);
Image$$PT_RO_START$$Base = .;
- /**** Section for holding partition static RO data */
- .TFM_SP_STATIC_LIST : ALIGN(4)
+ /**** Section for holding partition RO load data */
+ .TFM_SP_LOAD_LIST : ALIGN(4)
{
- KEEP(*(.partition_info))
+ KEEP(*(.part_load))
} > FLASH
- Image$$TFM_SP_STATIC_LIST$$RO$$Base = ADDR(.TFM_SP_STATIC_LIST);
- Image$$TFM_SP_STATIC_LIST$$RO$$Limit = ADDR(.TFM_SP_STATIC_LIST) + SIZEOF(.TFM_SP_STATIC_LIST);
+ Image$$TFM_SP_LOAD_LIST$$RO$$Base = ADDR(.TFM_SP_LOAD_LIST);
+ Image$$TFM_SP_LOAD_LIST$$RO$$Limit = ADDR(.TFM_SP_LOAD_LIST) + SIZEOF(.TFM_SP_LOAD_LIST);
. = ALIGN(32);
/**** PSA RoT RO CODE + RO-data starts here */
diff --git a/platform/ext/common/iar/tfm_common_s.icf b/platform/ext/common/iar/tfm_common_s.icf
index 7d49217a6..3da205dd3 100644
--- a/platform/ext/common/iar/tfm_common_s.icf
+++ b/platform/ext/common/iar/tfm_common_s.icf
@@ -39,9 +39,9 @@ define block TFM_UNPRIV_CODE with alignment = 32 {
ro object tfm_log_raw.o
};
- /**** Section for holding partition static data */
-define block TFM_SP_STATIC_LIST with alignment = 4 {
- ro section .partition_info object load_info_*.o,
+ /**** Section for holding partition RO load data */
+define block TFM_SP_LOAD_LIST with alignment = 4 {
+ ro section .part_load object load_info_*.o,
};
/**** PSA RoT RO part (CODE + RODATA) start here */
@@ -212,8 +212,7 @@ define block LR_CODE with fixed order {
block ER_TFM_CODE,
block TFM_UNPRIV_CODE,
-/**** Section for holding partition static data */
- block TFM_SP_STATIC_LIST,
+ block TFM_SP_LOAD_LIST,
block TFM_PSA_CODE_START,
diff --git a/platform/ext/target/nordic_nrf/common/core/gcc/nordic_nrf_s.ld b/platform/ext/target/nordic_nrf/common/core/gcc/nordic_nrf_s.ld
index 040dd45e1..a12939712 100644
--- a/platform/ext/target/nordic_nrf/common/core/gcc/nordic_nrf_s.ld
+++ b/platform/ext/target/nordic_nrf/common/core/gcc/nordic_nrf_s.ld
@@ -195,13 +195,13 @@ SECTIONS
Image$$TFM_UNPRIV_CODE$$RO$$Base = ADDR(.TFM_UNPRIV_CODE);
Image$$TFM_UNPRIV_CODE$$RO$$Limit = ADDR(.TFM_UNPRIV_CODE) + SIZEOF(.TFM_UNPRIV_CODE);
- /**** Section for holding partition static RO data */
- .TFM_SP_STATIC_LIST : ALIGN(4)
+ /**** Section for holding partition RO load data */
+ .TFM_SP_LOAD_LIST : ALIGN(4)
{
- KEEP(*(.partition_info))
+ KEEP(*(.part_load))
} > FLASH
- Image$$TFM_SP_STATIC_LIST$$RO$$Base = ADDR(.TFM_SP_STATIC_LIST);
- Image$$TFM_SP_STATIC_LIST$$RO$$Limit = ADDR(.TFM_SP_STATIC_LIST) + SIZEOF(.TFM_SP_STATIC_LIST);
+ Image$$TFM_SP_LOAD_LIST$$RO$$Base = ADDR(.TFM_SP_LOAD_LIST);
+ Image$$TFM_SP_LOAD_LIST$$RO$$Limit = ADDR(.TFM_SP_LOAD_LIST) + SIZEOF(.TFM_SP_LOAD_LIST);
. = ALIGN(32);
/**** PSA RoT RO part (CODE + RODATA) start here */