boards: arm: st: nucleo_h7s3l8: Add *-block-size properties to xspi2

Add write-block-size and erase-block-size attributes to xspi nor flash
connected to xspi2. This is needed for mcuboot to handle flash access
of the ext_flash. The changes in the node structure is taken from the
stm32h7s78_dk board.

Update zephyr,flash-controller in samples/sysbuild/with_mcuboot/boards
/nucleo_h7s3l8.overlay to have CONFIG_STM32_APP_IN_EXT_FLASH set when
direct parent of flash is not XSPI but only the parent of the flash-
controller.

Signed-off-by: Thomas Decker <[email protected]>

Author: TD-JBL

boards/st/nucleo_h7s3l8/nucleo_h7s3l8.dts

@@ -217,7 +217,7 @@
 
 	status = "okay";
 
-	mx25uw25645: xspi-nor-flash@0 {
+	ext_flash_ctrl: xspi-nor-flash@0 {
 		compatible = "st,stm32-xspi-nor";
 		reg = <0>;
 		size = <DT_SIZE_M(256)>; /* 256Mbits */
@@ -227,29 +227,40 @@
 		four-byte-opcodes;
 		status = "okay";
 
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			slot0_partition: partition@0 {
-				label = "image-0";
-				reg = <0x00000000 DT_SIZE_K(512)>;
-			};
-
-			slot1_partition: partition@80000 {
-				label = "image-1";
-				reg = <0x0080000 DT_SIZE_K(512)>;
-			};
-
-			scratch_partition: partition@100000 {
-				label = "image-scratch";
-				reg = <0x00100000 DT_SIZE_K(64)>;
-			};
-
-			storage_partition: partition@110000 {
-				label = "storage";
-				reg = <0x00110000 DT_SIZE_K(64)>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges = <0x0 0x70000000 DT_SIZE_M(32)>;
+
+		ext_flash: mx25uw25645: xspi-nor-flash@0 {
+			compatible = "soc-nv-flash";
+			reg = <0x0 DT_SIZE_M(32)>;
+			write-block-size = <1>;
+			erase-block-size = <DT_SIZE_K(4)>;
+
+			partitions {
+				compatible = "fixed-partitions";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				slot0_partition: partition@0 {
+					label = "image-0";
+					reg = <0x00000000 DT_SIZE_K(512)>;
+				};
+
+				slot1_partition: partition@80000 {
+					label = "image-1";
+					reg = <0x0080000 DT_SIZE_K(512)>;
+				};
+
+				scratch_partition: partition@100000 {
+					label = "image-scratch";
+					reg = <0x00100000 DT_SIZE_K(64)>;
+				};
+
+				storage_partition: partition@110000 {
+					label = "storage";
+					reg = <0x00110000 DT_SIZE_K(64)>;
+				};
 			};
 		};
 	};

samples/sysbuild/with_mcuboot/boards/nucleo_h7s3l8.overlay

@@ -11,7 +11,7 @@
 / {
 	chosen {
 		zephyr,flash = &mx25uw25645;
-		zephyr,flash-controller = &mx25uw25645;
+		zephyr,flash-controller = &ext_flash_ctrl;
 		zephyr,code-partition = &slot0_partition;
 	};
 };