boards: arduino: use shared QSPI partition configs

pillo79 · kartben · commit ca48a14766f8 · 2025-10-08T08:43:51.000+02:00
This commit introduces shared QSPI partition configurations for Arduino
STM32H7 boards, using the factory partitioning scheme that is compatible
with the Arduino IoT Cloud services.

Signed-off-by: Luca Burelli &lt;l.burelli@arduino.cc&gt;
diff --git a/boards/arduino/giga_r1/arduino_giga_r1_stm32h747xx_m7.dts b/boards/arduino/giga_r1/arduino_giga_r1_stm32h747xx_m7.dts
@@ -173,31 +173,16 @@
 	pinctrl-names = "default";
 	status = "okay";
 
-	n25q128a1: qspi-nor-flash@0 {
+	qspi_flash: n25q128a1: qspi-nor-flash@0 {
 		compatible = "st,stm32-qspi-nor";
 		reg = <0>;
-		size = <DT_SIZE_M(128)>; /* 128 Mbits */
+		size = <DT_SIZE_M(128)>; /* 128 Mbits (16 MB) */
 		qspi-max-frequency = <72000000>;
 		cs-high-time = <4>; /* >= 50 ns */
 		status = "okay";
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			slot1_partition: partition@0 {
-				label = "image-1";
-				reg = <0x00000000 DT_SIZE_M(1)>;
-			};
-
-			storage_partition: partition@100000 {
-				label = "storage";
-				reg = <0x00100000 DT_SIZE_M(15)>;
-			};
-		};
 	};
 };
