soc: stm32h7: Couple of tests fixes following migration

This should cover all issues. Signed-off-by: Erwan Gouriou <erwan.gouriou@st.com>
zephyrproject-rtos · Feb 16, 2024 · c1aa335 · c1aa335
1 parent d980810
commit c1aa335
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 31 deletions.
diff --git a/boards/shields/st_b_lcd40_dsi1_mb1166/doc/index.rst b/boards/shields/st_b_lcd40_dsi1_mb1166/doc/index.rst
@@ -107,7 +107,7 @@ Set ``-DSHIELD="st_b_lcd40_dsi1_mb1166"`` when you invoke ``west build``. For ex
 
 .. zephyr-app-commands::
    :zephyr-app: samples/drivers/display
-   :board: stm32h747i_disco_m7
+   :board: stm32h747i_disco/stm32h747xx/m7
    :shield: st_b_lcd40_dsi1_mb1166
    :goals: build
 

diff --git a/samples/boards/stm32/h7_dual_core/README.rst b/samples/boards/stm32/h7_dual_core/README.rst
@@ -10,18 +10,18 @@ Blinky led triggered by mailbox new message.
 Building and Running
 ********************
 
-Build for stm32h747i_disco_m7:
+Build for stm32h747i_disco/stm32h747xx/m7:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/boards/stm32/h7_dual_core
-   :board: stm32h747i_disco_m7
+   :board: stm32h747i_disco/stm32h747xx/m7
    :goals: build
 
-Build for stm32h747i_disco_m4:
+Build for stm32h747i_disco/stm32h747xx/m4:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/boards/stm32/h7_dual_core
-   :board: stm32h747i_disco_m4
+   :board: stm32h747i_disco/stm32h747xx/m4
    :goals: build
 
 Sample Output

diff --git a/...l_core/boards/stm32h747i_disco_m4.overlay → ...s/stm32h747i_disco_stm32h747xx_m4.overlay b/...l_core/boards/stm32h747i_disco_m4.overlay → ...s/stm32h747i_disco_stm32h747xx_m4.overlay
diff --git a/...l_core/boards/stm32h747i_disco_m7.overlay → ...s/stm32h747i_disco_stm32h747xx_m7.overlay b/...l_core/boards/stm32h747i_disco_m7.overlay → ...s/stm32h747i_disco_stm32h747xx_m7.overlay
diff --git a/samples/drivers/display/sample.yaml b/samples/drivers/display/sample.yaml
@@ -127,7 +127,7 @@ tests:
     harness_config:
       fixture: fixture_display
   sample.display.st_b_lcd40_dsi1_mb1166:
-    platform_allow: stm32h747i_disco_m7
+    platform_allow: stm32h747i_disco/stm32h747xx/m7
     extra_args: SHIELD=st_b_lcd40_dsi1_mb1166
     tags:
       - display

diff --git a/samples/drivers/flash_shell/sample.yaml b/samples/drivers/flash_shell/sample.yaml
@@ -8,11 +8,11 @@ tests:
       - shell
     filter: CONFIG_FLASH_HAS_DRIVER_ENABLED
     platform_exclude:
-      - nucleo_h745zi_q_m4
-      - stm32h747i_disco_m4
+      - nucleo_h745zi_q/stm32h745xx/m4
+      - stm32h747i_disco/stm32h747xx/m4
       - gd32f350r_eval
-      - arduino_portenta_h7_m4
-      - arduino_giga_r1_m4
+      - arduino_portenta_h7/stm32h747xx/m4
+      - arduino_giga_r1/stm32h747xx/m4
     harness: keyboard
     min_ram: 12
     integration_platforms:

diff --git a/samples/modules/canopennode/sample.yaml b/samples/modules/canopennode/sample.yaml
@@ -20,7 +20,7 @@ tests:
     platform_exclude:
       - nucleo_h723zg
       - nucleo_h743zi
-      - nucleo_h745zi_q
+      - nucleo_h745zi_q/stm32h745xx/m7
       - nucleo_h753zi
   sample.modules.canopennode.program_download:
     sysbuild: true

diff --git a/samples/modules/lvgl/demos/sample.yaml b/samples/modules/lvgl/demos/sample.yaml
@@ -25,7 +25,7 @@ tests:
     extra_configs:
       - CONFIG_LV_Z_DEMO_WIDGETS=y
   sample.modules.lvgl.demos.st_b_lcd40_dsi1_mb1166:
-    platform_allow: stm32h747i_disco_m7
+    platform_allow: stm32h747i_disco/stm32h747xx/m7
     extra_args: SHIELD=st_b_lcd40_dsi1_mb1166
     harness: console
     harness_config:

