Platform: Extend S binary slot on Musca-B1
To accommodate bigger secure binaries. Secure code with
integrated CC312 runtime library did not fit in the
original slot.
Change-Id: I08baf0528e574ed3277c85d1094b3d003918ae97
Signed-off-by: Tamas Ban <tamas.ban@arm.com>
diff --git a/docs/user_guides/tfm_secure_boot.rst b/docs/user_guides/tfm_secure_boot.rst
index 497654b..4adc1e6 100644
--- a/docs/user_guides/tfm_secure_boot.rst
+++ b/docs/user_guides/tfm_secure_boot.rst
@@ -667,11 +667,11 @@
- Linux::
- srec_cat bl2/ext/mcuboot/mcuboot.bin -Binary -offset 0xA000000 tfm_sign.bin -Binary -offset 0xA020000 tfm_sign_1.bin -Binary -offset 0xA0F0000 -o tfm.hex -Intel
+ srec_cat bl2/ext/mcuboot/mcuboot.bin -Binary -offset 0xA000000 tfm_sign.bin -Binary -offset 0xA020000 tfm_sign_1.bin -Binary -offset 0xA100000 -o tfm.hex -Intel
- Windows::
- srec_cat.exe bl2\ext\mcuboot\mcuboot.bin -Binary -offset 0xA000000 tfm_sign.bin -Binary -offset 0xA020000 tfm_sign_1.bin -Binary -offset 0xA0F0000 -o tfm.hex -Intel
+ srec_cat.exe bl2\ext\mcuboot\mcuboot.bin -Binary -offset 0xA000000 tfm_sign.bin -Binary -offset 0xA020000 tfm_sign_1.bin -Binary -offset 0xA100000 -o tfm.hex -Intel
The following message will be shown in case of successful firmware upgrade,
notice that image with higher version number (``version=1.2.3.5``) is executed:
diff --git a/platform/ext/target/musca_b1/partition/flash_layout.h b/platform/ext/target/musca_b1/partition/flash_layout.h
index eafc58b..ede8d0f 100644
--- a/platform/ext/target/musca_b1/partition/flash_layout.h
+++ b/platform/ext/target/musca_b1/partition/flash_layout.h
@@ -20,16 +20,16 @@
/* Flash layout on Musca-B1 with BL2(single image boot, boot from eFlash 0):
*
* 0x0A00_0000 BL2 - MCUBoot (128 KB)
- * 0x0A02_0000 Primary image area (832 KB):
- * 0x0A02_0000 Secure image primary (320 KB)
- * 0x0A07_0000 Non-secure image primary (512 KB)
- * 0x0A0F_0000 Secondary image area (832 KB):
- * 0x0A0F_0000 Secure image secondary (320 KB)
- * 0x0A14_0000 Non-secure image secondary (512 KB)
- * 0x0A1C_0000 Secure Storage Area (20 KB)
- * 0x0A1C_5000 Internal Trusted Storage Area (16 KB)
- * 0x0A1C_9000 NV counters area (4 KB)
- * 0x0A1C_A000 Unused
+ * 0x0A02_0000 Primary image area (896 KB):
+ * 0x0A02_0000 Secure image primary (384 KB)
+ * 0x0A08_0000 Non-secure image primary (512 KB)
+ * 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_5000 Internal Trusted Storage Area (16 KB)
+ * 0x0A1E_9000 NV counters area (4 KB)
+ * 0x0A1E_A000 Unused
*
* Flash layout on Musca-B1 without BL2:
* 0x0A00_0000 Secure image
@@ -44,7 +44,7 @@
*/
/* Size of a Secure and of a Non-secure image */
-#define FLASH_S_PARTITION_SIZE (0x50000) /* S partition: 320 KB */
+#define FLASH_S_PARTITION_SIZE (0x60000) /* S partition: 384 KB */
#define FLASH_NS_PARTITION_SIZE (0x80000) /* NS partition: 512 KB */
#define FLASH_MAX_PARTITION_SIZE ((FLASH_S_PARTITION_SIZE > \
FLASH_NS_PARTITION_SIZE) ? \