+#include <arduino/partitions_qspi_h7.dtsi>
 
 &rng {
 	status = "okay";
diff --git a/boards/arduino/nicla_vision/arduino_nicla_vision_stm32h747xx_m7.dts b/boards/arduino/nicla_vision/arduino_nicla_vision_stm32h747xx_m7.dts
@@ -165,31 +165,16 @@ zephyr_i2c: &i2c1 {
 	pinctrl-names = "default";
 	status = "okay";
 
-	n25q128a1: qspi-nor-flash@0 {
+	qspi_flash: n25q128a1: qspi-nor-flash@0 {
 		compatible = "st,stm32-qspi-nor";
 		reg = <0>;
-		size = <DT_SIZE_M(128)>; /* 128 Mbits */
+		size = <DT_SIZE_M(128)>; /* 128 Mbits (16 MB) */
 		qspi-max-frequency = <72000000>;
 		cs-high-time = <4>; /* >= 50 ns */
 		status = "okay";
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			slot1_partition: partition@0 {
-				label = "image-1";
-				reg = <0x00000000 DT_SIZE_M(1)>;
-			};
-
-			storage_partition: partition@100000 {
-				label = "storage";
-				reg = <0x00100000 DT_SIZE_M(15)>;
-			};
-		};
 	};
 };
+#include <arduino/partitions_qspi_h7.dtsi>
 
 &rng {
 	status = "okay";
diff --git a/boards/arduino/opta/arduino_opta-external-flash-partitioning.dtsi b/boards/arduino/opta/arduino_opta-external-flash-partitioning.dtsi
diff --git a/boards/arduino/opta/arduino_opta_stm32h747xx_m7.dts b/boards/arduino/opta/arduino_opta_stm32h747xx_m7.dts
@@ -160,42 +160,11 @@ zephyr_udc0: &usbotg_fs {
 	qspi_flash: qspi-nor-flash@0 {
 		compatible = "st,stm32-qspi-nor";
 		reg = <0>;
-		size = <DT_SIZE_M(128)>; /* 128 MBits */
+		size = <DT_SIZE_M(128)>; /* 128 Mbits (16 MB) */
 		qspi-max-frequency = <80000000>;
 		jedec-id = [01 1f 89];
 		spi-bus-width = <2>;
 		status = "okay";
-
-		/* The following partitions are valid only if the Opta external flash
-		 * has never been reformatted or repartitioned. Note the offset of the
-		 * first partition, due to the presence of the MBR.
-		 */
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			/* WiFi firmware and TLS certificates: 1MB - 4K for MBR using LBA */
-			wlan_partition: partition@1000 {
-				label = "wlan";
-				reg = <0x001000 DT_SIZE_K(1020)>;
-			};
-
-			/* Arduino OTA partition: 13MB */
-			fs_partition: partition@100000 {
-				label = "fs";
-				reg = <0x100000 DT_SIZE_M(13)>;
-			};
-
-			/* The final 2MB is used to keep a memory-mapped copy of the WiFi
-			 * firmware. The address of the firmware blob is 0xF80000 and the
-			 * size of the partition in the MBR is 0 but, given that we can't
-			 * specify a zero size in `reg` we just give the "correct" one.
-			 */
-			wifi_partition: partition@e00000 {
-				label = "4343WA1";
-				reg = <0xE00000 DT_SIZE_M(2)>;
-			};
-		};
 	};
 };
+#include <arduino/partitions_qspi_h7.dtsi>
diff --git a/boards/arduino/opta/doc/index.rst b/boards/arduino/opta/doc/index.rst
@@ -84,11 +84,9 @@ External flash
 ==============
 
 External flash (16MB on QSPI) access can be enabled by the ``CONFIG_FLASH``
-option. The ``partitions`` entry provided in the default device tree is meant
-as an example and is valid only if the Opta is fresh from the factory and the
-flash has not been repartitioned. As a second example, the partitioning scheme
-created by the new ``QSPIFormat.ino`` sketch from Arduino is available as a
-DTSI in ``arduino_opta-external-flash-partitioning.dtsi``.
+option. The default partition table tracks the one used by the latest Arduino
+IoT Cloud library. If you have any issues, re-run the ``QSPIFormat.ino``
+sketch to update the Flash contents.
 
 Resources sharing
 =================
diff --git a/boards/arduino/portenta_h7/arduino_portenta_h7-common.dtsi b/boards/arduino/portenta_h7/arduino_portenta_h7-common.dtsi
@@ -184,10 +184,10 @@ zephyr_i2c: &i2c1 {
 	pinctrl-names = "default";
 	status = "okay";
 
-	mx25l12833f: qspi-nor-flash@0 {
+	qspi_flash: mx25l12833f: qspi-nor-flash@0 {
 		compatible = "st,stm32-qspi-nor";
 		reg = <0>;
-		size = <DT_SIZE_M(128)>; /* 128 Mbits */
+		size = <DT_SIZE_M(128)>; /* 128 Mbits (16 MB) */
 		qspi-max-frequency = <40000000>;
 		cs-high-time = <2>; /* >= 30 ns */
 		sfdp-bfp = [e5 20 f1 ff ff ff ff 07 44 eb 08 6b 08 3b 04 bb
@@ -197,24 +197,9 @@ zephyr_i2c: &i2c1 {
 		jedec-id = [66 66 20];
 		spi-bus-width = <4>;
 		status = "okay";
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			storage_partition: partition@0 {
-				label = "storage";
-				reg = <0x0 DT_SIZE_K(15872)>;
-			};
-
-			wifi_firmware: partition@f80000 {
-				label = "wifi-firmware";
-				reg = <0xf80000 DT_SIZE_K(512)>;
-			};
-		};
 	};
 };
+#include <arduino/partitions_qspi_h7.dtsi>
 
 &rng {
 	status = "okay";
diff --git a/dts/vendor/arduino/partitions_qspi_h7.dtsi b/dts/vendor/arduino/partitions_qspi_h7.dtsi
@@ -0,0 +1,6 @@
+/*
+ * Copyright (c) 2025 Arduino SA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <arduino/partitions_qspi_h7_r3.dtsi>
diff --git a/dts/vendor/arduino/partitions_qspi_h7_r1.dtsi b/dts/vendor/arduino/partitions_qspi_h7_r1.dtsi
@@ -0,0 +1,40 @@
+/*
+ * External QSPI Flash partition for Arduino IoT Cloud services, rev 1
+ *
+ * Copyright (c) 2025 Arduino SA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Note: This is an obsolete partition table layout which does not support
+ *       some of the latest features of the Arduino IoT library.
+ *       Please update your board by running the most recent version of the
+ *       'QSPIFormat' sketch.
+ */
+
+&qspi_flash {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		/* Partition 1: WiFi firmware and certificates 1MB - 4kB */
+		wlan_partition: partition@1000 {
+			label = "wlan";
+			reg = <0x001000 DT_SIZE_K(1020)>;
+		};
+
+		/* Partition 2: User data 13MB */
+		storage_partition: partition@100000 {
+			label = "storage";
+			reg = <0x100000 DT_SIZE_M(13)>;
+		};
+
+		/* Partition 3: Binary FW image for the Airoc WLAN */
+		airoc_firmware: partition@e80000 {
+			label = "4343WA1.bin";
+			reg = <0xe80000 DT_SIZE_K(512)>;
+		};
+	};
+};
diff --git a/dts/vendor/arduino/partitions_qspi_h7_r2.dtsi b/dts/vendor/arduino/partitions_qspi_h7_r2.dtsi
@@ -0,0 +1,46 @@
+/*
+ * External QSPI Flash partition for Arduino IoT Cloud services, rev 2
+ *
+ * Copyright (c) 2025 Arduino SA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Note: This is an obsolete partition table layout which does not support
+ *       some of the latest features of the Arduino IoT library.
+ *       Please update your board by running the most recent version of the
+ *       'QSPIFormat' sketch.
+ */
+
+&qspi_flash {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		/* Partition 1: WiFi firmware and certificates 1MB - 4kB */
+		wlan_partition: partition@1000 {
+			label = "wlan";
+			reg = <0x001000 DT_SIZE_K(1020)>;
+		};
+
+		/* Partition 2: OTA 5MB */
+		ota_partition: partition@100000 {
+			label = "ota";
+			reg = <0x100000 DT_SIZE_M(5)>;
+		};
+
+		/* Partition 3: User data 8MB */
+		storage_partition: partition@600000 {
+			label = "storage";
+			reg = <0x600000 DT_SIZE_M(8)>;
+		};
+
+		/* Partition 4: Binary FW image for the Airoc WLAN */
+		airoc_firmware: partition@e80000 {
+			label = "4343WA1.bin";
+			reg = <0xe80000 DT_SIZE_K(512)>;
+		};
+	};
+};
diff --git a/dts/vendor/arduino/partitions_qspi_h7_r3.dtsi b/dts/vendor/arduino/partitions_qspi_h7_r3.dtsi
@@ -0,0 +1,53 @@
+/*
+ * External QSPI Flash partition for Arduino IoT Cloud services, rev 3
+ *
+ * Copyright (c) 2024 DNDG srl
+ * Copyright (c) 2025 Arduino SA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * This is the partition table layout used by the Arduino IoT Cloud
+ * library to connect to the Arduino IoT Cloud services.
+ * Please initialize your board by running the latest version of the
+ * 'QSPIFormat' sketch.
+ */
+
+&qspi_flash {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		/* Partition 1: WiFi firmware and certificates 1MB - 4kB */
+		wlan_partition: partition@1000 {
+			label = "wlan";
+			reg = <0x001000 DT_SIZE_K(1020)>;
+		};
+
+		/* Partition 2: OTA 5MB */
+		ota_partition: partition@100000 {
+			label = "ota";
+			reg = <0x100000 DT_SIZE_M(5)>;
+		};
+
+		/* Partition 3: Provisioning KVStore 1MB */
+		kvs_partition: partition@600000 {
+			label = "kvs";
+			reg = <0x600000 DT_SIZE_M(1)>;
+		};
+
+		/* Partition 4: User data 7MB */
+		storage_partition: partition@700000 {
+			label = "storage";
+			reg = <0x700000 DT_SIZE_M(7)>;
+		};
+
+		/* Partition 5: Binary FW image for the Airoc WLAN */
+		airoc_firmware: partition@e80000 {
+			label = "4343WA1.bin";
+			reg = <0xe80000 DT_SIZE_K(512)>;
+		};
+	};
+};