diff --git a/samples/net/gptp/sample.yaml b/samples/net/gptp/sample.yaml
@@ -17,7 +17,7 @@ tests:
       - native_sim_64
       - nucleo_f767zi
       - nucleo_h743zi
-      - nucleo_h745zi_q_m7
+      - nucleo_h745zi_q/stm32h745xx/m7
     depends_on: netif
     integration_platforms:
       - frdm_k64f

diff --git a/samples/subsys/display/lvgl/sample.yaml b/samples/subsys/display/lvgl/sample.yaml
@@ -41,7 +41,7 @@ tests:
     integration_platforms:
       - mimxrt1170_evk_cm7
   sample.subsys.display.lvgl.st_b_lcd40_dsi1_mb1166:
-    platform_allow: stm32h747i_disco_m7
+    platform_allow: stm32h747i_disco/stm32h747xx/m7
     extra_args: SHIELD=st_b_lcd40_dsi1_mb1166
     harness: console
     harness_config:

diff --git a/...fs_sample/boards/stm32h747i_disco_m7.conf → ...ards/stm32h747i_disco_stm32h747xx_m7.conf b/...fs_sample/boards/stm32h747i_disco_m7.conf → ...ards/stm32h747i_disco_stm32h747xx_m7.conf
diff --git a/...sample/boards/stm32h747i_disco_m7.overlay → ...s/stm32h747i_disco_stm32h747xx_m7.overlay b/...sample/boards/stm32h747i_disco_m7.overlay → ...s/stm32h747i_disco_stm32h747xx_m7.overlay
diff --git a/samples/subsys/fs/fs_sample/sample.yaml b/samples/subsys/fs/fs_sample/sample.yaml
@@ -49,6 +49,4 @@ tests:
     platform_allow: hifive_unmatched bl5340_dvk/nrf5340/cpuapp
   sample.filesystem.fat_fs.stm32h747i_disco_m7_sdmmc:
     build_only: true
-    platform_allow: stm32h747i_disco_m7
-    extra_args:
-      - OVERLAY_CONFIG=boards/stm32h747i_disco_m7.conf
+    platform_allow: stm32h747i_disco/stm32h747xx/m7
diff --git a/samples/subsys/fs/littlefs/sample.yaml b/samples/subsys/fs/littlefs/sample.yaml
@@ -36,7 +36,6 @@ tests:
       - DTC_OVERLAY_FILE=boards/nrf52840dk_nrf52840_qspi.overlay
   sample.filesystem.littlefs.stm32h747i_disco_m7_sdmmc:
     build_only: true
-    platform_allow: stm32h747i_disco_m7
+    platform_allow: stm32h747i_disco/stm32h747xx/m7
     extra_args:
-      - OVERLAY_CONFIG=boards/stm32h747i_disco_m7.conf
       - CONF_FILE=prj_blk.conf
diff --git a/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/testcase.yaml b/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/testcase.yaml
@@ -15,26 +15,26 @@ tests:
     extra_args: >
       OVERLAY_CONFIG="configuration/crc32.conf"
     platform_exclude:
-      - arduino_giga_r1_m4
-      - arduino_portenta_h7_m4
+      - arduino_giga_r1/stm32h747xx/m4
+      - arduino_portenta_h7/stm32h747xx/m4
       - lpcxpresso51u68
-      - nucleo_h745zi_q_m4
-      - stm32h747i_disco_m4
+      - nucleo_h745zi_q/stm32h745xx/m4
+      - stm32h747i_disco/stm32h747xx/m4
   mgmt.mcumgr.fs.mgmt.hash.supported.sha256:
     extra_args: >
       OVERLAY_CONFIG="configuration/sha256.conf"
     platform_exclude:
-      - arduino_giga_r1_m4
-      - arduino_portenta_h7_m4
+      - arduino_giga_r1/stm32h747xx/m4
+      - arduino_portenta_h7/stm32h747xx/m4
       - lpcxpresso51u68
-      - nucleo_h745zi_q_m4
-      - stm32h747i_disco_m4
+      - nucleo_h745zi_q/stm32h745xx/m4
+      - stm32h747i_disco/stm32h747xx/m4
   mgmt.mcumgr.fs.mgmt.hash.supported.all:
     extra_args: >
       OVERLAY_CONFIG="configuration/all.conf"
     platform_exclude:
-      - arduino_giga_r1_m4
-      - arduino_portenta_h7_m4
+      - arduino_giga_r1/stm32h747xx/m4
+      - arduino_portenta_h7/stm32h747xx/m4
       - lpcxpresso51u68
-      - nucleo_h745zi_q_m4
-      - stm32h747i_disco_m4
+      - nucleo_h745zi_q/stm32h745xx/m4
+      - stm32h747i_disco/stm32h747xx/m4