aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBalint Matyi <Balint.Matyi@arm.com>2020-07-03 12:54:09 +0100
committerTamas Ban <tamas.ban@arm.com>2020-07-03 12:48:56 +0000
commitaacfe93b15e5a7ee51d54ef47e6dd1dfe9c65d27 (patch)
treeaf417bb0be4cb2d9219509cd300f74380c340c1c
parent857003267d5eec361bc4f338af0fc92864c99705 (diff)
downloadtrusted-firmware-m-aacfe93b15e5a7ee51d54ef47e6dd1dfe9c65d27.tar.gz
Platform: Fix MRAM crypto key area in Musca-S1TF-Mv1.1-RC2
Due to an unupdated comment in an earlier commit, the address of the crypto key area in the Musca-S1's MRAM was miscalculated. This patch updates the comment and the platform dependent define in the CC312 runtime. Signed-off-by: Balint Matyi <Balint.Matyi@arm.com> Change-Id: I6bcc42a44dd7d54a846d4794a70cd519330067ec
-rw-r--r--lib/ext/cryptocell-312-runtime/shared/hw/include/musca_s1/dx_reg_base_host.h2
-rw-r--r--platform/ext/target/musca_s1/partition/flash_layout.h32
2 files changed, 19 insertions, 15 deletions
diff --git a/lib/ext/cryptocell-312-runtime/shared/hw/include/musca_s1/dx_reg_base_host.h b/lib/ext/cryptocell-312-runtime/shared/hw/include/musca_s1/dx_reg_base_host.h
index 7d26ebb9a..41a121176 100644
--- a/lib/ext/cryptocell-312-runtime/shared/hw/include/musca_s1/dx_reg_base_host.h
+++ b/lib/ext/cryptocell-312-runtime/shared/hw/include/musca_s1/dx_reg_base_host.h
@@ -18,7 +18,7 @@
* Same as FLASH_TFM_CRYPTO_KEY_AREA as found in
* platform/ext/target/musca_s1/partition/flash_layout.h
*/
-#define DX_MRAM_CC 0x1A1EA000
+#define DX_MRAM_CC 0x1A1EE000
#define DX_BASE_ENV_REGS 0x500A0000 //TODO need confirm
diff --git a/platform/ext/target/musca_s1/partition/flash_layout.h b/platform/ext/target/musca_s1/partition/flash_layout.h
index cfc5f17b1..ea0d3b19a 100644
--- a/platform/ext/target/musca_s1/partition/flash_layout.h
+++ b/platform/ext/target/musca_s1/partition/flash_layout.h
@@ -19,15 +19,18 @@
/* Flash layout on Musca-S1 with BL2(multiple image boot, boot from MRAM):
* 0x0A00_0000 BL2 - MCUBoot(128 KB)
- * 0x0A02_0000 Secure image primary (320 KB)
- * 0x0A07_0000 Non-secure image primary (512 KB)
- * 0x0A0F_0000 Secure image secondary (320 KB)
- * 0x0A14_0000 Non-secure image secondary (512 KB)
- * 0x0A1C_0000 Scratch Area (16 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
+ * 0x0A02_0000 Secure image primary (384 KB)
+ * 0x0A08_0000 Non-secure image primary (512 KB)
+ * 0x0A10_0000 Secure image secondary (384 KB)
+ * 0x0A16_0000 Non-secure image secondary (512 KB)
+ * 0x0A1E_0000 Scratch Area (16 KB)
+ * 0x0A1E_4000 Protected Storage Area (20 KB)
+ * 0x0A1E_9000 Internal Trusted Storage Area (16 KB)
+ * 0x0A1E_D000 NV counters area (4 KB)
+ * 0x0A1E_E000 TF-M key area (256 bytes) This area is referred to in
+ * /lib/ext/cryptocell-312-runtime/shared/hw/include/musca_s1/ \
+ * dx_reg_base_host.h Do not change one without changing the other.
+ * 0x0A1E_E100 Unused
*
* Flash layout on Musca-S1 with BL2(single image boot):
* 0x0A00_0000 BL2 - MCUBoot(128 KB)
@@ -37,13 +40,14 @@
* 0x0A10_0000 Secondary image area (896 KB):
* 0x0A10_0000 Secure image secondary (384 KB)
* 0x0A16_0000 Non-secure image secondary (512 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
+ * 0x0A1E_0000 Scratch Area (16 KB)
+ * 0x0A1E_4000 Protected Storage Area (20 KB)
+ * 0x0A1E_9000 Internal Trusted Storage Area (16 KB)
+ * 0x0A1E_D000 NV counters area (4 KB)
+ * 0x0A1E_E000 TF-M key area (256 bytes) This area is referred to in
* /lib/ext/cryptocell-312-runtime/shared/hw/include/musca_s1/ \
* dx_reg_base_host.h Do not change one without changing the other.
- * 0x0A1E_A100 Unused
+ * 0x0A1E_E100 Unused
*
* Flash layout on Musca-S1 without BL2:
* 0x0A00_0000 Secure image