boards: arm: mps2: Fix NS flash layout

The mps2/an521/cpu0/ns define flash layouts in tf-m to allow
CONFIG_TFM_MCUBOOT_IMAGE_NUMBER be 1 or 2. In the Zephyr project when
building the samples the value selected is 2.

The layout changes are necessary to allow use the --max-sectors options
when signing the images. It ensures that flash layout is respected. To
allow this the compatible "soc-nv-flash" was added in the reserved
memory and the fixed-partitions were defined.

Signed-off-by: BUDKE Gerson Fernando <[email protected]>

Author: nandojve

boards/arm/mps2/Kconfig.defconfig

@@ -46,6 +46,10 @@ choice NULL_POINTER_EXCEPTION_DETECTION
 
 endchoice
 
+# Get flash configuration for NS image from dts flash partition
+config USE_DT_CODE_PARTITION
+	default y if TRUSTED_EXECUTION_NONSECURE
+
 # By default, if we build for a Non-Secure version of the board,
 # force building with TF-M as the Secure Execution Environment.
 config BUILD_WITH_TFM

boards/arm/mps2/mps2_an521_cpu0_ns.dts

@@ -29,7 +29,8 @@
 		zephyr,console = &uart0;
 		zephyr,shell-uart = &uart0;
 		zephyr,sram = &ram;
-		zephyr,flash = &code;
+		zephyr,flash = &reserved_memory;
+		zephyr,code-partition = &slot0_ns_partition;
 	};
 
 	leds {
@@ -107,19 +108,49 @@
 		reg = <0x80000000 DT_SIZE_M(16)>;
 	};
 
-	reserved-memory {
+	reserved_memory: reserved-memory@0 {
+		compatible = "soc-nv-flash";
+		reg = <0x0 DT_SIZE_M(4)>;
+		erase-block-size = <4096>;
+		write-block-size = <4>;
 		#address-cells = <1>;
 		#size-cells = <1>;
-		ranges;
 
-		/* This code memory region must match what the TF-M
-		 * project has defined for that board - a single image boot is
-		 * assumed. Please see the memory layout in:
-		 *
-		 * https://github.com/zephyrproject-rtos/trusted-firmware-m/blob/master/platform/ext/target/arm/mps2/an521/partition/flash_layout.h
-		 */
-		code: memory@100000 {
-			reg = <0x00100000 DT_SIZE_K(512)>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			/* This code memory region must match what the TF-M
+			 * project has defined for that board - the milti-image
+			 * boot is used in Zephyr. See memory layout details in:
+			 *
+			 * https://github.com/zephyrproject-rtos/trusted-firmware-m/blob/master/platform/ext/target/arm/mps2/an521/partition/flash_layout.h
+			 */
+			boot_partition: partition@0 {
+				reg = <0x00000000 DT_SIZE_K(512)>;
+				read-only;
+			};
+
+			slot0_partition: partition@80000 {
+				reg = <0x00080000 DT_SIZE_K(512)>;
+			};
+
+			slot0_ns_partition: partition@100000 {
+				reg = <0x00100000 DT_SIZE_K(512)>;
+			};
+
+			slot1_partition: partition@180000 {
+				reg = <0x00180000 DT_SIZE_K(512)>;
+			};
+
+			slot1_ns_partition: partition@200000 {
+				reg = <0x00200000 DT_SIZE_K(512)>;
+			};
+
+			scratch_partition: partition@280000 {
+				reg = <0x00280000 DT_SIZE_K(512)>;
+			};
 		};
 
 		/* This ram memory region's size is chosen to avoid conflict