Platform: Correct ITS flash layout
Corrects the documentation for the ITS flash layout, and fixes a
definition for AN539 to use the ITS area size instead of offset.
Change-Id: I567adeffc660f767d725d8d939d8c38507471185
Signed-off-by: Jamie Fox <jamie.fox@arm.com>
diff --git a/platform/ext/target/mps2/an519/partition/flash_layout.h b/platform/ext/target/mps2/an519/partition/flash_layout.h
index 5725e51..14974de 100644
--- a/platform/ext/target/mps2/an519/partition/flash_layout.h
+++ b/platform/ext/target/mps2/an519/partition/flash_layout.h
@@ -25,10 +25,10 @@
* 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 (0.02 MB)
- * 0x0030_5000 Internal Trusted Storage Area (0.02 MB)
- * 0x0030_A000 NV counters area (4 KB)
- * 0x0030_B000 Unused (980 KB)
+ * 0x0030_0000 Secure Storage Area (20 KB)
+ * 0x0030_5000 Internal Trusted Storage Area (16 KB)
+ * 0x0030_9000 NV counters area (4 KB)
+ * 0x0030_A000 Unused (984 KB)
*
* Flash layout on MPS2 AN519 with BL2 (single image boot):
*
@@ -40,10 +40,10 @@
* 0x0018_0000 Secure image secondary
* 0x0020_0000 Non-secure image secondary
* 0x0028_0000 Scratch area (1 MB)
- * 0x0038_0000 Secure Storage Area (0.02 MB)
- * 0x0038_5000 Internal Trusted Storage Area (0.02 MB)
- * 0x0038_A000 NV counters area (4 KB)
- * 0x0038_B000 Unused (468 KB)
+ * 0x0038_0000 Secure Storage Area (20 KB)
+ * 0x0038_5000 Internal Trusted Storage Area (16 KB)
+ * 0x0038_9000 NV counters area (4 KB)
+ * 0x0038_A000 Unused (472 KB)
*
* Flash layout on MPS2 AN519, if BL2 not defined:
*
diff --git a/platform/ext/target/mps2/an521/partition/flash_layout.h b/platform/ext/target/mps2/an521/partition/flash_layout.h
index 4a6ba7a..d6c051b 100644
--- a/platform/ext/target/mps2/an521/partition/flash_layout.h
+++ b/platform/ext/target/mps2/an521/partition/flash_layout.h
@@ -25,10 +25,10 @@
* 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 (0.02 MB)
- * 0x0030_5000 Internal Trusted Storage Area (0.02 MB)
- * 0x0030_A000 NV counters area (4 KB)
- * 0x0030_B000 Unused (980 KB)
+ * 0x0030_0000 Secure Storage Area (20 KB)
+ * 0x0030_5000 Internal Trusted Storage Area (16 KB)
+ * 0x0030_9000 NV counters area (4 KB)
+ * 0x0030_A000 Unused (984 KB)
*
* Flash layout on MPS2 AN521 with BL2 (single image boot):
*
@@ -40,10 +40,10 @@
* 0x0018_0000 Secure image secondary
* 0x0020_0000 Non-secure image secondary
* 0x0028_0000 Scratch area (1 MB)
- * 0x0038_0000 Secure Storage Area (0.02 MB)
- * 0x0038_5000 Internal Trusted Storage Area (0.02 MB)
- * 0x0038_A000 NV counters area (4 KB)
- * 0x0038_B000 Unused (468 MB)
+ * 0x0038_0000 Secure Storage Area (20 KB)
+ * 0x0038_5000 Internal Trusted Storage Area (16 KB)
+ * 0x0038_9000 NV counters area (4 KB)
+ * 0x0038_A000 Unused (472 KB)
*
* Flash layout on MPS2 AN521, if BL2 not defined:
*
diff --git a/platform/ext/target/mps2/an539/partition/flash_layout.h b/platform/ext/target/mps2/an539/partition/flash_layout.h
index c56174b..4ba73fb 100644
--- a/platform/ext/target/mps2/an539/partition/flash_layout.h
+++ b/platform/ext/target/mps2/an539/partition/flash_layout.h
@@ -25,10 +25,10 @@
* 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 (0.02 MB)
- * 0x0030_5000 Internal Trusted Storage Area (0.02 MB)
- * 0x0030_A000 NV counters area (4 KB)
- * 0x0030_B000 Unused (980 KB)
+ * 0x0030_0000 Secure Storage Area (20 KB)
+ * 0x0030_5000 Internal Trusted Storage Area (16 KB)
+ * 0x0030_9000 NV counters area (4 KB)
+ * 0x0030_A000 Unused (984 KB)
*
* Flash layout on MPS2 AN539 with BL2 (single image boot):
*
@@ -40,10 +40,10 @@
* 0x0018_0000 Secure image secondary
* 0x0020_0000 Non-secure image secondary
* 0x0028_0000 Scratch area (1 MB)
- * 0x0038_0000 Secure Storage Area (0.02 MB)
- * 0x0038_5000 Internal Trusted Storage Area (0.02 MB)
- * 0x0038_A000 NV counters area (4 KB)
- * 0x0038_B000 Unused (468 KB)
+ * 0x0038_0000 Secure Storage Area (20 KB)
+ * 0x0038_5000 Internal Trusted Storage Area (16 KB)
+ * 0x0038_9000 NV counters area (4 KB)
+ * 0x0038_A000 Unused (472 KB)
*
* Flash layout on MPS2 AN539, if BL2 not defined:
*
@@ -160,7 +160,7 @@
/* NV Counters definitions */
#define FLASH_NV_COUNTERS_AREA_OFFSET (FLASH_ITS_AREA_OFFSET + \
- FLASH_ITS_AREA_OFFSET)
+ FLASH_ITS_AREA_SIZE)
#define FLASH_NV_COUNTERS_AREA_SIZE (FLASH_AREA_IMAGE_SECTOR_SIZE)
/* Offset and size definition in flash area used by assemble.py */
diff --git a/platform/ext/target/mps3/an524/partition/flash_layout.h b/platform/ext/target/mps3/an524/partition/flash_layout.h
index c0e61c5..9107b00 100644
--- a/platform/ext/target/mps3/an524/partition/flash_layout.h
+++ b/platform/ext/target/mps3/an524/partition/flash_layout.h
@@ -34,18 +34,18 @@
* 0x0010_0000 Secure image (512 KB)
* 0x0018_0000 Non-secure image (256 KB)
* 0x001C_0000 SST area (20 KB)
- * 0x001C_5000 ITS area (20 KB)
- * 0x001C_A000 NV counters (4 KB)
- * 0x001C_B000 Unused
+ * 0x001C_5000 ITS area (16 KB)
+ * 0x001C_9000 NV counters (4 KB)
+ * 0x001C_A000 Unused
*
* Flash layout without BL2
*
* 0x0000_0000 Secure image (512 KB)
* 0x000C_0000 Non-secure image (256 KB)
* 0x001C_0000 SST area (20 KB)
- * 0x001C_5000 ITS area (20 KB)
- * 0x001C_A000 NV counters (4 KB)
- * 0x001C_B000 Unused
+ * 0x001C_5000 ITS area (16 KB)
+ * 0x001C_9000 NV counters (4 KB)
+ * 0x001C_A000 Unused
*/
/* Size of a Secure and of a Non-secure image */
diff --git a/platform/ext/target/musca_b1/partition/flash_layout.h b/platform/ext/target/musca_b1/partition/flash_layout.h
index b6e83a1..eafc58b 100644
--- a/platform/ext/target/musca_b1/partition/flash_layout.h
+++ b/platform/ext/target/musca_b1/partition/flash_layout.h
@@ -26,10 +26,10 @@
* 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 (0.02 MB)
- * 0x0A1C_5000 Internal Trusted Storage Area (0.02 MB)
- * 0x0A1C_A000 NV counters area (4 KB)
- * 0x0A1C_B000 Unused
+ * 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
*
* Flash layout on Musca-B1 without BL2:
* 0x0A00_0000 Secure image
diff --git a/platform/ext/target/musca_s1/partition/flash_layout.h b/platform/ext/target/musca_s1/partition/flash_layout.h
index 5346672..c460dbc 100644
--- a/platform/ext/target/musca_s1/partition/flash_layout.h
+++ b/platform/ext/target/musca_s1/partition/flash_layout.h
@@ -25,10 +25,10 @@
* 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 (0.02 MB)
- * 0x0A1C_5000 Internal Trusted Storage Area (0.02 MB)
- * 0x0A1C_A000 NV counters area (4 KB)
- * 0x0A1C_B000 Unused
+ * 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
*
* Flash layout on Musca-S1 without BL2:
* 0x0A00_0000 Secure image