aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSalome Thirot <salome.thirot@arm.com>2021-03-23 16:30:03 +0000
committerSalome Thirot <salome.thirot@arm.com>2021-03-30 09:24:20 +0100
commit52599dd0b1b4fc20e51da2410ff29ccefc55e68b (patch)
tree00637ac3c40b09b2c9ac8a14b1993f1940112521
parent0e366d496058435d52d77d9aa32e37782d32440d (diff)
downloadtrusted-firmware-m-52599dd0b1b4fc20e51da2410ff29ccefc55e68b.tar.gz
Platform: Move PSA IPC test data from mram to sram on Musca_s1
Having the test data in the mram causes the IPC tests to access the mram outside of the flash driver, which is not recommended and breaks the IPC test suite. The psa-arch-tests repo version had to be updated to reflect those changes. Signed-off-by: Salome Thirot <salome.thirot@arm.com> Change-Id: If64f7b1b2f0b1b0293eec846be27eec4b83cd7d4
-rw-r--r--config/config_default.cmake2
-rw-r--r--platform/ext/target/musca_s1/target_cfg.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/config/config_default.cmake b/config/config_default.cmake
index e102e17da..d2f3921eb 100644
--- a/config/config_default.cmake
+++ b/config/config_default.cmake
@@ -174,7 +174,7 @@ set(MCUBOOT_PATH "DOWNLOAD" CACHE PATH "Path to MCU
set(MCUBOOT_VERSION "v1.7.2" CACHE STRING "The version of MCUboot to use")
set(PSA_ARCH_TESTS_PATH "DOWNLOAD" CACHE PATH "Path to PSA arch tests (or DOWNLOAD to fetch automatically")
-set(PSA_ARCH_TESTS_VERSION "8644bd0" CACHE STRING "The version of PSA arch tests to use")
+set(PSA_ARCH_TESTS_VERSION "b0635d9" CACHE STRING "The version of PSA arch tests to use")
################################################################################
################################################################################
diff --git a/platform/ext/target/musca_s1/target_cfg.c b/platform/ext/target/musca_s1/target_cfg.c
index 37aa49818..b107e2531 100644
--- a/platform/ext/target/musca_s1/target_cfg.c
+++ b/platform/ext/target/musca_s1/target_cfg.c
@@ -150,12 +150,12 @@ struct platform_data_t
-1
};
-#define FF_TEST_NVMEM_REGION_START 0x0A1EE100
-#define FF_TEST_NVMEM_REGION_END 0x0A1EE4FF
-#define FF_TEST_SERVER_PARTITION_MMIO_START 0x0A1EE500
-#define FF_TEST_SERVER_PARTITION_MMIO_END 0x0A1EE600
-#define FF_TEST_DRIVER_PARTITION_MMIO_START 0x0A1EE700
-#define FF_TEST_DRIVER_PARTITION_MMIO_END 0x0A1EE800
+#define FF_TEST_NVMEM_REGION_START 0x3003F800
+#define FF_TEST_NVMEM_REGION_END 0x3003FBFF
+#define FF_TEST_SERVER_PARTITION_MMIO_START 0x3003FC00
+#define FF_TEST_SERVER_PARTITION_MMIO_END 0x3003FD00
+#define FF_TEST_DRIVER_PARTITION_MMIO_START 0x3003FE00
+#define FF_TEST_DRIVER_PARTITION_MMIO_END 0x3003FF00
struct platform_data_t
tfm_peripheral_FF_TEST_NVMEM_REGION = {