diff options
Diffstat (limited to 'platform')
-rw-r--r-- | platform/ext/common/armclang/tfm_common_s.sct | 6 | ||||
-rw-r--r-- | platform/ext/common/armclang/tfm_isolation_l3.sct.template | 6 | ||||
-rw-r--r-- | platform/ext/common/gcc/tfm_common_s.ld | 10 | ||||
-rw-r--r-- | platform/ext/common/gcc/tfm_isolation_l3.ld.template | 10 | ||||
-rw-r--r-- | platform/ext/common/iar/tfm_common_s.icf | 9 | ||||
-rw-r--r-- | platform/ext/target/nordic_nrf/common/core/gcc/nordic_nrf_s.ld | 10 |
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 ded5aabe7e..c7d66b4b00 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 c25534bdce..dcb67ae645 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 e29fbd6680..5cdb16cd37 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 ccbe7bcf03..4384256817 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 7d49217a60..3da205dd3f 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 040dd45e13..a129397121 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 */ |