SST: Rename SST(Secure STorage) to PS(Protected Storage)
This patches renames SST(Secure STorage) to
PS(Protected Storage) for files, folders and any contents
in files to align with the PSA Storage API spec.
Change-Id: Icf991f59512875780c159f22737b521b3b2d4924
Signed-off-by: Kevin Peng <kevin.peng@arm.com>
diff --git a/platform/ext/Mps2AN519.cmake b/platform/ext/Mps2AN519.cmake
index cffb137..ef2e5ca 100644
--- a/platform/ext/Mps2AN519.cmake
+++ b/platform/ext/Mps2AN519.cmake
@@ -179,9 +179,9 @@
# API ONLY if the target has non-volatile counters.
list(APPEND ALL_SRC_C "${PLATFORM_DIR}/common/template/nv_counters.c")
set(TARGET_NV_COUNTERS_ENABLE ON)
- # Sets SST_ROLLBACK_PROTECTION flag to compile in the SST services
+ # Sets PS_ROLLBACK_PROTECTION flag to compile in the PS services
# rollback protection code as the target supports nv counters.
- set (SST_ROLLBACK_PROTECTION ON)
+ set (PS_ROLLBACK_PROTECTION ON)
endif()
if (NOT DEFINED BUILD_CMSIS_DRIVERS)
@@ -201,11 +201,11 @@
# There is no real flash memory for code on MPS2 board. Instead a code SRAM is
# used for code storage: ZBT SSRAM1. The Driver_Flash driver just emulates a flash
# interface and behaviour on top of the SRAM memory.
- # As the SST area is going to be in RAM, it is required to set SST_CREATE_FLASH_LAYOUT
- # to be sure the SST service knows that when it starts the SST area does not contain any
- # valid SST flash layout and it needs to create one. The same for ITS.
- set(SST_CREATE_FLASH_LAYOUT ON)
- set(SST_RAM_FS OFF)
+ # As the PS area is going to be in RAM, it is required to set PS_CREATE_FLASH_LAYOUT
+ # to be sure the PS service knows that when it starts the PS area does not contain any
+ # valid PS flash layout and it needs to create one. The same for ITS.
+ set(PS_CREATE_FLASH_LAYOUT ON)
+ set(PS_RAM_FS OFF)
set(ITS_CREATE_FLASH_LAYOUT ON)
set(ITS_RAM_FS OFF)
embedded_include_directories(PATH "${PLATFORM_DIR}/target/mps2/an519/cmsis_drivers" ABSOLUTE)
diff --git a/platform/ext/Mps2AN521.cmake b/platform/ext/Mps2AN521.cmake
index b37f1f3..9afdf0e 100644
--- a/platform/ext/Mps2AN521.cmake
+++ b/platform/ext/Mps2AN521.cmake
@@ -180,9 +180,9 @@
# API ONLY if the target has non-volatile counters.
list(APPEND ALL_SRC_C "${PLATFORM_DIR}/common/template/nv_counters.c")
set(TARGET_NV_COUNTERS_ENABLE ON)
- # Sets SST_ROLLBACK_PROTECTION flag to compile in the SST services
+ # Sets PS_ROLLBACK_PROTECTION flag to compile in the PS services
# rollback protection code as the target supports nv counters.
- set (SST_ROLLBACK_PROTECTION ON)
+ set (PS_ROLLBACK_PROTECTION ON)
endif()
if (NOT DEFINED BUILD_CMSIS_DRIVERS)
@@ -202,11 +202,11 @@
# There is no real flash memory for code on MPS2 board. Instead a code SRAM is
# used for code storage: ZBT SSRAM1. The Driver_Flash driver just emulates a flash
# interface and behaviour on top of the SRAM memory.
- # As the SST area is going to be in RAM, it is required to set SST_CREATE_FLASH_LAYOUT
- # to be sure the SST service knows that when it starts the SST area does not contain any
- # valid SST flash layout and it needs to create one. The same for ITS.
- set(SST_CREATE_FLASH_LAYOUT ON)
- set(SST_RAM_FS OFF)
+ # As the PS area is going to be in RAM, it is required to set PS_CREATE_FLASH_LAYOUT
+ # to be sure the PS service knows that when it starts the PS area does not contain any
+ # valid PS flash layout and it needs to create one. The same for ITS.
+ set(PS_CREATE_FLASH_LAYOUT ON)
+ set(PS_RAM_FS OFF)
set(ITS_CREATE_FLASH_LAYOUT ON)
set(ITS_RAM_FS OFF)
embedded_include_directories(PATH "${PLATFORM_DIR}/target/mps2/an521/cmsis_drivers" ABSOLUTE)
diff --git a/platform/ext/Mps2AN539.cmake b/platform/ext/Mps2AN539.cmake
index 084f441..b0b64dc 100644
--- a/platform/ext/Mps2AN539.cmake
+++ b/platform/ext/Mps2AN539.cmake
@@ -163,9 +163,9 @@
# API ONLY if the target has non-volatile counters.
list(APPEND ALL_SRC_C "${PLATFORM_DIR}/common/template/nv_counters.c")
set(TARGET_NV_COUNTERS_ENABLE ON)
- # Sets SST_ROLLBACK_PROTECTION flag to compile in the SST services
+ # Sets PS_ROLLBACK_PROTECTION flag to compile in the PS services
# rollback protection code as the target supports nv counters.
- set(SST_ROLLBACK_PROTECTION ON)
+ set(PS_ROLLBACK_PROTECTION ON)
endif()
if (NOT DEFINED BUILD_CMSIS_DRIVERS)
@@ -205,11 +205,11 @@
# There is no real flash memory for code on MPS2 board. Instead a code SRAM is used for code
# storage: SSRAM1. The Driver_Flash driver just emulates a flash interface and behaviour on
# top of the SRAM memory.
- # As the SST area is going to be in RAM, it is required to set SST_CREATE_FLASH_LAYOUT
- # to be sure the SST service knows that when it starts the SST area does not contain any
- # valid SST flash layout and it needs to create one. The same for ITS.
- set(SST_CREATE_FLASH_LAYOUT ON)
- set(SST_RAM_FS OFF)
+ # As the PS area is going to be in RAM, it is required to set PS_CREATE_FLASH_LAYOUT
+ # to be sure the PS service knows that when it starts the PS area does not contain any
+ # valid PS flash layout and it needs to create one. The same for ITS.
+ set(PS_CREATE_FLASH_LAYOUT ON)
+ set(PS_RAM_FS OFF)
set(ITS_CREATE_FLASH_LAYOUT ON)
set(ITS_RAM_FS OFF)
embedded_include_directories(PATH "${AN539_DIR}/cmsis_drivers" ABSOLUTE)
diff --git a/platform/ext/Mps3AN524.cmake b/platform/ext/Mps3AN524.cmake
index 6e7cac0..1a4cf17 100644
--- a/platform/ext/Mps3AN524.cmake
+++ b/platform/ext/Mps3AN524.cmake
@@ -186,9 +186,9 @@
# API ONLY if the target has non-volatile counters.
list(APPEND ALL_SRC_C "${PLATFORM_DIR}/common/template/nv_counters.c")
set(TARGET_NV_COUNTERS_ENABLE ON)
- # Sets SST_ROLLBACK_PROTECTION flag to compile in the SST services
+ # Sets PS_ROLLBACK_PROTECTION flag to compile in the PS services
# rollback protection code as the target supports nv counters.
- set(SST_ROLLBACK_PROTECTION ON)
+ set(PS_ROLLBACK_PROTECTION ON)
endif()
if (NOT DEFINED BUILD_CMSIS_DRIVERS)
@@ -205,13 +205,13 @@
message(FATAL_ERROR "Configuration variable BUILD_FLASH (true|false) is undefined!")
elseif(BUILD_FLASH)
list(APPEND ALL_SRC_C "${AN524_DIR}/cmsis_drivers/Driver_Flash.c")
- # For AN524 currently BRAM is used for SST The Driver_Flash driver just emulates a flash
+ # For AN524 currently BRAM is used for PS The Driver_Flash driver just emulates a flash
# interface and behaviour on top of the BRAM memory.
- # As the SST area is going to be in RAM, it is required to set SST_CREATE_FLASH_LAYOUT
- # to be sure the SST service knows that when it starts the SST area does not contain any
- # valid SST flash layout and it needs to create one. The same for ITS.
- set(SST_CREATE_FLASH_LAYOUT ON)
- set(SST_RAM_FS OFF)
+ # As the PS area is going to be in RAM, it is required to set PS_CREATE_FLASH_LAYOUT
+ # to be sure the PS service knows that when it starts the PS area does not contain any
+ # valid PS flash layout and it needs to create one. The same for ITS.
+ set(PS_CREATE_FLASH_LAYOUT ON)
+ set(PS_RAM_FS OFF)
set(ITS_CREATE_FLASH_LAYOUT ON)
set(ITS_RAM_FS OFF)
embedded_include_directories(PATH "${AN524_DIR}/cmsis_drivers" ABSOLUTE)
diff --git a/platform/ext/SSE-200_AWS.cmake b/platform/ext/SSE-200_AWS.cmake
index a7e6b53..db51353 100644
--- a/platform/ext/SSE-200_AWS.cmake
+++ b/platform/ext/SSE-200_AWS.cmake
@@ -182,9 +182,9 @@
# API ONLY if the target has non-volatile counters.
list(APPEND ALL_SRC_C "${PLATFORM_DIR}/common/template/nv_counters.c")
set(TARGET_NV_COUNTERS_ENABLE ON)
- # Sets SST_ROLLBACK_PROTECTION flag to compile in the SST services
+ # Sets PS_ROLLBACK_PROTECTION flag to compile in the PS services
# rollback protection code as the target supports nv counters.
- set (SST_ROLLBACK_PROTECTION ON)
+ set (PS_ROLLBACK_PROTECTION ON)
endif()
if (NOT DEFINED BUILD_CMSIS_DRIVERS)
@@ -204,11 +204,11 @@
# There is no real flash memory for code on MPS2 board. Instead a code SRAM is
# used for code storage: ZBT SSRAM1. The Driver_Flash driver just emulates a flash
# interface and behaviour on top of the SRAM memory.
- # As the SST area is going to be in RAM, it is required to set SST_CREATE_FLASH_LAYOUT
- # to be sure the SST service knows that when it starts the SST area does not contain any
- # valid SST flash layout and it needs to create one. The same for ITS.
- set(SST_CREATE_FLASH_LAYOUT ON)
- set(SST_RAM_FS OFF)
+ # As the PS area is going to be in RAM, it is required to set PS_CREATE_FLASH_LAYOUT
+ # to be sure the PS service knows that when it starts the PS area does not contain any
+ # valid PS flash layout and it needs to create one. The same for ITS.
+ set(PS_CREATE_FLASH_LAYOUT ON)
+ set(PS_RAM_FS OFF)
set(ITS_CREATE_FLASH_LAYOUT ON)
set(ITS_RAM_FS OFF)
embedded_include_directories(PATH "${PLATFORM_DIR}/target/sse-200_aws/cmsis_drivers" ABSOLUTE)
diff --git a/platform/ext/common/armclang/tfm_common_s.sct b/platform/ext/common/armclang/tfm_common_s.sct
index c3777a6..c1f4084 100644
--- a/platform/ext/common/armclang/tfm_common_s.sct
+++ b/platform/ext/common/armclang/tfm_common_s.sct
@@ -110,12 +110,12 @@
}
#endif /* TFM_PARTITION_TEST_CORE_IPC */
-#ifdef TFM_PARTITION_TEST_SST
- TFM_SP_SST_TEST_LINKER +0 ALIGN 32 {
- *tfm_sst_test_service.* (+RO)
- *(TFM_SP_SST_TEST_ATTR_FN)
+#ifdef TFM_PARTITION_TEST_PS
+ TFM_SP_PS_TEST_LINKER +0 ALIGN 32 {
+ *tfm_ps_test_service.* (+RO)
+ *(TFM_SP_PS_TEST_ATTR_FN)
}
-#endif /* TFM_PARTITION_TEST_SST */
+#endif /* TFM_PARTITION_TEST_PS */
/*
* This empty, zero long execution region is here to mark the end address
@@ -132,13 +132,13 @@
TFM_APP_CODE_START +0 ALIGN 32 EMPTY 0x0 {
}
-#ifdef TFM_PARTITION_SECURE_STORAGE
- TFM_SP_STORAGE_LINKER +0 ALIGN 32 {
+#ifdef TFM_PARTITION_PROTECTED_STORAGE
+ TFM_SP_PS_LINKER +0 ALIGN 32 {
*tfm_storage* (+RO)
- *test_sst_nv_counters.* (+RO)
- *(TFM_SP_STORAGE_ATTR_FN)
+ *test_ps_nv_counters.* (+RO)
+ *(TFM_SP_PS_ATTR_FN)
}
-#endif /* TFM_PARTITION_SECURE_STORAGE */
+#endif /* TFM_PARTITION_PROTECTED_STORAGE */
#ifdef TFM_PARTITION_TEST_CORE
TFM_SP_CORE_TEST_2_LINKER +0 ALIGN 32 {
@@ -237,19 +237,19 @@
TFM_APP_RW_STACK_START +0 ALIGN 32 EMPTY 0x0 {
}
-#ifdef TFM_PARTITION_SECURE_STORAGE
- TFM_SP_STORAGE_LINKER_DATA +0 ALIGN 32 {
+#ifdef TFM_PARTITION_PROTECTED_STORAGE
+ TFM_SP_PS_LINKER_DATA +0 ALIGN 32 {
*tfm_storage* (+RW +ZI)
- *test_sst_nv_counters.* (+RW +ZI)
- *(TFM_SP_STORAGE_ATTR_RW)
- *(TFM_SP_STORAGE_ATTR_ZI)
+ *test_ps_nv_counters.* (+RW +ZI)
+ *(TFM_SP_PS_ATTR_RW)
+ *(TFM_SP_PS_ATTR_ZI)
}
#if defined (TFM_PSA_API)
- TFM_SP_STORAGE_LINKER_STACK +0 ALIGN 128 EMPTY 0x800 {
+ TFM_SP_PS_LINKER_STACK +0 ALIGN 128 EMPTY 0x800 {
}
#endif
-#endif /* TFM_PARTITION_SECURE_STORAGE */
+#endif /* TFM_PARTITION_PROTECTED_STORAGE */
#ifdef TFM_PARTITION_TEST_CORE
TFM_SP_CORE_TEST_2_LINKER_DATA +0 ALIGN 32 {
@@ -475,18 +475,18 @@
#endif
#endif /* TFM_PARTITION_TEST_CORE_IPC */
-#ifdef TFM_PARTITION_TEST_SST
- TFM_SP_SST_TEST_LINKER_DATA +0 ALIGN 32 {
- *tfm_sst_test_service.* (+RW +ZI)
- *(TFM_SP_SST_TEST_ATTR_RW)
- *(TFM_SP_SST_TEST_ATTR_ZI)
+#ifdef TFM_PARTITION_TEST_PS
+ TFM_SP_PS_TEST_LINKER_DATA +0 ALIGN 32 {
+ *tfm_ps_test_service.* (+RW +ZI)
+ *(TFM_SP_PS_TEST_ATTR_RW)
+ *(TFM_SP_PS_TEST_ATTR_ZI)
}
#if defined (TFM_PSA_API)
- TFM_SP_SST_TEST_LINKER_STACK +0 ALIGN 128 EMPTY 0x500 {
+ TFM_SP_PS_TEST_LINKER_STACK +0 ALIGN 128 EMPTY 0x500 {
}
#endif
-#endif /* TFM_PARTITION_TEST_SST */
+#endif /* TFM_PARTITION_TEST_PS */
/*
* This empty, zero long execution region is here to mark the end address
diff --git a/platform/ext/common/gcc/tfm_common_s.ld b/platform/ext/common/gcc/tfm_common_s.ld
index ef16828..c9ef4e2 100644
--- a/platform/ext/common/gcc/tfm_common_s.ld
+++ b/platform/ext/common/gcc/tfm_common_s.ld
@@ -67,11 +67,11 @@
LONG (ADDR(.TFM_UNPRIV_DATA))
LONG (SIZEOF(.TFM_UNPRIV_DATA))
#endif /* defined(TFM_PSA_API) */
-#ifdef TFM_PARTITION_SECURE_STORAGE
- LONG (LOADADDR(.TFM_SP_STORAGE_LINKER_DATA))
- LONG (ADDR(.TFM_SP_STORAGE_LINKER_DATA))
- LONG (SIZEOF(.TFM_SP_STORAGE_LINKER_DATA))
-#endif /* TFM_PARTITION_SECURE_STORAGE */
+#ifdef TFM_PARTITION_PROTECTED_STORAGE
+ LONG (LOADADDR(.TFM_SP_PS_LINKER_DATA))
+ LONG (ADDR(.TFM_SP_PS_LINKER_DATA))
+ LONG (SIZEOF(.TFM_SP_PS_LINKER_DATA))
+#endif /* TFM_PARTITION_PROTECTED_STORAGE */
#ifdef TFM_PARTITION_INTERNAL_TRUSTED_STORAGE
LONG (LOADADDR(.TFM_SP_ITS_LINKER_DATA))
LONG (ADDR(.TFM_SP_ITS_LINKER_DATA))
@@ -127,11 +127,11 @@
LONG (ADDR(.TFM_IRQ_TEST_1_LINKER_DATA))
LONG (SIZEOF(.TFM_IRQ_TEST_1_LINKER_DATA))
#endif /* TFM_ENABLE_IRQ_TEST */
-#ifdef TFM_PARTITION_TEST_SST
- LONG (LOADADDR(.TFM_SP_SST_TEST_LINKER_DATA))
- LONG (ADDR(.TFM_SP_SST_TEST_LINKER_DATA))
- LONG (SIZEOF(.TFM_SP_SST_TEST_LINKER_DATA))
-#endif /* TFM_PARTITION_TEST_SST */
+#ifdef TFM_PARTITION_TEST_PS
+ LONG (LOADADDR(.TFM_SP_PS_TEST_LINKER_DATA))
+ LONG (ADDR(.TFM_SP_PS_TEST_LINKER_DATA))
+ LONG (SIZEOF(.TFM_SP_PS_TEST_LINKER_DATA))
+#endif /* TFM_PARTITION_TEST_PS */
#ifdef TFM_PARTITION_TEST_SECURE_SERVICES
LONG (LOADADDR(.TFM_SP_SECURE_CLIENT_2_LINKER_DATA))
LONG (ADDR(.TFM_SP_SECURE_CLIENT_2_LINKER_DATA))
@@ -164,14 +164,14 @@
LONG (ADDR(.TFM_SECURE_STACK))
LONG (SIZEOF(.TFM_SECURE_STACK))
#endif /* !defined(TFM_PSA_API) */
-#ifdef TFM_PARTITION_SECURE_STORAGE
- LONG (ADDR(.TFM_SP_STORAGE_LINKER_BSS))
- LONG (SIZEOF(.TFM_SP_STORAGE_LINKER_BSS))
+#ifdef TFM_PARTITION_PROTECTED_STORAGE
+ LONG (ADDR(.TFM_SP_PS_LINKER_BSS))
+ LONG (SIZEOF(.TFM_SP_PS_LINKER_BSS))
#if defined(TFM_PSA_API)
- LONG (ADDR(.TFM_SP_STORAGE_LINKER_STACK))
- LONG (SIZEOF(.TFM_SP_STORAGE_LINKER_STACK))
+ LONG (ADDR(.TFM_SP_PS_LINKER_STACK))
+ LONG (SIZEOF(.TFM_SP_PS_LINKER_STACK))
#endif
-#endif /* TFM_PARTITION_SECURE_STORAGE */
+#endif /* TFM_PARTITION_PROTECTED_STORAGE */
#ifdef TFM_PARTITION_INTERNAL_TRUSTED_STORAGE
LONG (ADDR(.TFM_SP_ITS_LINKER_BSS))
LONG (SIZEOF(.TFM_SP_ITS_LINKER_BSS))
@@ -260,14 +260,14 @@
LONG (SIZEOF(.TFM_IRQ_TEST_1_LINKER_STACK))
#endif
#endif /* TFM_ENABLE_IRQ_TEST */
-#ifdef TFM_PARTITION_TEST_SST
- LONG (ADDR(.TFM_SP_SST_TEST_LINKER_BSS))
- LONG (SIZEOF(.TFM_SP_SST_TEST_LINKER_BSS))
+#ifdef TFM_PARTITION_TEST_PS
+ LONG (ADDR(.TFM_SP_PS_TEST_LINKER_BSS))
+ LONG (SIZEOF(.TFM_SP_PS_TEST_LINKER_BSS))
#if defined(TFM_PSA_API)
- LONG (ADDR(.TFM_SP_SST_TEST_LINKER_STACK))
- LONG (SIZEOF(.TFM_SP_SST_TEST_LINKER_STACK))
+ LONG (ADDR(.TFM_SP_PS_TEST_LINKER_STACK))
+ LONG (SIZEOF(.TFM_SP_PS_TEST_LINKER_STACK))
#endif
-#endif /* TFM_PARTITION_TEST_SST */
+#endif /* TFM_PARTITION_TEST_PS */
#ifdef TFM_PARTITION_TEST_SECURE_SERVICES
LONG (ADDR(.TFM_SP_SECURE_CLIENT_2_LINKER_BSS))
LONG (SIZEOF(.TFM_SP_SECURE_CLIENT_2_LINKER_BSS))
@@ -446,19 +446,19 @@
Image$$TFM_SP_IPC_SERVICE_TEST_LINKER$$Limit = ADDR(.TFM_SP_IPC_SERVICE_TEST_LINKER) + SIZEOF(.TFM_SP_IPC_SERVICE_TEST_LINKER);
#endif /* TFM_PARTITION_TEST_CORE_IPC */
-#ifdef TFM_PARTITION_TEST_SST
- .TFM_SP_SST_TEST_LINKER : ALIGN(32)
+#ifdef TFM_PARTITION_TEST_PS
+ .TFM_SP_PS_TEST_LINKER : ALIGN(32)
{
- *tfm_sst_test_service.*(.text*)
- *tfm_sst_test_service.*(.rodata*)
- *(TFM_SP_SST_TEST_ATTR_FN)
+ *tfm_ps_test_service.*(.text*)
+ *tfm_ps_test_service.*(.rodata*)
+ *(TFM_SP_PS_TEST_ATTR_FN)
. = ALIGN(32);
} > FLASH
- Image$$TFM_SP_SST_TEST_LINKER$$RO$$Base = ADDR(.TFM_SP_SST_TEST_LINKER);
- Image$$TFM_SP_SST_TEST_LINKER$$RO$$Limit = ADDR(.TFM_SP_SST_TEST_LINKER) + SIZEOF(.TFM_SP_SST_TEST_LINKER);
- Image$$TFM_SP_SST_TEST_LINKER$$Base = ADDR(.TFM_SP_SST_TEST_LINKER);
- Image$$TFM_SP_SST_TEST_LINKER$$Limit = ADDR(.TFM_SP_SST_TEST_LINKER) + SIZEOF(.TFM_SP_SST_TEST_LINKER);
-#endif /* TFM_PARTITION_TEST_SST */
+ Image$$TFM_SP_PS_TEST_LINKER$$RO$$Base = ADDR(.TFM_SP_PS_TEST_LINKER);
+ Image$$TFM_SP_PS_TEST_LINKER$$RO$$Limit = ADDR(.TFM_SP_PS_TEST_LINKER) + SIZEOF(.TFM_SP_PS_TEST_LINKER);
+ Image$$TFM_SP_PS_TEST_LINKER$$Base = ADDR(.TFM_SP_PS_TEST_LINKER);
+ Image$$TFM_SP_PS_TEST_LINKER$$Limit = ADDR(.TFM_SP_PS_TEST_LINKER) + SIZEOF(.TFM_SP_PS_TEST_LINKER);
+#endif /* TFM_PARTITION_TEST_PS */
/**** PSA RoT RO part (CODE + RODATA) end here */
Image$$TFM_PSA_CODE_END$$Base = .;
@@ -466,21 +466,21 @@
/**** APPLICATION RoT RO part (CODE + RODATA) start here */
Image$$TFM_APP_CODE_START$$Base = .;
-#ifdef TFM_PARTITION_SECURE_STORAGE
- .TFM_SP_STORAGE_LINKER : ALIGN(32)
+#ifdef TFM_PARTITION_PROTECTED_STORAGE
+ .TFM_SP_PS_LINKER : ALIGN(32)
{
*tfm_storage*:*(.text*)
*tfm_storage*:*(.rodata*)
- *test_sst_nv_counters.*(.text*)
- *test_sst_nv_counters.*(.rodata*)
- *(TFM_SP_STORAGE_ATTR_FN)
+ *test_ps_nv_counters.*(.text*)
+ *test_ps_nv_counters.*(.rodata*)
+ *(TFM_SP_PS_ATTR_FN)
. = ALIGN(32);
} > FLASH
- Image$$TFM_SP_STORAGE_LINKER$$RO$$Base = ADDR(.TFM_SP_STORAGE_LINKER);
- Image$$TFM_SP_STORAGE_LINKER$$RO$$Limit = ADDR(.TFM_SP_STORAGE_LINKER) + SIZEOF(.TFM_SP_STORAGE_LINKER);
- Image$$TFM_SP_STORAGE_LINKER$$Base = ADDR(.TFM_SP_STORAGE_LINKER);
- Image$$TFM_SP_STORAGE_LINKER$$Limit = ADDR(.TFM_SP_STORAGE_LINKER) + SIZEOF(.TFM_SP_STORAGE_LINKER);
-#endif /* TFM_PARTITION_SECURE_STORAGE */
+ Image$$TFM_SP_PS_LINKER$$RO$$Base = ADDR(.TFM_SP_PS_LINKER);
+ Image$$TFM_SP_PS_LINKER$$RO$$Limit = ADDR(.TFM_SP_PS_LINKER) + SIZEOF(.TFM_SP_PS_LINKER);
+ Image$$TFM_SP_PS_LINKER$$Base = ADDR(.TFM_SP_PS_LINKER);
+ Image$$TFM_SP_PS_LINKER$$Limit = ADDR(.TFM_SP_PS_LINKER) + SIZEOF(.TFM_SP_PS_LINKER);
+#endif /* TFM_PARTITION_PROTECTED_STORAGE */
#ifdef TFM_PARTITION_TEST_CORE
.TFM_SP_CORE_TEST_2_LINKER : ALIGN(32)
@@ -697,41 +697,41 @@
/**** APPLICATION RoT DATA start here */
Image$$TFM_APP_RW_STACK_START$$Base = .;
-#ifdef TFM_PARTITION_SECURE_STORAGE
- .TFM_SP_STORAGE_LINKER_DATA : ALIGN(32)
+#ifdef TFM_PARTITION_PROTECTED_STORAGE
+ .TFM_SP_PS_LINKER_DATA : ALIGN(32)
{
*tfm_storage*:*(.data*)
- *test_sst_nv_counters.*(.data*)
- *(TFM_SP_STORAGE_ATTR_RW)
+ *test_ps_nv_counters.*(.data*)
+ *(TFM_SP_PS_ATTR_RW)
. = ALIGN(32);
} > RAM AT> FLASH
- Image$$TFM_SP_STORAGE_LINKER_DATA$$RW$$Base = ADDR(.TFM_SP_STORAGE_LINKER_DATA);
- Image$$TFM_SP_STORAGE_LINKER_DATA$$RW$$Limit = ADDR(.TFM_SP_STORAGE_LINKER_DATA) + SIZEOF(.TFM_SP_STORAGE_LINKER_DATA);
+ Image$$TFM_SP_PS_LINKER_DATA$$RW$$Base = ADDR(.TFM_SP_PS_LINKER_DATA);
+ Image$$TFM_SP_PS_LINKER_DATA$$RW$$Limit = ADDR(.TFM_SP_PS_LINKER_DATA) + SIZEOF(.TFM_SP_PS_LINKER_DATA);
- .TFM_SP_STORAGE_LINKER_BSS : ALIGN(32)
+ .TFM_SP_PS_LINKER_BSS : ALIGN(32)
{
- start_of_TFM_SP_STORAGE_LINKER = .;
+ start_of_TFM_SP_PS_LINKER = .;
*tfm_storage*:*(.bss*)
*tfm_storage*:*(COMMON)
- *test_sst_nv_counters.*(.bss*)
- *test_sst_nv_counters.*(COMMON)
- *(TFM_SP_STORAGE_ATTR_ZI)
- . += (. - start_of_TFM_SP_STORAGE_LINKER) ? 0 : 4;
+ *test_ps_nv_counters.*(.bss*)
+ *test_ps_nv_counters.*(COMMON)
+ *(TFM_SP_PS_ATTR_ZI)
+ . += (. - start_of_TFM_SP_PS_LINKER) ? 0 : 4;
. = ALIGN(32);
} > RAM AT> RAM
- Image$$TFM_SP_STORAGE_LINKER_DATA$$ZI$$Base = ADDR(.TFM_SP_STORAGE_LINKER_BSS);
- Image$$TFM_SP_STORAGE_LINKER_DATA$$ZI$$Limit = ADDR(.TFM_SP_STORAGE_LINKER_BSS) + SIZEOF(.TFM_SP_STORAGE_LINKER_BSS);
+ Image$$TFM_SP_PS_LINKER_DATA$$ZI$$Base = ADDR(.TFM_SP_PS_LINKER_BSS);
+ Image$$TFM_SP_PS_LINKER_DATA$$ZI$$Limit = ADDR(.TFM_SP_PS_LINKER_BSS) + SIZEOF(.TFM_SP_PS_LINKER_BSS);
#if defined (TFM_PSA_API)
- .TFM_SP_STORAGE_LINKER_STACK : ALIGN(128)
+ .TFM_SP_PS_LINKER_STACK : ALIGN(128)
{
. += 0x800;
} > RAM
- Image$$TFM_SP_STORAGE_LINKER_STACK$$ZI$$Base = ADDR(.TFM_SP_STORAGE_LINKER_STACK);
- Image$$TFM_SP_STORAGE_LINKER_STACK$$ZI$$Limit = ADDR(.TFM_SP_STORAGE_LINKER_STACK) + SIZEOF(.TFM_SP_STORAGE_LINKER_STACK);
+ Image$$TFM_SP_PS_LINKER_STACK$$ZI$$Base = ADDR(.TFM_SP_PS_LINKER_STACK);
+ Image$$TFM_SP_PS_LINKER_STACK$$ZI$$Limit = ADDR(.TFM_SP_PS_LINKER_STACK) + SIZEOF(.TFM_SP_PS_LINKER_STACK);
#endif
-#endif /* TFM_PARTITION_SECURE_STORAGE */
+#endif /* TFM_PARTITION_PROTECTED_STORAGE */
#ifdef TFM_PARTITION_TEST_CORE
.TFM_SP_CORE_TEST_2_LINKER_DATA : ALIGN(32)
@@ -1269,38 +1269,38 @@
#endif /* TFM_PARTITION_TEST_CORE_IPC */
-#ifdef TFM_PARTITION_TEST_SST
- .TFM_SP_SST_TEST_LINKER_DATA : ALIGN(32)
+#ifdef TFM_PARTITION_TEST_PS
+ .TFM_SP_PS_TEST_LINKER_DATA : ALIGN(32)
{
- *tfm_sst_test_service.*(.data*)
- *(TFM_SP_SST_TEST_ATTR_RW)
+ *tfm_ps_test_service.*(.data*)
+ *(TFM_SP_PS_TEST_ATTR_RW)
. = ALIGN(32);
} > RAM AT> FLASH
- Image$$TFM_SP_SST_TEST_LINKER_DATA$$RW$$Base = ADDR(.TFM_SP_SST_TEST_LINKER_DATA);
- Image$$TFM_SP_SST_TEST_LINKER_DATA$$RW$$Limit = ADDR(.TFM_SP_SST_TEST_LINKER_DATA) + SIZEOF(.TFM_SP_SST_TEST_LINKER_DATA);
+ Image$$TFM_SP_PS_TEST_LINKER_DATA$$RW$$Base = ADDR(.TFM_SP_PS_TEST_LINKER_DATA);
+ Image$$TFM_SP_PS_TEST_LINKER_DATA$$RW$$Limit = ADDR(.TFM_SP_PS_TEST_LINKER_DATA) + SIZEOF(.TFM_SP_PS_TEST_LINKER_DATA);
- .TFM_SP_SST_TEST_LINKER_BSS : ALIGN(32)
+ .TFM_SP_PS_TEST_LINKER_BSS : ALIGN(32)
{
- start_of_TFM_SP_SST_TEST_LINKER = .;
- *tfm_sst_test_service.*(.bss*)
- *tfm_sst_test_service.*(COMMON)
- *(TFM_SP_SST_TEST_ATTR_ZI)
- . += (. - start_of_TFM_SP_SST_TEST_LINKER) ? 0 : 4;
+ start_of_TFM_SP_PS_TEST_LINKER = .;
+ *tfm_ps_test_service.*(.bss*)
+ *tfm_ps_test_service.*(COMMON)
+ *(TFM_SP_PS_TEST_ATTR_ZI)
+ . += (. - start_of_TFM_SP_PS_TEST_LINKER) ? 0 : 4;
. = ALIGN(32);
} > RAM AT> RAM
- Image$$TFM_SP_SST_TEST_LINKER_DATA$$ZI$$Base = ADDR(.TFM_SP_SST_TEST_LINKER_BSS);
- Image$$TFM_SP_SST_TEST_LINKER_DATA$$ZI$$Limit = ADDR(.TFM_SP_SST_TEST_LINKER_BSS) + SIZEOF(.TFM_SP_SST_TEST_LINKER_BSS);
+ Image$$TFM_SP_PS_TEST_LINKER_DATA$$ZI$$Base = ADDR(.TFM_SP_PS_TEST_LINKER_BSS);
+ Image$$TFM_SP_PS_TEST_LINKER_DATA$$ZI$$Limit = ADDR(.TFM_SP_PS_TEST_LINKER_BSS) + SIZEOF(.TFM_SP_PS_TEST_LINKER_BSS);
#if defined (TFM_PSA_API)
- .TFM_SP_SST_TEST_LINKER_STACK : ALIGN(128)
+ .TFM_SP_PS_TEST_LINKER_STACK : ALIGN(128)
{
. += 0x500;
} > RAM
- Image$$TFM_SP_SST_TEST_LINKER_STACK$$ZI$$Base = ADDR(.TFM_SP_SST_TEST_LINKER_STACK);
- Image$$TFM_SP_SST_TEST_LINKER_STACK$$ZI$$Limit = ADDR(.TFM_SP_SST_TEST_LINKER_STACK) + SIZEOF(.TFM_SP_SST_TEST_LINKER_STACK);
+ Image$$TFM_SP_PS_TEST_LINKER_STACK$$ZI$$Base = ADDR(.TFM_SP_PS_TEST_LINKER_STACK);
+ Image$$TFM_SP_PS_TEST_LINKER_STACK$$ZI$$Limit = ADDR(.TFM_SP_PS_TEST_LINKER_STACK) + SIZEOF(.TFM_SP_PS_TEST_LINKER_STACK);
#endif
-#endif /* TFM_PARTITION_TEST_SST */
+#endif /* TFM_PARTITION_TEST_PS */
/**** PSA RoT DATA end here */
Image$$TFM_PSA_RW_STACK_END$$Base = .;
diff --git a/platform/ext/common/iar/tfm_common_s.icf b/platform/ext/common/iar/tfm_common_s.icf
index 04d5ebb..9996da8 100644
--- a/platform/ext/common/iar/tfm_common_s.icf
+++ b/platform/ext/common/iar/tfm_common_s.icf
@@ -110,12 +110,12 @@
};
#endif /* TFM_PARTITION_TEST_CORE_IPC */
-#ifdef TFM_PARTITION_TEST_SST
-define block TFM_SP_SST_TEST_LINKER with alignment = 32 {
- ro object *tfm_sst_test_service.*,
- section TFM_SP_SST_TEST_ATTR_FN
+#ifdef TFM_PARTITION_TEST_PS
+define block TFM_SP_PS_TEST_LINKER with alignment = 32 {
+ ro object *tfm_ps_test_service.*,
+ section TFM_SP_PS_TEST_ATTR_FN
};
-#endif /* TFM_PARTITION_TEST_SST */
+#endif /* TFM_PARTITION_TEST_PS */
/*
* This empty, zero long execution region is here to mark the end address
@@ -130,12 +130,12 @@
*/
define block TFM_APP_CODE_START with alignment = 32, size = 0 { };
-#ifdef TFM_PARTITION_SECURE_STORAGE
-define block TFM_SP_STORAGE_LINKER with alignment = 32 {
+#ifdef TFM_PARTITION_PROTECTED_STORAGE
+define block TFM_SP_PS_LINKER with alignment = 32 {
ro object *tfm_storage*,
- ro object *test_sst_nv_counters.*,
+ ro object *test_ps_nv_counters.*,
};
-#endif /* TFM_PARTITION_SECURE_STORAGE */
+#endif /* TFM_PARTITION_PROTECTED_STORAGE */
#ifdef TFM_PARTITION_TEST_CORE
define block TFM_SP_CORE_TEST_2_LINKER with alignment = 32 {
@@ -199,16 +199,16 @@
define block TFM_APP_RW_STACK_START with alignment = 32, size = 0 { };
-#ifdef TFM_PARTITION_SECURE_STORAGE
-define block TFM_SP_STORAGE_LINKER_DATA with alignment = 32 {
+#ifdef TFM_PARTITION_PROTECTED_STORAGE
+define block TFM_SP_PS_LINKER_DATA with alignment = 32 {
rw object *tfm_storage*,
- rw object *test_sst_nv_counters.*,
+ rw object *test_ps_nv_counters.*,
};
#if defined (TFM_PSA_API)
-define block TFM_SP_STORAGE_LINKER_STACK with alignment = 128, size = 0x800 { };
+define block TFM_SP_PS_LINKER_STACK with alignment = 128, size = 0x800 { };
#endif
-#endif /* TFM_PARTITION_SECURE_STORAGE */
+#endif /* TFM_PARTITION_PROTECTED_STORAGE */
#ifdef TFM_PARTITION_TEST_CORE
define block TFM_SP_CORE_TEST_2_LINKER_DATA with alignment = 32 {
@@ -393,15 +393,15 @@
#endif
#endif /* TFM_PARTITION_TEST_CORE_IPC */
-#ifdef TFM_PARTITION_TEST_SST
-define block TFM_SP_SST_TEST_LINKER_DATA with alignment = 32 {
- rw object *tfm_sst_test_service.*,
+#ifdef TFM_PARTITION_TEST_PS
+define block TFM_SP_PS_TEST_LINKER_DATA with alignment = 32 {
+ rw object *tfm_ps_test_service.*,
};
#if defined (TFM_PSA_API)
-define block TFM_SP_SST_TEST_LINKER_STACK with alignment = 128, size = 0x500 { };
+define block TFM_SP_PS_TEST_LINKER_STACK with alignment = 128, size = 0x500 { };
#endif
-#endif /* TFM_PARTITION_TEST_SST */
+#endif /* TFM_PARTITION_TEST_PS */
/*
@@ -444,9 +444,9 @@
#ifdef TFM_PARTITION_TEST_CORE_IPC
block TFM_SP_IPC_SERVICE_TEST_LINKER,
#endif /* TFM_PARTITION_TEST_CORE_IPC */
-#ifdef TFM_PARTITION_TEST_SST
- block TFM_SP_SST_TEST_LINKER,
-#endif /* TFM_PARTITION_TEST_SST */
+#ifdef TFM_PARTITION_TEST_PS
+ block TFM_SP_PS_TEST_LINKER,
+#endif /* TFM_PARTITION_TEST_PS */
block TFM_PSA_CODE_END,
@@ -456,9 +456,9 @@
* of APP RoT code.
*/
block TFM_APP_CODE_START,
-#ifdef TFM_PARTITION_SECURE_STORAGE
- block TFM_SP_STORAGE_LINKER,
-#endif /* TFM_PARTITION_SECURE_STORAGE */
+#ifdef TFM_PARTITION_PROTECTED_STORAGE
+ block TFM_SP_PS_LINKER,
+#endif /* TFM_PARTITION_PROTECTED_STORAGE */
#ifdef TFM_PARTITION_TEST_CORE
block TFM_SP_CORE_TEST_2_LINKER,
@@ -532,13 +532,13 @@
*/
block TFM_APP_RW_STACK_START,
-#ifdef TFM_PARTITION_SECURE_STORAGE
- block TFM_SP_STORAGE_LINKER_DATA,
+#ifdef TFM_PARTITION_PROTECTED_STORAGE
+ block TFM_SP_PS_LINKER_DATA,
#if defined (TFM_PSA_API)
- block TFM_SP_STORAGE_LINKER_STACK,
+ block TFM_SP_PS_LINKER_STACK,
#endif
-#endif /* TFM_PARTITION_SECURE_STORAGE */
+#endif /* TFM_PARTITION_PROTECTED_STORAGE */
#ifdef TFM_PARTITION_TEST_CORE
block TFM_SP_CORE_TEST_2_LINKER_DATA,
@@ -677,13 +677,13 @@
#endif
#endif /* TFM_PARTITION_TEST_CORE_IPC */
-#ifdef TFM_PARTITION_TEST_SST
- block TFM_SP_SST_TEST_LINKER_DATA,
+#ifdef TFM_PARTITION_TEST_PS
+ block TFM_SP_PS_TEST_LINKER_DATA,
#if defined (TFM_PSA_API)
- block TFM_SP_SST_TEST_LINKER_STACK,
+ block TFM_SP_PS_TEST_LINKER_STACK,
#endif
-#endif /* TFM_PARTITION_TEST_SST */
+#endif /* TFM_PARTITION_TEST_PS */
/*
* This empty, zero long execution region is here to mark the end address
diff --git a/platform/ext/common/template/nv_counters.c b/platform/ext/common/template/nv_counters.c
index f1fb28c..5149d0e 100644
--- a/platform/ext/common/template/nv_counters.c
+++ b/platform/ext/common/template/nv_counters.c
@@ -6,8 +6,8 @@
*/
/* NOTE: This API should be implemented by platform vendor. For the security of
- * the secure storage system's and the bootloader's rollback protection etc. it
- * is CRITICAL to use a internal (in-die) persistent memory for multiple time
+ * the protected storage system's and the bootloader's rollback protection etc.
+ * it is CRITICAL to use a internal (in-die) persistent memory for multiple time
* programmable (MTP) non-volatile counters or use a One-time Programmable (OTP)
* non-volatile counters solution.
*
diff --git a/platform/ext/lpc55s69.cmake b/platform/ext/lpc55s69.cmake
index 52282c1..1025d6f 100644
--- a/platform/ext/lpc55s69.cmake
+++ b/platform/ext/lpc55s69.cmake
@@ -15,10 +15,10 @@
add_definitions(-DCPU_LPC55S69JBD100_cm33_core0)
add_definitions(-DSERIAL_PORT_TYPE_UART=1)
-# set(SST_ENCRYPTION ON)
-set(SST_RAM_FS ON) # Disabled with BUILD_FLASH
-set(SST_CREATE_FLASH_LAYOUT ON)
-set(SST_ROLLBACK_PROTECTION ON)
+# set(PS_ENCRYPTION ON)
+set(PS_RAM_FS ON) # Disabled with BUILD_FLASH
+set(PS_CREATE_FLASH_LAYOUT ON)
+set(PS_ROLLBACK_PROTECTION ON)
set(ITS_RAM_FS ON) # Disabled with BUILD_FLASH
set(ITS_CREATE_FLASH_LAYOUT ON)
set(DAUTH_CHIP_DEFAULT ON)
@@ -207,9 +207,9 @@
# API ONLY if the target has non-volatile counters.
list(APPEND ALL_SRC_C "${PLATFORM_DIR}/common/template/nv_counters.c")
set(TARGET_NV_COUNTERS_ENABLE ON)
- # Sets SST_ROLLBACK_PROTECTION flag to compile in the SST services
+ # Sets PS_ROLLBACK_PROTECTION flag to compile in the PS services
# rollback protection code as the target supports nv counters.
- set (SST_ROLLBACK_PROTECTION ON)
+ set (PS_ROLLBACK_PROTECTION ON)
endif()
if (NOT DEFINED BUILD_CMSIS_DRIVERS)
@@ -227,12 +227,12 @@
elseif(BUILD_FLASH)
list(APPEND ALL_SRC_C "${PLATFORM_DIR}/target/nxp/common/CMSIS_Driver/Driver_Flash.c")
- # As the SST area is going to be in RAM, it is required to set
- # SST_CREATE_FLASH_LAYOUT to be sure the SST service knows that when it
- # starts the SST area does not contain any valid SST flash layout and it
+ # As the PS area is going to be in RAM, it is required to set
+ # PS_CREATE_FLASH_LAYOUT to be sure the PS service knows that when it
+ # starts the PS area does not contain any valid PS flash layout and it
# needs to create one.
- set(SST_CREATE_FLASH_LAYOUT ON)
- set(SST_RAM_FS OFF)
+ set(PS_CREATE_FLASH_LAYOUT ON)
+ set(PS_RAM_FS OFF)
set(ITS_CREATE_FLASH_LAYOUT ON)
set(ITS_RAM_FS OFF)
embedded_include_directories(PATH "${PLATFORM_DIR}/target/nxp/common/CMSIS_Driver" ABSOLUTE)
diff --git a/platform/ext/musca_a.cmake b/platform/ext/musca_a.cmake
index 50c756a..323b940 100644
--- a/platform/ext/musca_a.cmake
+++ b/platform/ext/musca_a.cmake
@@ -175,9 +175,9 @@
# API ONLY if the target has non-volatile counters.
list(APPEND ALL_SRC_C "${PLATFORM_DIR}/common/template/nv_counters.c")
set(TARGET_NV_COUNTERS_ENABLE ON)
- # Sets SST_ROLLBACK_PROTECTION flag to compile in the SST services
+ # Sets PS_ROLLBACK_PROTECTION flag to compile in the PS services
# rollback protection code as the target supports nv counters.
- set (SST_ROLLBACK_PROTECTION ON)
+ set (PS_ROLLBACK_PROTECTION ON)
endif()
if (NOT DEFINED BUILD_CMSIS_DRIVERS)
@@ -194,10 +194,10 @@
message(FATAL_ERROR "Configuration variable BUILD_FLASH (true|false) is undefined!")
elseif(BUILD_FLASH)
list(APPEND ALL_SRC_C "${PLATFORM_DIR}/target/musca_a/CMSIS_Driver/Driver_QSPI_Flash.c")
- # As the SST area is going to be in RAM, it is required to set SST_CREATE_FLASH_LAYOUT
- # to be sure the SST service knows that when it starts the SST area does not contain any
- # valid SST flash layout and it needs to create one. The same for ITS.
- set(SST_CREATE_FLASH_LAYOUT ON)
+ # As the PS area is going to be in RAM, it is required to set PS_CREATE_FLASH_LAYOUT
+ # to be sure the PS service knows that when it starts the PS area does not contain any
+ # valid PS flash layout and it needs to create one. The same for ITS.
+ set(PS_CREATE_FLASH_LAYOUT ON)
set(ITS_CREATE_FLASH_LAYOUT ON)
embedded_include_directories(PATH "${PLATFORM_DIR}/target/musca_a/CMSIS_Driver" ABSOLUTE)
embedded_include_directories(PATH "${PLATFORM_DIR}/driver" ABSOLUTE)
diff --git a/platform/ext/musca_b1.cmake b/platform/ext/musca_b1.cmake
index 3059240..6b3659c 100644
--- a/platform/ext/musca_b1.cmake
+++ b/platform/ext/musca_b1.cmake
@@ -186,9 +186,9 @@
# API ONLY if the target has non-volatile counters.
list(APPEND ALL_SRC_C "${PLATFORM_DIR}/common/template/nv_counters.c")
set(TARGET_NV_COUNTERS_ENABLE ON)
- # Sets SST_ROLLBACK_PROTECTION flag to compile in the SST services
+ # Sets PS_ROLLBACK_PROTECTION flag to compile in the PS services
# rollback protection code as the target supports nv counters.
- set(SST_ROLLBACK_PROTECTION ON)
+ set(PS_ROLLBACK_PROTECTION ON)
endif()
if (NOT DEFINED BUILD_CMSIS_DRIVERS)
@@ -206,11 +206,11 @@
elseif (BUILD_FLASH)
list(APPEND ALL_SRC_C "${PLATFORM_DIR}/target/musca_b1/CMSIS_Driver/Driver_QSPI_Flash.c")
list(APPEND ALL_SRC_C "${PLATFORM_DIR}/target/musca_b1/CMSIS_Driver/Driver_GFC100_EFlash.c")
- # As the SST area is going to be in RAM, it is required to set
- # SST_CREATE_FLASH_LAYOUT to be sure the SST service knows that when it
- # starts the SST area does not contain any valid SST flash layout and it
+ # As the PS area is going to be in RAM, it is required to set
+ # PS_CREATE_FLASH_LAYOUT to be sure the PS service knows that when it
+ # starts the PS area does not contain any valid PS flash layout and it
# needs to create one. The same for ITS.
- set(SST_CREATE_FLASH_LAYOUT ON)
+ set(PS_CREATE_FLASH_LAYOUT ON)
set(ITS_CREATE_FLASH_LAYOUT ON)
embedded_include_directories(PATH "${PLATFORM_DIR}/target/musca_b1/CMSIS_Driver" ABSOLUTE)
embedded_include_directories(PATH "${PLATFORM_DIR}/driver" ABSOLUTE)
diff --git a/platform/ext/musca_s1.cmake b/platform/ext/musca_s1.cmake
index b795ffc..6c43a91 100644
--- a/platform/ext/musca_s1.cmake
+++ b/platform/ext/musca_s1.cmake
@@ -179,9 +179,9 @@
# API ONLY if the target has non-volatile counters.
list(APPEND ALL_SRC_C "${PLATFORM_DIR}/common/template/nv_counters.c")
set(TARGET_NV_COUNTERS_ENABLE ON)
- # Sets SST_ROLLBACK_PROTECTION flag to compile in the SST services
+ # Sets PS_ROLLBACK_PROTECTION flag to compile in the PS services
# rollback protection code as the target supports nv counters.
- set(SST_ROLLBACK_PROTECTION ON)
+ set(PS_ROLLBACK_PROTECTION ON)
endif()
if (NOT DEFINED BUILD_CMSIS_DRIVERS)
@@ -198,11 +198,11 @@
message(FATAL_ERROR "Configuration variable BUILD_FLASH (true|false) is undefined!")
elseif (BUILD_FLASH)
list(APPEND ALL_SRC_C "${PLATFORM_DIR}/target/musca_s1/CMSIS_Driver/Driver_Flash_MRAM.c")
- # As the SST area is going to be in RAM, it is required to set
- # SST_CREATE_FLASH_LAYOUT to be sure the SST service knows that when it
- # starts the SST area does not contain any valid SST flash layout and it
+ # As the PS area is going to be in RAM, it is required to set
+ # PS_CREATE_FLASH_LAYOUT to be sure the PS service knows that when it
+ # starts the PS area does not contain any valid PS flash layout and it
# needs to create one. The same for ITS.
- set(SST_CREATE_FLASH_LAYOUT ON)
+ set(PS_CREATE_FLASH_LAYOUT ON)
set(ITS_CREATE_FLASH_LAYOUT ON)
embedded_include_directories(PATH "${PLATFORM_DIR}/target/musca_s1/CMSIS_Driver" ABSOLUTE)
embedded_include_directories(PATH "${PLATFORM_DIR}/driver" ABSOLUTE)
diff --git a/platform/ext/psoc64.cmake b/platform/ext/psoc64.cmake
index b985001..bcf7824 100644
--- a/platform/ext/psoc64.cmake
+++ b/platform/ext/psoc64.cmake
@@ -225,9 +225,9 @@
elseif(BUILD_TARGET_NV_COUNTERS)
list(APPEND ALL_SRC_C_S "${PLATFORM_DIR}/target/cypress/psoc64/nv_counters.c")
set(TARGET_NV_COUNTERS_ENABLE ON)
- # Sets SST_ROLLBACK_PROTECTION flag to compile in the SST services
+ # Sets PS_ROLLBACK_PROTECTION flag to compile in the PS services
# rollback protection code as the target supports nv counters.
- set (SST_ROLLBACK_PROTECTION ON)
+ set (PS_ROLLBACK_PROTECTION ON)
endif()
if (NOT DEFINED BUILD_CMSIS_DRIVERS)
@@ -245,10 +245,10 @@
message(FATAL_ERROR "Configuration variable BUILD_FLASH (true|false) is undefined!")
elseif(BUILD_FLASH)
list(APPEND ALL_SRC_C "${PLATFORM_DIR}/target/cypress/psoc64/CMSIS_Driver/Driver_Flash.c")
- # As the SST area is going to be in RAM, it is required to set SST_CREATE_FLASH_LAYOUT
- # to be sure the SST service knows that when it starts the SST area does not contain any
- # valid SST flash layout and it needs to create one.
- set(SST_CREATE_FLASH_LAYOUT ON)
+ # As the PS area is going to be in RAM, it is required to set PS_CREATE_FLASH_LAYOUT
+ # to be sure the PS service knows that when it starts the PS area does not contain any
+ # valid PS flash layout and it needs to create one.
+ set(PS_CREATE_FLASH_LAYOUT ON)
set(ITS_CREATE_FLASH_LAYOUT ON)
embedded_include_directories(PATH "${PLATFORM_DIR}/target/cypress/psoc64/CMSIS_Driver" ABSOLUTE)
embedded_include_directories(PATH "${PLATFORM_DIR}/driver" ABSOLUTE)
diff --git a/platform/ext/readme.rst b/platform/ext/readme.rst
index ff17f84..1d877d4 100644
--- a/platform/ext/readme.rst
+++ b/platform/ext/readme.rst
@@ -202,26 +202,26 @@
is executed from. Only used if ``MCUBOOT_UPGRADE_STRATEGY`` is configured to
be ``RAM_LOADING``.
-Secure Storage (SST) Service definitions
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-The SST service requires the following definitions:
+Protected Storage (PS) Service definitions
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+The PS service requires the following definitions:
-- ``SST_FLASH_AREA_ADDR`` - Defines the flash address where the secure storage
+- ``PS_FLASH_AREA_ADDR`` - Defines the flash address where the protected storage
area starts.
-- ``SST_FLASH_AREA_SIZE`` - Defines the size of the dedicated flash area
- for secure storage in bytes.
-- ``SST_SECTOR_SIZE`` - Defines the size of the external flash sectors (the
+- ``PS_FLASH_AREA_SIZE`` - Defines the size of the dedicated flash area
+ for protected storage in bytes.
+- ``PS_SECTOR_SIZE`` - Defines the size of the external flash sectors (the
smallest erasable unit) in bytes.
-- ``SST_SECTORS_PER_BLOCK`` - Defines the number of contiguous SST_SECTOR_SIZE
+- ``PS_SECTORS_PER_BLOCK`` - Defines the number of contiguous PS_SECTOR_SIZE
to form a logical block in the filesystem.
-- ``SST_FLASH_DEV_NAME`` - Specifies the flash device used by SST to store the
+- ``PS_FLASH_DEV_NAME`` - Specifies the flash device used by PS to store the
data.
-- ``SST_FLASH_PROGRAM_UNIT`` - Defines the smallest flash programmable unit in
+- ``PS_FLASH_PROGRAM_UNIT`` - Defines the smallest flash programmable unit in
bytes.
-- ``SST_MAX_ASSET_SIZE`` - Defines the maximum asset size to be stored in the
- SST area.
-- ``SST_NUM_ASSETS`` - Defines the maximum number of assets to be stored in the
- SST area.
+- ``PS_MAX_ASSET_SIZE`` - Defines the maximum asset size to be stored in the
+ PS area.
+- ``PS_NUM_ASSETS`` - Defines the maximum number of assets to be stored in the
+ PS area.
.. Note::
@@ -256,7 +256,7 @@
Expose target support for HW components
***************************************
Services may require HW components to be supported by the target to enable some
-features (e.g. SST service with rollback protection, etc). The following
+features (e.g. PS service with rollback protection, etc). The following
definitions need to be set in the .cmake file if the target has the following
HW components:
diff --git a/platform/ext/target/cypress/psoc64/CMSIS_Driver/Driver_Flash.c b/platform/ext/target/cypress/psoc64/CMSIS_Driver/Driver_Flash.c
index 2487598..c366ff2 100644
--- a/platform/ext/target/cypress/psoc64/CMSIS_Driver/Driver_Flash.c
+++ b/platform/ext/target/cypress/psoc64/CMSIS_Driver/Driver_Flash.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2019 ARM Limited. All rights reserved.
+ * Copyright (c) 2013-2020 ARM Limited. All rights reserved.
* Copyright (c) 2019, Cypress Semiconductor Corporation. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
@@ -75,7 +75,7 @@
.sector_count = FLASH0_SIZE / FLASH0_SECTOR_SIZE,
.sector_size = FLASH0_SECTOR_SIZE,
.page_size = FLASH0_PAGE_SIZE,
- .program_unit = SST_FLASH_PROGRAM_UNIT,
+ .program_unit = PS_FLASH_PROGRAM_UNIT,
.erased_value = ARM_FLASH_DRV_ERASE_VALUE
};
diff --git a/platform/ext/target/cypress/psoc64/cypress_psoc64_spec.rst b/platform/ext/target/cypress/psoc64/cypress_psoc64_spec.rst
index 038d15e..e6b5d84 100644
--- a/platform/ext/target/cypress/psoc64/cypress_psoc64_spec.rst
+++ b/platform/ext/target/cypress/psoc64/cypress_psoc64_spec.rst
@@ -440,7 +440,7 @@
-c "init; reset init; flash write_image erase ${BUILD_DIR}/tfm_ns_signed.hex" \
-c "resume; reset; exit"
-Optionally, erase SST partition:
+Optionally, erase PS partition:
.. code-block:: bash
@@ -452,7 +452,7 @@
-c "flash erase_address 0x101c0000 0x10000" \
-c "shutdown"
-Note that the ``0x101C0000`` in the command above must match the SST start
+Note that the ``0x101C0000`` in the command above must match the PS start
address of the secure primary image specified in the file:
platform/ext/target/cypress/psoc64/partition/flash_layout.h
@@ -492,7 +492,7 @@
-c "flash write_image erase ${BUILD_DIR}/tfm_ns.hex" \
-c "reset run"
-Optionally, erase SST partition:
+Optionally, erase PS partition:
.. code-block:: bash
@@ -504,7 +504,7 @@
-c "flash erase_address 0x101c0000 0x10000" \
-c "shutdown"
-Note that the ``0x101C0000`` in the command above must match the SST start
+Note that the ``0x101C0000`` in the command above must match the PS start
address of the secure primary image specified in the file:
platform/ext/target/cypress/psoc64/partition/flash_layout.h
@@ -532,7 +532,7 @@
pyocd flash -t cy8c64xa_cm4_full_flash ${BUILD_DIR}/tfm_ns.hex
-Optionally, erase SST partition:
+Optionally, erase PS partition:
.. code-block:: bash
diff --git a/platform/ext/target/cypress/psoc64/partition/flash_layout.h b/platform/ext/target/cypress/psoc64/partition/flash_layout.h
index 353d75f..181aff5 100644
--- a/platform/ext/target/cypress/psoc64/partition/flash_layout.h
+++ b/platform/ext/target/cypress/psoc64/partition/flash_layout.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2020 Arm Limited. All rights reserved.
* Copyright (c) 2019-2020, Cypress Semiconductor Corporation. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,7 +31,7 @@
* 0x101c_0000 Internal Trusted Storage Area (16 KB)
* 0x101c_4000 NV counters area (1 KB)
* 0x101c_4400 Scratch area (27 KB)
- * 0x101c_b000 Secure Storage Area (20 KB)
+ * 0x101c_b000 Protected Storage Area (20 KB)
* 0x101d_0000 Reserved (192 KB)
* 0x101f_ffff End of Flash
*
@@ -84,10 +84,10 @@
FLASH_NV_COUNTERS_AREA_SIZE)
#define FLASH_AREA_SCRATCH_SIZE (0x6c00) /* 27 KB */
-/* Secure Storage Area */
-#define FLASH_SST_AREA_OFFSET (FLASH_AREA_SCRATCH_OFFSET + \
+/* Protected Storage Area */
+#define FLASH_PS_AREA_OFFSET (FLASH_AREA_SCRATCH_OFFSET + \
FLASH_AREA_SCRATCH_SIZE)
-#define FLASH_SST_AREA_SIZE (0x5000) /* 20 KB */
+#define FLASH_PS_AREA_SIZE (0x5000) /* 20 KB */
#define FLASH_AREA_SYSTEM_RESERVED_SIZE (0x30000) /* 192 KB */
@@ -108,39 +108,39 @@
#define FLASH_RESERVED_AREA_SIZE (FLASH_ITS_AREA_SIZE + \
FLASH_NV_COUNTERS_AREA_SIZE + \
FLASH_AREA_SCRATCH_SIZE + \
- FLASH_SST_AREA_SIZE + \
+ FLASH_PS_AREA_SIZE + \
FLASH_AREA_SYSTEM_RESERVED_SIZE)
#if (FLASH_RESERVED_AREA_OFFSET + FLASH_RESERVED_AREA_SIZE) > (FLASH_TOTAL_SIZE)
#error "Out of Flash memory"
#endif
-/* Flash device name used by BL2 and SST
+/* Flash device name used by BL2 and PS
* Name is defined in flash driver file: Driver_Flash.c
*/
#define FLASH_DEV_NAME Driver_FLASH0
-/* Secure Storage (SST) Service definitions
+/* Protected Storage (PS) Service definitions
* Note: Further documentation of these definitions can be found in the
- * TF-M SST Integration Guide.
+ * TF-M PS Integration Guide.
*/
-#define SST_FLASH_DEV_NAME Driver_FLASH0
+#define PS_FLASH_DEV_NAME Driver_FLASH0
/* In this target the CMSIS driver requires only the offset from the base
* address instead of the full memory address.
*/
-#define SST_FLASH_AREA_ADDR FLASH_SST_AREA_OFFSET
-/* Dedicated flash area for SST */
-#define SST_FLASH_AREA_SIZE FLASH_SST_AREA_SIZE
-#define SST_SECTOR_SIZE FLASH_AREA_IMAGE_SECTOR_SIZE
-/* Number of SST_SECTOR_SIZE per block */
-#define SST_SECTORS_PER_BLOCK 0x8
+#define PS_FLASH_AREA_ADDR FLASH_PS_AREA_OFFSET
+/* Dedicated flash area for PS */
+#define PS_FLASH_AREA_SIZE FLASH_PS_AREA_SIZE
+#define PS_SECTOR_SIZE FLASH_AREA_IMAGE_SECTOR_SIZE
+/* Number of PS_SECTOR_SIZE per block */
+#define PS_SECTORS_PER_BLOCK 0x8
/* Specifies the smallest flash programmable unit in bytes */
-#define SST_FLASH_PROGRAM_UNIT 0x1
-/* The maximum asset size to be stored in the SST area */
-#define SST_MAX_ASSET_SIZE 2048
-/* The maximum number of assets to be stored in the SST area */
-#define SST_NUM_ASSETS 10
+#define PS_FLASH_PROGRAM_UNIT 0x1
+/* The maximum asset size to be stored in the PS area */
+#define PS_MAX_ASSET_SIZE 2048
+/* The maximum number of assets to be stored in the PS area */
+#define PS_NUM_ASSETS 10
/* Internal Trusted Storage (ITS) Service definitions
* Note: Further documentation of these definitions can be found in the
diff --git a/platform/ext/target/cypress/psoc64/smpu_config.h b/platform/ext/target/cypress/psoc64/smpu_config.h
index 119afb7..76a8b7e 100644
--- a/platform/ext/target/cypress/psoc64/smpu_config.h
+++ b/platform/ext/target/cypress/psoc64/smpu_config.h
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2019-2020, Cypress Semiconductor Corporation. All rights reserved.
- * Copyright (c) 2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -119,7 +119,7 @@
#error "Flash layout has changed - SMPU2_REGIONSIZE isn't FLASH_NV_COUNTERS_AREA_SIZE"
#endif
-/* SMPU3 - SST in Flash */
+/* SMPU3 - PS in Flash */
#define SMPU3_BASE S_ROM_ALIAS(0x1c8000)
#define SMPU3_REGIONSIZE PROT_SIZE_32KB_BIT_SHIFT
#define SMPU3_SUBREGION_DIS (CY_PROT_SUBREGION_DIS0 | \
@@ -143,17 +143,17 @@
#endif
/*
- * SST_FLASH_AREA_ADDR must equal the base address of subregion 3 of
+ * PS_FLASH_AREA_ADDR must equal the base address of subregion 3 of
* SMPU3
*/
-#if S_ROM_ALIAS(SST_FLASH_AREA_ADDR) != (SMPU3_BASE + \
+#if S_ROM_ALIAS(PS_FLASH_AREA_ADDR) != (SMPU3_BASE + \
(3 * REGIONSIZE_TO_BYTES(SMPU3_REGIONSIZE) / 8))
#error "Flash layout has changed - S_DATA_PRIV_START isn't subregion 3 of SMPU3"
#endif
-/* Should exactly cover the SST region */
-#if FLASH_SST_AREA_SIZE != (5 * REGIONSIZE_TO_BYTES(SMPU3_REGIONSIZE) / 8)
-#error "Flash layout has changed - SMPU3_REGIONSIZE isn't FLASH_SST_AREA_SIZE"
+/* Should exactly cover the PS region */
+#if FLASH_PS_AREA_SIZE != (5 * REGIONSIZE_TO_BYTES(SMPU3_REGIONSIZE) / 8)
+#error "Flash layout has changed - SMPU3_REGIONSIZE isn't FLASH_PS_AREA_SIZE"
#endif
/* SMPU6 - 32KB of unprivileged secure data in SRAM */
diff --git a/platform/ext/target/mps2/an519/partition/flash_layout.h b/platform/ext/target/mps2/an519/partition/flash_layout.h
index 8b6991c..e6eb047 100644
--- a/platform/ext/target/mps2/an519/partition/flash_layout.h
+++ b/platform/ext/target/mps2/an519/partition/flash_layout.h
@@ -25,7 +25,7 @@
* 0x0018_0000 Secure image secondary slot (0.5 MB)
* 0x0020_0000 Non-secure image secondary slot (0.5 MB)
* 0x0028_0000 Scratch area (0.5 MB)
- * 0x0030_0000 Secure Storage Area (20 KB)
+ * 0x0030_0000 Protected Storage Area (20 KB)
* 0x0030_5000 Internal Trusted Storage Area (16 KB)
* 0x0030_9000 NV counters area (4 KB)
* 0x0030_A000 Unused (984 KB)
@@ -40,7 +40,7 @@
* 0x0018_0000 Secure image secondary
* 0x0020_0000 Non-secure image secondary
* 0x0028_0000 Scratch area (1 MB)
- * 0x0038_0000 Secure Storage Area (20 KB)
+ * 0x0038_0000 Protected Storage Area (20 KB)
* 0x0038_5000 Internal Trusted Storage Area (16 KB)
* 0x0038_9000 NV counters area (4 KB)
* 0x0038_A000 Unused (472 KB)
@@ -138,14 +138,14 @@
#error "Only MCUBOOT_IMAGE_NUMBER 1 and 2 are supported!"
#endif /* MCUBOOT_IMAGE_NUMBER */
-/* Secure Storage (SST) Service definitions */
-#define FLASH_SST_AREA_OFFSET (FLASH_AREA_SCRATCH_OFFSET + \
+/* Protected Storage (PS) Service definitions */
+#define FLASH_PS_AREA_OFFSET (FLASH_AREA_SCRATCH_OFFSET + \
FLASH_AREA_SCRATCH_SIZE)
-#define FLASH_SST_AREA_SIZE (0x5000) /* 20 KB */
+#define FLASH_PS_AREA_SIZE (0x5000) /* 20 KB */
/* Internal Trusted Storage (ITS) Service definitions */
-#define FLASH_ITS_AREA_OFFSET (FLASH_SST_AREA_OFFSET + \
- FLASH_SST_AREA_SIZE)
+#define FLASH_ITS_AREA_OFFSET (FLASH_PS_AREA_OFFSET + \
+ FLASH_PS_AREA_SIZE)
#define FLASH_ITS_AREA_SIZE (0x4000) /* 16 KB */
/* NV Counters definitions */
@@ -166,27 +166,27 @@
*/
#define FLASH_DEV_NAME Driver_FLASH0
-/* Secure Storage (SST) Service definitions
+/* Protected Storage (PS) Service definitions
* Note: Further documentation of these definitions can be found in the
- * TF-M SST Integration Guide.
+ * TF-M PS Integration Guide.
*/
-#define SST_FLASH_DEV_NAME Driver_FLASH0
+#define PS_FLASH_DEV_NAME Driver_FLASH0
/* In this target the CMSIS driver requires only the offset from the base
* address instead of the full memory address.
*/
-#define SST_FLASH_AREA_ADDR FLASH_SST_AREA_OFFSET
-/* Dedicated flash area for SST */
-#define SST_FLASH_AREA_SIZE FLASH_SST_AREA_SIZE
-#define SST_SECTOR_SIZE FLASH_AREA_IMAGE_SECTOR_SIZE
-/* Number of SST_SECTOR_SIZE per block */
-#define SST_SECTORS_PER_BLOCK (0x1)
+#define PS_FLASH_AREA_ADDR FLASH_PS_AREA_OFFSET
+/* Dedicated flash area for PS */
+#define PS_FLASH_AREA_SIZE FLASH_PS_AREA_SIZE
+#define PS_SECTOR_SIZE FLASH_AREA_IMAGE_SECTOR_SIZE
+/* Number of PS_SECTOR_SIZE per block */
+#define PS_SECTORS_PER_BLOCK (0x1)
/* Specifies the smallest flash programmable unit in bytes */
-#define SST_FLASH_PROGRAM_UNIT (0x1)
-/* The maximum asset size to be stored in the SST area */
-#define SST_MAX_ASSET_SIZE (2048)
-/* The maximum number of assets to be stored in the SST area */
-#define SST_NUM_ASSETS (10)
+#define PS_FLASH_PROGRAM_UNIT (0x1)
+/* The maximum asset size to be stored in the PS area */
+#define PS_MAX_ASSET_SIZE (2048)
+/* The maximum number of assets to be stored in the PS area */
+#define PS_NUM_ASSETS (10)
/* Internal Trusted Storage (ITS) Service definitions
* Note: Further documentation of these definitions can be found in the
diff --git a/platform/ext/target/mps2/an521/partition/flash_layout.h b/platform/ext/target/mps2/an521/partition/flash_layout.h
index f4a0bf5..cb661ea 100644
--- a/platform/ext/target/mps2/an521/partition/flash_layout.h
+++ b/platform/ext/target/mps2/an521/partition/flash_layout.h
@@ -25,7 +25,7 @@
* 0x0018_0000 Secure image secondary slot (0.5 MB)
* 0x0020_0000 Non-secure image secondary slot (0.5 MB)
* 0x0028_0000 Scratch area (0.5 MB)
- * 0x0030_0000 Secure Storage Area (20 KB)
+ * 0x0030_0000 Protected Storage Area (20 KB)
* 0x0030_5000 Internal Trusted Storage Area (16 KB)
* 0x0030_9000 NV counters area (4 KB)
* 0x0030_A000 Unused (984 KB)
@@ -40,7 +40,7 @@
* 0x0018_0000 Secure image secondary
* 0x0020_0000 Non-secure image secondary
* 0x0028_0000 Scratch area (1 MB)
- * 0x0038_0000 Secure Storage Area (20 KB)
+ * 0x0038_0000 Protected Storage Area (20 KB)
* 0x0038_5000 Internal Trusted Storage Area (16 KB)
* 0x0038_9000 NV counters area (4 KB)
* 0x0038_A000 Unused (472 KB)
@@ -138,14 +138,14 @@
#error "Only MCUBOOT_IMAGE_NUMBER 1 and 2 are supported!"
#endif /* MCUBOOT_IMAGE_NUMBER */
-/* Secure Storage (SST) Service definitions */
-#define FLASH_SST_AREA_OFFSET (FLASH_AREA_SCRATCH_OFFSET + \
+/* Protected Storage (PS) Service definitions */
+#define FLASH_PS_AREA_OFFSET (FLASH_AREA_SCRATCH_OFFSET + \
FLASH_AREA_SCRATCH_SIZE)
-#define FLASH_SST_AREA_SIZE (0x5000) /* 20 KB */
+#define FLASH_PS_AREA_SIZE (0x5000) /* 20 KB */
/* Internal Trusted Storage (ITS) Service definitions */
-#define FLASH_ITS_AREA_OFFSET (FLASH_SST_AREA_OFFSET + \
- FLASH_SST_AREA_SIZE)
+#define FLASH_ITS_AREA_OFFSET (FLASH_PS_AREA_OFFSET + \
+ FLASH_PS_AREA_SIZE)
#define FLASH_ITS_AREA_SIZE (0x4000) /* 16 KB */
/* NV Counters definitions */
@@ -166,27 +166,27 @@
*/
#define FLASH_DEV_NAME Driver_FLASH0
-/* Secure Storage (SST) Service definitions
+/* Protected Storage (PS) Service definitions
* Note: Further documentation of these definitions can be found in the
- * TF-M SST Integration Guide.
+ * TF-M PS Integration Guide.
*/
-#define SST_FLASH_DEV_NAME Driver_FLASH0
+#define PS_FLASH_DEV_NAME Driver_FLASH0
/* In this target the CMSIS driver requires only the offset from the base
* address instead of the full memory address.
*/
-#define SST_FLASH_AREA_ADDR FLASH_SST_AREA_OFFSET
-/* Dedicated flash area for SST */
-#define SST_FLASH_AREA_SIZE FLASH_SST_AREA_SIZE
-#define SST_SECTOR_SIZE FLASH_AREA_IMAGE_SECTOR_SIZE
-/* Number of SST_SECTOR_SIZE per block */
-#define SST_SECTORS_PER_BLOCK (0x1)
+#define PS_FLASH_AREA_ADDR FLASH_PS_AREA_OFFSET
+/* Dedicated flash area for PS */
+#define PS_FLASH_AREA_SIZE FLASH_PS_AREA_SIZE
+#define PS_SECTOR_SIZE FLASH_AREA_IMAGE_SECTOR_SIZE
+/* Number of PS_SECTOR_SIZE per block */
+#define PS_SECTORS_PER_BLOCK (0x1)
/* Specifies the smallest flash programmable unit in bytes */
-#define SST_FLASH_PROGRAM_UNIT (0x1)
-/* The maximum asset size to be stored in the SST area */
-#define SST_MAX_ASSET_SIZE (2048)
-/* The maximum number of assets to be stored in the SST area */
-#define SST_NUM_ASSETS (10)
+#define PS_FLASH_PROGRAM_UNIT (0x1)
+/* The maximum asset size to be stored in the PS area */
+#define PS_MAX_ASSET_SIZE (2048)
+/* The maximum number of assets to be stored in the PS area */
+#define PS_NUM_ASSETS (10)
/* Internal Trusted Storage (ITS) Service definitions
* Note: Further documentation of these definitions can be found in the
diff --git a/platform/ext/target/mps2/an539/partition/flash_layout.h b/platform/ext/target/mps2/an539/partition/flash_layout.h
index 2573002..092e83b 100644
--- a/platform/ext/target/mps2/an539/partition/flash_layout.h
+++ b/platform/ext/target/mps2/an539/partition/flash_layout.h
@@ -25,7 +25,7 @@
* 0x0018_0000 Secure image secondary slot (0.5 MB)
* 0x0020_0000 Non-secure image secondary slot (0.5 MB)
* 0x0028_0000 Scratch area (0.5 MB)
- * 0x0030_0000 Secure Storage Area (20 KB)
+ * 0x0030_0000 Protected Storage Area (20 KB)
* 0x0030_5000 Internal Trusted Storage Area (16 KB)
* 0x0030_9000 NV counters area (4 KB)
* 0x0030_A000 Unused (984 KB)
@@ -40,7 +40,7 @@
* 0x0018_0000 Secure image secondary
* 0x0020_0000 Non-secure image secondary
* 0x0028_0000 Scratch area (1 MB)
- * 0x0038_0000 Secure Storage Area (20 KB)
+ * 0x0038_0000 Protected Storage Area (20 KB)
* 0x0038_5000 Internal Trusted Storage Area (16 KB)
* 0x0038_9000 NV counters area (4 KB)
* 0x0038_A000 Unused (472 KB)
@@ -136,14 +136,14 @@
#error "Only MCUBOOT_IMAGE_NUMBER 1 and 2 are supported!"
#endif /* MCUBOOT_IMAGE_NUMBER */
-/* Secure Storage (SST) Service definitions */
-#define FLASH_SST_AREA_OFFSET (FLASH_AREA_SCRATCH_OFFSET + \
+/* Protected Storage (PS) Service definitions */
+#define FLASH_PS_AREA_OFFSET (FLASH_AREA_SCRATCH_OFFSET + \
FLASH_AREA_SCRATCH_SIZE)
-#define FLASH_SST_AREA_SIZE (0x5000) /* 20 KB */
+#define FLASH_PS_AREA_SIZE (0x5000) /* 20 KB */
/* Internal Trusted Storage (ITS) Service definitions */
-#define FLASH_ITS_AREA_OFFSET (FLASH_SST_AREA_OFFSET + \
- FLASH_SST_AREA_SIZE)
+#define FLASH_ITS_AREA_OFFSET (FLASH_PS_AREA_OFFSET + \
+ FLASH_PS_AREA_SIZE)
#define FLASH_ITS_AREA_SIZE (0x4000) /* 16 KB */
/* NV Counters definitions */
@@ -164,28 +164,28 @@
*/
#define FLASH_DEV_NAME Driver_FLASH0
-/* Secure Storage (SST) Service definitions
+/* Protected Storage (PS) Service definitions
* Note: Further documentation of these definitions can be found in the
- * TF-M SST Integration Guide.
+ * TF-M PS Integration Guide.
*/
-#define SST_FLASH_DEV_NAME Driver_FLASH0
+#define PS_FLASH_DEV_NAME Driver_FLASH0
/*
* In this target the CMSIS driver requires only the offset from the
* flash base address instead of the full flash address.
*/
-#define SST_FLASH_AREA_ADDR FLASH_SST_AREA_OFFSET
-/* Dedicated flash area for SST */
-#define SST_FLASH_AREA_SIZE FLASH_SST_AREA_SIZE
-#define SST_SECTOR_SIZE FLASH_AREA_IMAGE_SECTOR_SIZE
-/* Number of SST_SECTOR_SIZE per block */
-#define SST_SECTORS_PER_BLOCK (0x1)
+#define PS_FLASH_AREA_ADDR FLASH_PS_AREA_OFFSET
+/* Dedicated flash area for PS */
+#define PS_FLASH_AREA_SIZE FLASH_PS_AREA_SIZE
+#define PS_SECTOR_SIZE FLASH_AREA_IMAGE_SECTOR_SIZE
+/* Number of PS_SECTOR_SIZE per block */
+#define PS_SECTORS_PER_BLOCK (0x1)
/* Specifies the smallest flash programmable unit in bytes */
-#define SST_FLASH_PROGRAM_UNIT (0x1)
-/* The maximum asset size to be stored in the SST area */
-#define SST_MAX_ASSET_SIZE (2048)
-/* The maximum number of assets to be stored in the SST area */
-#define SST_NUM_ASSETS (10)
+#define PS_FLASH_PROGRAM_UNIT (0x1)
+/* The maximum asset size to be stored in the PS area */
+#define PS_MAX_ASSET_SIZE (2048)
+/* The maximum number of assets to be stored in the PS area */
+#define PS_NUM_ASSETS (10)
/* Internal Trusted Storage (ITS) Service definitions
* Note: Further documentation of these definitions can be found in the
diff --git a/platform/ext/target/mps3/an524/cmsis_drivers/Driver_Flash.c b/platform/ext/target/mps3/an524/cmsis_drivers/Driver_Flash.c
index 4e3b6a2..37a7e90 100644
--- a/platform/ext/target/mps3/an524/cmsis_drivers/Driver_Flash.c
+++ b/platform/ext/target/mps3/an524/cmsis_drivers/Driver_Flash.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2013-2020 Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -21,7 +21,7 @@
* Git SHA: 9f3da0b83e45e6d26ad0be45c090d2e4382fb04f
*/
-/* FIXME: This interim flash driver uses BRAM to emulate flash for SST.
+/* FIXME: This interim flash driver uses BRAM to emulate flash for PS.
* Code is still running on QSPI, and only direct read is supported,
* write is not supported yet.
* It should be replaced with a real flash driver.
@@ -40,9 +40,9 @@
/* Driver version */
#define ARM_FLASH_DRV_VERSION ARM_DRIVER_VERSION_MAJOR_MINOR(1, 0)
-#define FLASH_REDIRECT_BASE SST_FLASH_AREA_ADDR
+#define FLASH_REDIRECT_BASE PS_FLASH_AREA_ADDR
#define FLASH_REDIRECT_LIMIT (FLASH_REDIRECT_BASE \
- + FLASH_SST_AREA_SIZE \
+ + FLASH_PS_AREA_SIZE \
+ FLASH_ITS_AREA_SIZE \
+ FLASH_NV_COUNTERS_AREA_SIZE)
#define FLASH_REDIRECT_DEST 0x38000000
@@ -188,7 +188,7 @@
return ARM_DRIVER_ERROR_PARAMETER;
}
- /* Redirecting SST storage to BRAM */
+ /* Redirecting PS storage to BRAM */
if (addr >= FLASH_REDIRECT_BASE && addr <= FLASH_REDIRECT_LIMIT) {
start_addr = FLASH_REDIRECT_DEST + (addr - FLASH_REDIRECT_BASE);
}
@@ -212,10 +212,10 @@
return ARM_DRIVER_ERROR_PARAMETER;
}
- /* Redirecting SST storage to BRAM */
+ /* Redirecting PS storage to BRAM */
if (addr >= FLASH_REDIRECT_BASE && addr <= FLASH_REDIRECT_LIMIT) {
start_addr = FLASH_REDIRECT_DEST + (addr - FLASH_REDIRECT_BASE);
- /* SST Flash is emulated over BRAM. use memcpy function. */
+ /* PS Flash is emulated over BRAM. use memcpy function. */
memcpy((void *)start_addr, data, cnt);
} else {
/* Flash driver for QSPI is not ready */
@@ -234,9 +234,9 @@
return ARM_DRIVER_ERROR_PARAMETER;
}
- /* Redirecting SST storage to BRAM */
+ /* Redirecting PS storage to BRAM */
if (addr >= FLASH_REDIRECT_BASE && addr <= FLASH_REDIRECT_LIMIT) {
- /* SST Flash IS emulated over BRAM. use memcpy function. */
+ /* PS Flash IS emulated over BRAM. use memcpy function. */
memset((void *)(FLASH_REDIRECT_DEST
+ (addr - FLASH_REDIRECT_BASE)),
FLASH0_DEV->data->erased_value,
@@ -257,7 +257,7 @@
/* Check driver capability erase_chip bit */
if (DriverCapabilities.erase_chip == 1) {
for (i = 0; i < FLASH0_DEV->data->sector_count; i++) {
- /* Redirecting SST storage to BRAM */
+ /* Redirecting PS storage to BRAM */
if (addr >= FLASH_REDIRECT_BASE && addr <= FLASH_REDIRECT_LIMIT) {
memset((void *)(FLASH_REDIRECT_DEST +
(addr - FLASH0_DEV->memory_base - FLASH_REDIRECT_BASE)),
diff --git a/platform/ext/target/mps3/an524/partition/flash_layout.h b/platform/ext/target/mps3/an524/partition/flash_layout.h
index 6d571f6..191445a 100644
--- a/platform/ext/target/mps3/an524/partition/flash_layout.h
+++ b/platform/ext/target/mps3/an524/partition/flash_layout.h
@@ -33,7 +33,7 @@
* Secondary image area:
* 0x0010_0000 Secure image (512 KB)
* 0x0018_0000 Non-secure image (256 KB)
- * 0x001C_0000 SST area (20 KB)
+ * 0x001C_0000 PS area (20 KB)
* 0x001C_5000 ITS area (16 KB)
* 0x001C_9000 NV counters (4 KB)
* 0x001C_A000 Unused
@@ -42,7 +42,7 @@
*
* 0x0000_0000 Secure image (512 KB)
* 0x000C_0000 Non-secure image (256 KB)
- * 0x001C_0000 SST area (20 KB)
+ * 0x001C_0000 PS area (20 KB)
* 0x001C_5000 ITS area (16 KB)
* 0x001C_9000 NV counters (4 KB)
* 0x001C_A000 Unused
@@ -125,14 +125,14 @@
*/
#define MCUBOOT_STATUS_MAX_ENTRIES (0)
-/* Secure Storage (SST) Service definitions */
-#define FLASH_SST_AREA_OFFSET (FLASH_AREA_SCRATCH_OFFSET + \
+/* Protected Storage (PS) Service definitions */
+#define FLASH_PS_AREA_OFFSET (FLASH_AREA_SCRATCH_OFFSET + \
FLASH_AREA_SCRATCH_SIZE)
-#define FLASH_SST_AREA_SIZE (0x5000) /* 20 KB */
+#define FLASH_PS_AREA_SIZE (0x5000) /* 20 KB */
/* Internal Trusted Storage (ITS) Service definitions */
-#define FLASH_ITS_AREA_OFFSET (FLASH_SST_AREA_OFFSET + \
- FLASH_SST_AREA_SIZE)
+#define FLASH_ITS_AREA_OFFSET (FLASH_PS_AREA_OFFSET + \
+ FLASH_PS_AREA_SIZE)
#define FLASH_ITS_AREA_SIZE (0x4000) /* 16 KB */
/* NV Counters definitions */
@@ -153,28 +153,28 @@
*/
#define FLASH_DEV_NAME Driver_FLASH0
-/* Secure Storage (SST) Service definitions
+/* Protected Storage (PS) Service definitions
* Note: Further documentation of these definitions can be found in the
- * TF-M SST Integration Guide.
+ * TF-M PS Integration Guide.
*/
-#define SST_FLASH_DEV_NAME Driver_FLASH0
+#define PS_FLASH_DEV_NAME Driver_FLASH0
/* In this target the CMSIS driver requires only the offset from the base
* address instead of the full memory address.
*/
-#define SST_FLASH_AREA_ADDR FLASH_SST_AREA_OFFSET
-/* Dedicated flash area for SST */
-#define SST_FLASH_AREA_SIZE FLASH_SST_AREA_SIZE
+#define PS_FLASH_AREA_ADDR FLASH_PS_AREA_OFFSET
+/* Dedicated flash area for PS */
+#define PS_FLASH_AREA_SIZE FLASH_PS_AREA_SIZE
/* Sector size of the flash hardware; same as FLASH0_SECTOR_SIZE */
-#define SST_SECTOR_SIZE FLASH_AREA_IMAGE_SECTOR_SIZE
-/* Number of SST_SECTOR_SIZE per block */
-#define SST_SECTORS_PER_BLOCK (0x1)
+#define PS_SECTOR_SIZE FLASH_AREA_IMAGE_SECTOR_SIZE
+/* Number of PS_SECTOR_SIZE per block */
+#define PS_SECTORS_PER_BLOCK (0x1)
/* Specifies the smallest flash programmable unit in bytes */
-#define SST_FLASH_PROGRAM_UNIT (0x1)
-/* The maximum asset size to be stored in the SST area */
-#define SST_MAX_ASSET_SIZE (2048)
-/* The maximum number of assets to be stored in the SST area */
-#define SST_NUM_ASSETS (10)
+#define PS_FLASH_PROGRAM_UNIT (0x1)
+/* The maximum asset size to be stored in the PS area */
+#define PS_MAX_ASSET_SIZE (2048)
+/* The maximum number of assets to be stored in the PS area */
+#define PS_NUM_ASSETS (10)
/* Internal Trusted Storage (ITS) Service definitions
* Note: Further documentation of these definitions can be found in the
diff --git a/platform/ext/target/musca_a/Device/Source/device_definition.c b/platform/ext/target/musca_a/Device/Source/device_definition.c
index 1773e08..d2ebfaf 100644
--- a/platform/ext/target/musca_a/Device/Source/device_definition.c
+++ b/platform/ext/target/musca_a/Device/Source/device_definition.c
@@ -621,7 +621,7 @@
#if (defined(MT25QL_NS) && defined(QSPI_IP6514E_NS))
struct mt25ql_dev_t MT25QL_DEV_NS
- TFM_LINK_SET_RW_IN_PARTITION_SECTION("TFM_SP_STORAGE")
+ TFM_LINK_SET_RW_IN_PARTITION_SECTION("TFM_SP_PS")
= {
.controller = &QSPI_DEV_NS,
.direct_access_start_addr = MUSCA_QSPI_FLASH_NS_BASE,
diff --git a/platform/ext/target/musca_a/partition/flash_layout.h b/platform/ext/target/musca_a/partition/flash_layout.h
index 1ee2bab..126f173 100644
--- a/platform/ext/target/musca_a/partition/flash_layout.h
+++ b/platform/ext/target/musca_a/partition/flash_layout.h
@@ -26,7 +26,7 @@
* 0x0032_0000 Secondary image area (1 MB):
* 0x0032_0000 Secure image secondary
* 0x003A_0000 Non-secure image secondary
- * 0x0042_0000 Secure Storage Area (8 KB)
+ * 0x0042_0000 Protected Storage Area (8 KB)
* 0x0042_2000 Internal Trusted Storage Area (8 KB)
* 0x0042_4000 NV counters area (4 KB)
* 0x0042_5000 Unused
@@ -129,14 +129,14 @@
*/
#define MCUBOOT_STATUS_MAX_ENTRIES (0)
-/* Secure Storage (SST) Service definitions */
-#define FLASH_SST_AREA_OFFSET (FLASH_AREA_SCRATCH_OFFSET + \
+/* Protected Storage (PS) Service definitions */
+#define FLASH_PS_AREA_OFFSET (FLASH_AREA_SCRATCH_OFFSET + \
FLASH_AREA_SCRATCH_SIZE)
-#define FLASH_SST_AREA_SIZE (0x2000) /* 8 KB */
+#define FLASH_PS_AREA_SIZE (0x2000) /* 8 KB */
/* Internal Trusted Storage (ITS) Service definitions */
-#define FLASH_ITS_AREA_OFFSET (FLASH_SST_AREA_OFFSET + \
- FLASH_SST_AREA_SIZE)
+#define FLASH_ITS_AREA_OFFSET (FLASH_PS_AREA_OFFSET + \
+ FLASH_PS_AREA_SIZE)
#define FLASH_ITS_AREA_SIZE (0x2000) /* 8 KB */
/* NV Counters definitions */
@@ -173,27 +173,27 @@
*/
#define FLASH_DEV_NAME Driver_FLASH0
-/* Secure Storage (SST) Service definitions
+/* Protected Storage (PS) Service definitions
* Note: Further documentation of these definitions can be found in the
- * TF-M SST Integration Guide.
+ * TF-M PS Integration Guide.
*/
-#define SST_FLASH_DEV_NAME Driver_FLASH0
+#define PS_FLASH_DEV_NAME Driver_FLASH0
/* In this target the CMSIS driver requires only the offset from the base
* address instead of the full memory address.
*/
-#define SST_FLASH_AREA_ADDR FLASH_SST_AREA_OFFSET
-/* Dedicated flash area for SST */
-#define SST_FLASH_AREA_SIZE FLASH_SST_AREA_SIZE
-#define SST_SECTOR_SIZE FLASH_AREA_IMAGE_SECTOR_SIZE
-/* Number of SST_SECTOR_SIZE per block */
-#define SST_SECTORS_PER_BLOCK (0x1)
+#define PS_FLASH_AREA_ADDR FLASH_PS_AREA_OFFSET
+/* Dedicated flash area for PS */
+#define PS_FLASH_AREA_SIZE FLASH_PS_AREA_SIZE
+#define PS_SECTOR_SIZE FLASH_AREA_IMAGE_SECTOR_SIZE
+/* Number of PS_SECTOR_SIZE per block */
+#define PS_SECTORS_PER_BLOCK (0x1)
/* Specifies the smallest flash programmable unit in bytes */
-#define SST_FLASH_PROGRAM_UNIT (0x1)
-/* The maximum asset size to be stored in the SST area */
-#define SST_MAX_ASSET_SIZE (512)
-/* The maximum number of assets to be stored in the SST area */
-#define SST_NUM_ASSETS (10)
+#define PS_FLASH_PROGRAM_UNIT (0x1)
+/* The maximum asset size to be stored in the PS area */
+#define PS_MAX_ASSET_SIZE (512)
+/* The maximum number of assets to be stored in the PS area */
+#define PS_NUM_ASSETS (10)
/* Internal Trusted Storage (ITS) Service definitions
* Note: Further documentation of these definitions can be found in the
diff --git a/platform/ext/target/musca_b1/partition/flash_layout.h b/platform/ext/target/musca_b1/partition/flash_layout.h
index cca4a7f..0a6b3cc 100644
--- a/platform/ext/target/musca_b1/partition/flash_layout.h
+++ b/platform/ext/target/musca_b1/partition/flash_layout.h
@@ -51,7 +51,7 @@
* 0x0A07_0000 Non-secure image
*
* QSPI Flash layout
- * 0x0000_0000 Secure Storage Area (20 KB)
+ * 0x0000_0000 Protected Storage Area (20 KB)
*/
/* This header file is included from linker scatter file as well, where only a
@@ -161,38 +161,38 @@
SECURE_IMAGE_MAX_SIZE)
#define NON_SECURE_IMAGE_MAX_SIZE FLASH_NS_PARTITION_SIZE
-/* Secure Storage (SST) Service definitions size is 20 KB. */
+/* Protected Storage (PS) Service definitions size is 20 KB. */
/* Same as MUSCA_B1_QSPI_FLASH_S_BASE */
#define QSPI_FLASH_BASE_ADDRESS (0x10000000)
-#define FLASH_SST_AREA_OFFSET (0x0)
-#define FLASH_SST_AREA_SIZE (5 * QSPI_FLASH_AREA_IMAGE_SECTOR_SIZE)
+#define FLASH_PS_AREA_OFFSET (0x0)
+#define FLASH_PS_AREA_SIZE (5 * QSPI_FLASH_AREA_IMAGE_SECTOR_SIZE)
/* Flash device name used by BL2
* Name is defined in flash driver file: Driver_Flash.c
*/
#define FLASH_DEV_NAME Driver_EFLASH0
-/* Secure Storage (SST) Service definitions
+/* Protected Storage (PS) Service definitions
* Note: Further documentation of these definitions can be found in the
- * TF-M SST Integration Guide.
+ * TF-M PS Integration Guide.
*/
-#define SST_FLASH_DEV_NAME Driver_QSPI_FLASH0
+#define PS_FLASH_DEV_NAME Driver_QSPI_FLASH0
/* In this target the CMSIS driver requires only the offset from the base
* address instead of the full memory address.
*/
-#define SST_FLASH_AREA_ADDR FLASH_SST_AREA_OFFSET
-/* Dedicated flash area for SST */
-#define SST_FLASH_AREA_SIZE FLASH_SST_AREA_SIZE
-#define SST_SECTOR_SIZE QSPI_FLASH_AREA_IMAGE_SECTOR_SIZE
-/* Number of SST_SECTOR_SIZE per block */
-#define SST_SECTORS_PER_BLOCK (0x1)
+#define PS_FLASH_AREA_ADDR FLASH_PS_AREA_OFFSET
+/* Dedicated flash area for PS */
+#define PS_FLASH_AREA_SIZE FLASH_PS_AREA_SIZE
+#define PS_SECTOR_SIZE QSPI_FLASH_AREA_IMAGE_SECTOR_SIZE
+/* Number of PS_SECTOR_SIZE per block */
+#define PS_SECTORS_PER_BLOCK (0x1)
/* Specifies the smallest flash programmable unit in bytes */
-#define SST_FLASH_PROGRAM_UNIT (0x1)
-/* The maximum asset size to be stored in the SST area */
-#define SST_MAX_ASSET_SIZE (2048)
-/* The maximum number of assets to be stored in the SST area */
-#define SST_NUM_ASSETS (10)
+#define PS_FLASH_PROGRAM_UNIT (0x1)
+/* The maximum asset size to be stored in the PS area */
+#define PS_MAX_ASSET_SIZE (2048)
+/* The maximum number of assets to be stored in the PS area */
+#define PS_NUM_ASSETS (10)
/* Internal Trusted Storage (ITS) Service definitions
* Note: Further documentation of these definitions can be found in the
diff --git a/platform/ext/target/musca_s1/partition/flash_layout.h b/platform/ext/target/musca_s1/partition/flash_layout.h
index 983fce5..cfc5f17 100644
--- a/platform/ext/target/musca_s1/partition/flash_layout.h
+++ b/platform/ext/target/musca_s1/partition/flash_layout.h
@@ -24,7 +24,7 @@
* 0x0A0F_0000 Secure image secondary (320 KB)
* 0x0A14_0000 Non-secure image secondary (512 KB)
* 0x0A1C_0000 Scratch Area (16 KB)
- * 0x0A1C_4000 Secure Storage Area (20 KB)
+ * 0x0A1C_4000 Protected Storage Area (20 KB)
* 0x0A1C_9000 Internal Trusted Storage Area (16 KB)
* 0x0A1C_D000 NV counters area (4 KB)
* 0x0A1C_E000 Unused
@@ -37,7 +37,7 @@
* 0x0A10_0000 Secondary image area (896 KB):
* 0x0A10_0000 Secure image secondary (384 KB)
* 0x0A16_0000 Non-secure image secondary (512 KB)
- * 0x0A1E_0000 Secure Storage Area (20 KB)
+ * 0x0A1E_0000 Protected Storage Area (20 KB)
* 0x0A1E_5000 Internal Trusted Storage Area (16 KB)
* 0x0A1E_9000 NV counters area (4 KB)
* 0x0A1E_A000 TF-M key area (256 bytes) This area is referred to in
@@ -135,17 +135,17 @@
#error "Only MCUBOOT_IMAGE_NUMBER 1 and 2 are supported!"
#endif /* MCUBOOT_IMAGE_NUMBER */
-/* Note: FLASH_SST_AREA_OFFSET, FLASH_ITS_AREA_OFFSET and
+/* Note: FLASH_PS_AREA_OFFSET, FLASH_ITS_AREA_OFFSET and
* FLASH_NV_COUNTERS_AREA_OFFSET point to offsets in flash, but reads and writes
* to these addresses are redirected to Code SRAM by Driver_Flash.c.
*/
-#define FLASH_SST_AREA_OFFSET (FLASH_AREA_SCRATCH_OFFSET + \
+#define FLASH_PS_AREA_OFFSET (FLASH_AREA_SCRATCH_OFFSET + \
FLASH_AREA_SCRATCH_SIZE)
-#define FLASH_SST_AREA_SIZE (0x5000) /* 20 KB */
+#define FLASH_PS_AREA_SIZE (0x5000) /* 20 KB */
/* Internal Trusted Storage (ITS) Service definitions */
-#define FLASH_ITS_AREA_OFFSET (FLASH_SST_AREA_OFFSET + \
- FLASH_SST_AREA_SIZE)
+#define FLASH_ITS_AREA_OFFSET (FLASH_PS_AREA_OFFSET + \
+ FLASH_PS_AREA_SIZE)
#define FLASH_ITS_AREA_SIZE (0x4000) /* 16 KB */
/* NV Counters definitions */
@@ -171,27 +171,27 @@
*/
#define FLASH_DEV_NAME Driver_FLASH0
-/* Secure Storage (SST) Service definitions
+/* Protected Storage (PS) Service definitions
* Note: Further documentation of these definitions can be found in the
- * TF-M SST Integration Guide.
+ * TF-M PS Integration Guide.
*/
-#define SST_FLASH_DEV_NAME Driver_FLASH0
+#define PS_FLASH_DEV_NAME Driver_FLASH0
/* In this target the CMSIS driver requires only the offset from the base
* address instead of the full memory address.
*/
-#define SST_FLASH_AREA_ADDR FLASH_SST_AREA_OFFSET
-/* Dedicated flash area for SST */
-#define SST_FLASH_AREA_SIZE FLASH_SST_AREA_SIZE
-#define SST_SECTOR_SIZE FLASH_AREA_IMAGE_SECTOR_SIZE
-/* Number of SST_SECTOR_SIZE per block */
-#define SST_SECTORS_PER_BLOCK (0x1)
+#define PS_FLASH_AREA_ADDR FLASH_PS_AREA_OFFSET
+/* Dedicated flash area for PS */
+#define PS_FLASH_AREA_SIZE FLASH_PS_AREA_SIZE
+#define PS_SECTOR_SIZE FLASH_AREA_IMAGE_SECTOR_SIZE
+/* Number of PS_SECTOR_SIZE per block */
+#define PS_SECTORS_PER_BLOCK (0x1)
/* Specifies the smallest flash programmable unit in bytes */
-#define SST_FLASH_PROGRAM_UNIT (0x1)
-/* The maximum asset size to be stored in the SST area */
-#define SST_MAX_ASSET_SIZE (2048)
-/* The maximum number of assets to be stored in the SST area */
-#define SST_NUM_ASSETS (10)
+#define PS_FLASH_PROGRAM_UNIT (0x1)
+/* The maximum asset size to be stored in the PS area */
+#define PS_MAX_ASSET_SIZE (2048)
+/* The maximum number of assets to be stored in the PS area */
+#define PS_NUM_ASSETS (10)
/* Internal Trusted Storage (ITS) Service definitions
* Note: Further documentation of these definitions can be found in the
diff --git a/platform/ext/target/nxp/lpcxpresso55s69/partition/flash_layout.h b/platform/ext/target/nxp/lpcxpresso55s69/partition/flash_layout.h
index 06da27b..acee769 100755
--- a/platform/ext/target/nxp/lpcxpresso55s69/partition/flash_layout.h
+++ b/platform/ext/target/nxp/lpcxpresso55s69/partition/flash_layout.h
@@ -23,7 +23,7 @@
* 0x0000_0000 Secure image primary
* 0x0005_0000 Non-secure image primary
* 0x0009_0000 Secondary image area (0 KB):
- * 0x0009_0000 Secure Storage Area (16 KB)
+ * 0x0009_0000 Protected Storage Area (16 KB)
* 0x0009_4000 Internal Trusted Storage Area (8 KB)
* 0x0009_6000 NV counters area (512 B)
* 0x0006_6200 Unused
@@ -133,17 +133,17 @@
#define FLASH_AREA_SCRATCH_SIZE (0)
#endif /* BL2 */
-/* Note: FLASH_SST_AREA_OFFSET, FLASH_ITS_AREA_OFFSET and
+/* Note: FLASH_PS_AREA_OFFSET, FLASH_ITS_AREA_OFFSET and
* FLASH_NV_COUNTERS_AREA_OFFSET point to offsets in flash, but reads and writes
* to these addresses are redirected to Code SRAM by Driver_Flash.c.
*/
-#define FLASH_SST_AREA_OFFSET (FLASH_AREA_SCRATCH_OFFSET + \
+#define FLASH_PS_AREA_OFFSET (FLASH_AREA_SCRATCH_OFFSET + \
FLASH_AREA_SCRATCH_SIZE)
-#define FLASH_SST_AREA_SIZE (0x2000) /* 8 KB */
+#define FLASH_PS_AREA_SIZE (0x2000) /* 8 KB */
/* Internal Trusted Storage (ITS) Service definitions */
-#define FLASH_ITS_AREA_OFFSET (FLASH_SST_AREA_OFFSET + \
- FLASH_SST_AREA_SIZE)
+#define FLASH_ITS_AREA_OFFSET (FLASH_PS_AREA_OFFSET + \
+ FLASH_PS_AREA_SIZE)
#define FLASH_ITS_AREA_SIZE (0x800) /* 2 KB */
/* NV Counters definitions */
@@ -164,28 +164,28 @@
*/
#define FLASH_DEV_NAME Driver_FLASH0
-/* Secure Storage (SST) Service definitions
+/* Protected Storage (PS) Service definitions
* Note: Further documentation of these definitions can be found in the
- * TF-M SST Integration Guide.
+ * TF-M PS Integration Guide.
*/
-#define SST_FLASH_DEV_NAME Driver_FLASH0
+#define PS_FLASH_DEV_NAME Driver_FLASH0
/* In this target the CMSIS driver requires only the offset from the base
* address instead of the full memory address.
*/
-#define SST_FLASH_AREA_ADDR FLASH_SST_AREA_OFFSET
-/* Dedicated flash area for SST */
-#define SST_FLASH_AREA_SIZE FLASH_SST_AREA_SIZE
-#define SST_SECTOR_SIZE FLASH_AREA_IMAGE_SECTOR_SIZE
-/* Number of SST_SECTOR_SIZE per block */
-#define SST_SECTORS_PER_BLOCK (0x8)
+#define PS_FLASH_AREA_ADDR FLASH_PS_AREA_OFFSET
+/* Dedicated flash area for PS */
+#define PS_FLASH_AREA_SIZE FLASH_PS_AREA_SIZE
+#define PS_SECTOR_SIZE FLASH_AREA_IMAGE_SECTOR_SIZE
+/* Number of PS_SECTOR_SIZE per block */
+#define PS_SECTORS_PER_BLOCK (0x8)
/* Specifies the smallest flash programmable unit in bytes */
-#define SST_FLASH_PROGRAM_UNIT FLASH_AREA_IMAGE_SECTOR_SIZE
+#define PS_FLASH_PROGRAM_UNIT FLASH_AREA_IMAGE_SECTOR_SIZE
-/* The maximum asset size to be stored in the SST area */
-#define SST_MAX_ASSET_SIZE (2048)
-/* The maximum number of assets to be stored in the SST area */
-#define SST_NUM_ASSETS (5)
+/* The maximum asset size to be stored in the PS area */
+#define PS_MAX_ASSET_SIZE (2048)
+/* The maximum number of assets to be stored in the PS area */
+#define PS_NUM_ASSETS (5)
/* Internal Trusted Storage (ITS) Service definitions
* Note: Further documentation of these definitions can be found in the
diff --git a/platform/ext/target/sse-200_aws/partition/flash_layout.h b/platform/ext/target/sse-200_aws/partition/flash_layout.h
index d963dd2..d2fb3a4 100644
--- a/platform/ext/target/sse-200_aws/partition/flash_layout.h
+++ b/platform/ext/target/sse-200_aws/partition/flash_layout.h
@@ -25,7 +25,7 @@
* 0x0018_0000 Secure image secondary slot (0.5 MB)
* 0x0020_0000 Non-secure image secondary slot (0.5 MB)
* 0x0028_0000 Scratch area (0.5 MB)
- * 0x0030_0000 Secure Storage Area (20 KB)
+ * 0x0030_0000 Protected Storage Area (20 KB)
* 0x0030_5000 Internal Trusted Storage Area (16 KB)
* 0x0030_9000 NV counters area (4 KB)
* 0x0030_A000 Unused (984 KB)
@@ -40,7 +40,7 @@
* 0x0018_0000 Secure image secondary
* 0x0020_0000 Non-secure image secondary
* 0x0028_0000 Scratch area (1 MB)
- * 0x0038_0000 Secure Storage Area (20 KB)
+ * 0x0038_0000 Protected Storage Area (20 KB)
* 0x0038_5000 Internal Trusted Storage Area (16 KB)
* 0x0038_9000 NV counters area (4 KB)
* 0x0038_A000 Unused (472 KB)
@@ -138,14 +138,14 @@
#error "Only MCUBOOT_IMAGE_NUMBER 1 and 2 are supported!"
#endif /* MCUBOOT_IMAGE_NUMBER */
-/* Secure Storage (SST) Service definitions */
-#define FLASH_SST_AREA_OFFSET (FLASH_AREA_SCRATCH_OFFSET + \
+/* Protected Storage (PS) Service definitions */
+#define FLASH_PS_AREA_OFFSET (FLASH_AREA_SCRATCH_OFFSET + \
FLASH_AREA_SCRATCH_SIZE)
-#define FLASH_SST_AREA_SIZE (0x5000) /* 20 KB */
+#define FLASH_PS_AREA_SIZE (0x5000) /* 20 KB */
/* Internal Trusted Storage (ITS) Service definitions */
-#define FLASH_ITS_AREA_OFFSET (FLASH_SST_AREA_OFFSET + \
- FLASH_SST_AREA_SIZE)
+#define FLASH_ITS_AREA_OFFSET (FLASH_PS_AREA_OFFSET + \
+ FLASH_PS_AREA_SIZE)
#define FLASH_ITS_AREA_SIZE (0x4000) /* 16 KB */
/* NV Counters definitions */
@@ -166,27 +166,27 @@
*/
#define FLASH_DEV_NAME Driver_FLASH0
-/* Secure Storage (SST) Service definitions
+/* Protected Storage (PS) Service definitions
* Note: Further documentation of these definitions can be found in the
- * TF-M SST Integration Guide.
+ * TF-M PS Integration Guide.
*/
-#define SST_FLASH_DEV_NAME Driver_FLASH0
+#define PS_FLASH_DEV_NAME Driver_FLASH0
/* In this target the CMSIS driver requires only the offset from the base
* address instead of the full memory address.
*/
-#define SST_FLASH_AREA_ADDR FLASH_SST_AREA_OFFSET
-/* Dedicated flash area for SST */
-#define SST_FLASH_AREA_SIZE FLASH_SST_AREA_SIZE
-#define SST_SECTOR_SIZE FLASH_AREA_IMAGE_SECTOR_SIZE
-/* Number of SST_SECTOR_SIZE per block */
-#define SST_SECTORS_PER_BLOCK (0x1)
+#define PS_FLASH_AREA_ADDR FLASH_PS_AREA_OFFSET
+/* Dedicated flash area for PS */
+#define PS_FLASH_AREA_SIZE FLASH_PS_AREA_SIZE
+#define PS_SECTOR_SIZE FLASH_AREA_IMAGE_SECTOR_SIZE
+/* Number of PS_SECTOR_SIZE per block */
+#define PS_SECTORS_PER_BLOCK (0x1)
/* Specifies the smallest flash programmable unit in bytes */
-#define SST_FLASH_PROGRAM_UNIT (0x1)
-/* The maximum asset size to be stored in the SST area */
-#define SST_MAX_ASSET_SIZE (2048)
-/* The maximum number of assets to be stored in the SST area */
-#define SST_NUM_ASSETS (10)
+#define PS_FLASH_PROGRAM_UNIT (0x1)
+/* The maximum asset size to be stored in the PS area */
+#define PS_MAX_ASSET_SIZE (2048)
+/* The maximum number of assets to be stored in the PS area */
+#define PS_NUM_ASSETS (10)
/* Internal Trusted Storage (ITS) Service definitions
* Note: Further documentation of these definitions can be found in the
diff --git a/platform/include/tfm_plat_nv_counters.h b/platform/include/tfm_plat_nv_counters.h
index 3588929..cff9972 100644
--- a/platform/include/tfm_plat_nv_counters.h
+++ b/platform/include/tfm_plat_nv_counters.h
@@ -27,9 +27,9 @@
#include "tfm_plat_defs.h"
enum tfm_nv_counter_t {
- PLAT_NV_COUNTER_0 = 0, /* Used by SST service */
- PLAT_NV_COUNTER_1, /* Used by SST service */
- PLAT_NV_COUNTER_2, /* Used by SST service */
+ PLAT_NV_COUNTER_0 = 0, /* Used by PS service */
+ PLAT_NV_COUNTER_1, /* Used by PS service */
+ PLAT_NV_COUNTER_2, /* Used by PS service */
#ifdef BL2
PLAT_NV_COUNTER_3, /* Used by bootloader */
PLAT_NV_COUNTER_4, /* Used by bootloader */