dts: arm: st: h7: fix flash on M4 board targets

The flash controller is nowadays supported on the M4 core. Add the bank2-flash-size property to the board definitions as required by the STM32 H7 flash driver. Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
zephyrproject-rtos · Sep 4, 2024 · 17545c1 · 17545c1
1 parent 3a4f868
commit 17545c1
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 34 deletions.
diff --git a/dts/arm/st/h7/stm32h745Xi_m4.dtsi b/dts/arm/st/h7/stm32h745Xi_m4.dtsi
@@ -10,11 +10,6 @@
 /delete-node/ &flash0;
 
 / {
-	chosen {
-		/* Flash controller support is not yet supported on M4 core */
-		/delete-property/ zephyr,flash-controller;
-	};
-
 	cpus {
 		/delete-node/ cpu@0;
 	};
@@ -23,6 +18,7 @@
 		flash-controller@52002000 {
 			flash1: flash@8100000 {
 				reg = <0x08100000 DT_SIZE_K(1024)>;
+				bank2-flash-size = <1024>;
 			};
 		};
 

diff --git a/dts/arm/st/h7/stm32h747Xi_m4.dtsi b/dts/arm/st/h7/stm32h747Xi_m4.dtsi
@@ -10,11 +10,6 @@
 /delete-node/ &flash0;
 
 / {
-	chosen {
-		/* Flash controller support is not yet supported on M4 core */
-		/delete-property/ zephyr,flash-controller;
-	};
-
 	cpus {
 		/delete-node/ cpu@0;
 	};
@@ -23,6 +18,7 @@
 		flash-controller@52002000 {
 			flash1: flash@8100000 {
 				reg = <0x08100000 DT_SIZE_K(1024)>;
+				bank2-flash-size = <1024>;
 			};
 		};
 

diff --git a/dts/arm/st/h7/stm32h755Xi_m4.dtsi b/dts/arm/st/h7/stm32h755Xi_m4.dtsi
@@ -18,6 +18,7 @@
 		flash-controller@52002000 {
 			flash1: flash@8100000 {
 				reg = <0x08100000 DT_SIZE_K(1024)>;
+				bank2-flash-size = <1024>;
 			};
 		};
 

diff --git a/samples/drivers/flash_shell/boards/stm32h745i_disco_stm32h745xx_m4.overlay b/samples/drivers/flash_shell/boards/stm32h745i_disco_stm32h745xx_m4.overlay
diff --git a/samples/drivers/flash_shell/boards/stm32h747i_disco_stm32h747xx_m4.overlay b/samples/drivers/flash_shell/boards/stm32h747i_disco_stm32h747xx_m4.overlay
diff --git a/samples/drivers/flash_shell/sample.yaml b/samples/drivers/flash_shell/sample.yaml
@@ -8,13 +8,8 @@ tests:
       - shell
     filter: CONFIG_FLASH_HAS_DRIVER_ENABLED
     platform_exclude:
-      - nucleo_h745zi_q/stm32h745xx/m4
       - stm32h7s78_dk
       - gd32f350r_eval
-      - arduino_portenta_h7/stm32h747xx/m4
-      - arduino_nicla_vision/stm32h747xx/m4
-      - arduino_giga_r1/stm32h747xx/m4
-      - nucleo_h755zi_q/stm32h755xx/m4
     harness: keyboard
     min_ram: 12
     integration_platforms:

diff --git a/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/testcase.yaml b/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/testcase.yaml
@@ -11,19 +11,12 @@ common:
   integration_platforms:
     - native_sim
   platform_exclude:
-    - arduino_giga_r1/stm32h747xx/m4
-    - arduino_nicla_vision/stm32h747xx/m4
-    - arduino_portenta_h7/stm32h747xx/m4
     - lpcxpresso51u68
-    - nucleo_h745zi_q/stm32h745xx/m4
-    - nucleo_h755zi_q/stm32h755xx/m4
-    - stm32h747i_disco/stm32h747xx/m4
     - lpcxpresso55s69/lpc55s69/cpu1
     - mpfs_icicle/polarfire/u54
     - mpfs_icicle/polarfire/u54/smp
     - mpfs_icicle/polarfire/e51
     - apollo4p_evb
-    - stm32h745i_disco/stm32h745xx/m4
     - cyw920829m2evk_02
 tests:
   mgmt.mcumgr.fs.mgmt.hash.supported.crc32: