tests: Update board names for hwmv2

Updates tests that use board names which have changed with boards v2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>

.github/workflows/codecov.yaml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: ["mps2_an385", "native_sim", "qemu_x86", "unit_testing"]
+        platform: ["mps2/an385", "native_sim", "qemu_x86", "unit_testing"]
     steps:
       - name: Apply container owner mismatch workaround
         run: |

doc/develop/test/coverage.rst

@@ -49,7 +49,7 @@ These steps will produce an HTML coverage report for a single application.
 1. Build the code with CONFIG_COVERAGE=y.
 
    .. zephyr-app-commands::
-      :board: mps2_an385
+      :board: mps2/an385
       :gen-args: -DCONFIG_COVERAGE=y -DCONFIG_COVERAGE_DUMP=y
       :goals: build
       :compact:

modules/trusted-firmware-m/Kconfig.tfm

@@ -43,7 +43,7 @@ menuconfig BUILD_WITH_TFM
 	  them, are generated during the normal Zephyr build process.
 
 	  Notes:
-	    Building with the "_ns" BOARD variant (e.g. "mps2_an521_ns")
+	    Building with the "/ns" BOARD variant (e.g. "mps2/an521/cpu0/ns")
 	    ensures that CONFIG_TRUSTED_EXECUTION_NONSECURE is enabled.
 
 	    By default we allow Zephyr preemptible threads be preempted

samples/basic/hash_map/sample.yaml

@@ -10,7 +10,7 @@ common:
   min_ram: 24
   integration_platforms:
     - qemu_x86_64
-    - mps2_an385
+    - mps2/an385
   harness: console
   harness_config:
     type: one_line

samples/basic/minimal/sample.yaml

@@ -15,7 +15,7 @@ tests:
     platform_allow:
       - reel_board
       - frdm_k64f
-      - mps2_an385
+      - mps2/an385
       - nrf51dk_nrf51422
       - nucleo_f429zi
       - disco_l475_iot1
@@ -27,7 +27,7 @@ tests:
     platform_allow:
       - reel_board
       - frdm_k64f
-      - mps2_an385
+      - mps2/an385
       - nrf51dk_nrf51422
       - nucleo_f429zi
       - disco_l475_iot1
@@ -37,7 +37,7 @@ tests:
     platform_allow:
       - reel_board
       - frdm_k64f
-      - mps2_an385
+      - mps2/an385
       - nrf51dk_nrf51422
       - nucleo_f429zi
       - disco_l475_iot1
@@ -47,7 +47,7 @@ tests:
     platform_allow:
       - reel_board
       - frdm_k64f
-      - mps2_an385
+      - mps2/an385
       - nrf51dk_nrf51422
       - nucleo_f429zi
       - disco_l475_iot1
@@ -57,7 +57,7 @@ tests:
     platform_allow:
       - reel_board
       - frdm_k64f
-      - mps2_an385
+      - mps2/an385
       - nrf51dk_nrf51422
       - nucleo_f429zi
       - disco_l475_iot1

samples/compression/lz4/sample.yaml

@@ -17,7 +17,7 @@ common:
 tests:
   sample.compression.lz4:
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
       - qemu_riscv64
     tags:
       - compression

samples/drivers/ipm/ipm_mhu_dual_core/README.rst

@@ -27,7 +27,7 @@ It can be built and executed on Musca B1 CPU 0 as follows:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/drivers/ipm/ipm_mhu_dual_core
-   :board: v2m_musca_b1
+   :board: v2m_musca_b1/musca_b1
    :goals: run
    :compact:
 
@@ -36,7 +36,7 @@ It can be built and executed on Musca B1 CPU 1 as follows:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/drivers/ipm/ipm_mhu_dual_core
-   :board: v2m_musca_b1_ns
+   :board: v2m_musca_b1/musca_b1/ns
    :goals: run
    :compact:
 

samples/drivers/ipm/ipm_mhu_dual_core/sample.yaml

@@ -5,7 +5,7 @@ tests:
   sample.ipm.ipm_mhu_dual_core:
     tags: ipm
     platform_allow:
-      - v2m_musca_b1
+      - v2m_musca_b1/musca_b1
-      - v2m_musca_b1_ns
+      - v2m_musca_b1/musca_b1/ns
     integration_platforms:
-      - v2m_musca_b1
+      - v2m_musca_b1/musca_b1

samples/drivers/spi_flash/src/main.c

@@ -13,8 +13,8 @@
 
 #if defined(CONFIG_BOARD_ADAFRUIT_FEATHER_STM32F405)
 #define SPI_FLASH_TEST_REGION_OFFSET 0xf000
-#elif defined(CONFIG_BOARD_ARTY_A7_ARM_DESIGNSTART_M1) || \
+#elif defined(CONFIG_BOARD_ARTY_A7_DESIGNSTART_FPGA_CORTEX_M1) || \
-	defined(CONFIG_BOARD_ARTY_A7_ARM_DESIGNSTART_M3)
+	defined(CONFIG_BOARD_ARTY_A7_DESIGNSTART_FPGA_CORTEX_M3)
 /* The FPGA bitstream is stored in the lower 536 sectors of the flash. */
 #define SPI_FLASH_TEST_REGION_OFFSET \
 	DT_REG_SIZE(DT_NODE_BY_FIXED_PARTITION_LABEL(fpga_bitstream))

samples/kernel/metairq_dispatch/sample.yaml

@@ -6,7 +6,7 @@ common:
   tags:
     - kernel
   integration_platforms:
-    - mps2_an385
+    - mps2/an385
     - qemu_x86
   harness: console
   harness_config:

samples/modules/thrift/hello/client/sample.yaml

@@ -10,7 +10,7 @@ common:
   modules:
     - thrift
   platform_allow:
-    - mps2_an385
+    - mps2/an385
     - qemu_x86_64
   integration_platforms:
     - qemu_x86_64

samples/modules/thrift/hello/server/sample.yaml

@@ -10,7 +10,7 @@ common:
   modules:
     - thrift
   platform_allow:
-    - mps2_an385
+    - mps2/an385
     - qemu_x86_64
   integration_platforms:
     - qemu_x86_64

samples/net/sockets/echo_server/sample.yaml

@@ -122,7 +122,7 @@ tests:
   sample.net.sockets.echo_server.smsc911x:
     extra_args: OVERLAY_CONFIG="overlay-smsc911x.conf"
     tags: net
-    platform_allow: mps2_an385
+    platform_allow: mps2/an385
   sample.net.sockets.echo_server.userspace:
     extra_args:
       - CONFIG_USERSPACE=y

samples/posix/eventfd/sample.yaml

@@ -6,7 +6,7 @@ common:
   tags: posix
   platform_exclude: m2gl025_miv
   integration_platforms:
-    - mps2_an385
+    - mps2/an385
 tests:
   sample.posix.eventfd:
     min_ram: 32

samples/subsys/console/echo/sample.yaml

@@ -3,7 +3,7 @@ sample:
 tests:
   sample.console.echo:
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
     filter: CONFIG_UART_CONSOLE and CONFIG_SERIAL_SUPPORT_INTERRUPT
     tags: console
     harness: keyboard

samples/subsys/console/getchar/sample.yaml

@@ -3,7 +3,7 @@ sample:
 tests:
   sample.console.getchar:
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
     filter: CONFIG_UART_CONSOLE and CONFIG_SERIAL_SUPPORT_INTERRUPT
     tags: console
     harness: keyboard

samples/subsys/console/getline/sample.yaml

@@ -3,7 +3,7 @@ sample:
 tests:
   sample.console.getline:
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
     filter: CONFIG_UART_CONSOLE and CONFIG_SERIAL_SUPPORT_INTERRUPT
     tags: console
     harness: keyboard

samples/subsys/ipc/openamp/Kconfig.sysbuild

@@ -8,8 +8,8 @@ config OPENAMP_REMOTE_BOARD
 string
 	default "lpcxpresso54114_m0" if $(BOARD) = "lpcxpresso54114_m4"
 	default "lpcxpresso55s69_cpu1" if $(BOARD) = "lpcxpresso55s69_cpu0"
-	default "mps2_an521_remote" if $(BOARD) = "mps2_an521"
+	default "mps2/an521/cpu1" if $(BOARD) = "mps2"
-	default "v2m_musca_b1_ns" if $(BOARD) = "v2m_musca_b1"
+	default "v2m_musca_b1/musca_b1/ns" if $(BOARD) = "v2m_musca_b1"
 	default "mimxrt1170_evk_cm4" if $(BOARD) = "mimxrt1170_evk_cm7"
 	default "mimxrt1160_evk_cm4" if $(BOARD) = "mimxrt1160_evk_cm7"
 	default "mimxrt1170_evkb_cm4" if $(BOARD) = "mimxrt1170_evkb_cm7"

samples/subsys/ipc/openamp/README.rst

@@ -30,21 +30,21 @@ Building the application for lpcxpresso55s69_cpu0
    :goals: debug
    :west-args: --sysbuild
 
-Building the application for mps2_an521
+Building the application for mps2/an521/cpu0
-***************************************
+********************************************
 
 .. zephyr-app-commands::
    :zephyr-app: samples/subsys/ipc/openamp
-   :board: mps2_an521
+   :board: mps2/an521/cpu0
    :goals: debug
    :west-args: --sysbuild
 
-Building the application for v2m_musca_b1
+Building the application for v2m_musca_b1/musca_b1
-*****************************************
+**************************************************
 
 .. zephyr-app-commands::
    :zephyr-app: samples/subsys/ipc/openamp
-   :board: v2m_musca_b1
+   :board: v2m_musca_b1/musca_b1
    :goals: debug
    :west-args: --sysbuild
 

samples/subsys/ipc/openamp/sample.yaml

@@ -6,10 +6,10 @@ tests:
     platform_allow:
       - lpcxpresso54114_m4
       - lpcxpresso55s69_cpu0
-      - mps2_an521
+      - mps2/an521/cpu0
-      - v2m_musca_b1
+      - v2m_musca_b1/musca_b1
     integration_platforms:
-      - mps2_an521
+      - mps2/an521/cpu0
     tags: ipm
     harness: console
     sysbuild: true

samples/subsys/ipc/rpmsg_service/README.rst

@@ -23,20 +23,20 @@ Building the application for nrf5340dk_nrf5340_cpuapp
    :board: nrf5340dk_nrf5340_cpuapp
    :goals: debug
 
-Building the application for mps2_an521
+Building the application for mps2/an521/cpu0
-***************************************
+********************************************
 
 .. zephyr-app-commands::
    :zephyr-app: samples/subsys/ipc/rpmsg_service
-   :board: mps2_an521
+   :board: mps2/an521/cpu0
    :goals: debug
 
-Building the application for v2m_musca_b1
+Building the application for v2m_musca_b1/musca_b1
-*****************************************
+**************************************************
 
 .. zephyr-app-commands::
    :zephyr-app: samples/subsys/ipc/rpmsg_service
-   :board: v2m_musca_b1
+   :board: v2m_musca_b1/musca_b1
    :goals: debug
 
 Open a serial terminal (minicom, putty, etc.) and connect the board with the

samples/subsys/logging/logger/sample.yaml

@@ -31,7 +31,7 @@ tests:
 
   sample.logger.usermode:
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
     platform_exclude:
       - ip_k66f
       - bl652_dvk

samples/subsys/logging/syst/sample.yaml

@@ -15,7 +15,7 @@ tests:
   sample.logger.syst.deferred:
     toolchain_exclude: xcc
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
       - qemu_x86
     extra_args: OVERLAY_CONFIG=overlay_deferred.conf
     harness: console
@@ -95,7 +95,7 @@ tests:
   sample.logger.syst.immediate_cpp:
     toolchain_exclude: xcc
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
       - qemu_x86
     harness: console
     harness_config:

samples/subsys/pm/device_pm/sample.yaml

@@ -6,7 +6,7 @@ tests:
       - nrf52840dk_nrf52840
       - nrf52dk_nrf52832
       - qemu_x86
-      - mps2_an385
+      - mps2/an385
     integration_platforms:
       - qemu_x86
     tags: power

samples/subsys/tracing/README.rst

@@ -19,7 +19,7 @@ Build a UART-tracing image with:
 
 .. zephyr-app-commands::
 	:zephyr-app: samples/subsys/tracing
-	:board: mps2_an521
+	:board: mps2/an521
 	:conf: "prj_uart.conf"
 	:goals: build
 	:compact:
@@ -28,7 +28,7 @@ or:
 
 .. zephyr-app-commands::
 	:zephyr-app: samples/subsys/tracing
-	:board: mps2_an521
+	:board: mps2/an521
 	:conf: "prj_uart_ctf.conf"
 	:goals: build
 	:compact:

samples/subsys/zbus/dyn_channel/sample.yaml

@@ -68,4 +68,4 @@ tests:
     tags: zbus
     integration_platforms:
       - qemu_x86
-      - mps2_an521
+      - mps2/an521/cpu0

samples/tfm_integration/psa_crypto/README.rst

@@ -84,14 +84,14 @@ On MPS2+ AN521:
 ===============
 
 1. Build Zephyr with a non-secure configuration
-   (``-DBOARD=mps2_an521_ns``).
+   (``-DBOARD=mps2/an521/cpu0/ns``).
 
    Using ``west``
 
    .. code-block:: bash
 
       cd <ZEPHYR_ROOT>
-      west build -p -b mps2_an521_ns samples/tfm_integration/psa_crypto
+      west build -p -b mps2/an521/cpu0/ns samples/tfm_integration/psa_crypto
 
    Using ``cmake`` and ``ninja``
 
@@ -100,7 +100,7 @@ On MPS2+ AN521:
       cd <ZEPHYR_ROOT>/samples/tfm_integration/psa_crypto/
       rm -rf build
       mkdir build && cd build
-      cmake -GNinja -DBOARD=mps2_an521_ns ..
+      cmake -GNinja -DBOARD=mps2/an521/cpu0/ns ..
       ninja
 
    Using ``cmake`` and ``make``
@@ -110,7 +110,7 @@ On MPS2+ AN521:
       cd <ZEPHYR_ROOT>/samples/tfm_integration/psa_crypto/
       rm -rf build
       mkdir build && cd build
-      cmake -DBOARD=mps2_an521_ns ..
+      cmake -DBOARD=mps2/an521/cpu0/ns ..
       make
 
 2. Copy application binary files (mcuboot.bin and tfm_sign.bin) to
@@ -137,7 +137,7 @@ On MPS2+ AN521:
 On QEMU:
 ========
 
-Build Zephyr with a non-secure configuration (``-DBOARD=mps2_an521_ns``)
+Build Zephyr with a non-secure configuration (``-DBOARD=mps2/an521/cpu0/ns``)
 and run it in qemu via the ``run`` command.
 
    Using ``west``
@@ -145,7 +145,7 @@ and run it in qemu via the ``run`` command.
    .. code-block:: bash
 
       cd <ZEPHYR_ROOT>
-      west build -p -b mps2_an521_ns samples/tfm_integration/psa_crypto -t run
+      west build -p -b mps2/an521/cpu0/ns samples/tfm_integration/psa_crypto -t run
 
    Using ``cmake`` and ``ninja``
 
@@ -154,7 +154,7 @@ and run it in qemu via the ``run`` command.
       cd <ZEPHYR_ROOT>/samples/tfm_integration/psa_crypto/
       rm -rf build
       mkdir build && cd build
-      cmake -GNinja -DBOARD=mps2_an521_ns ..
+      cmake -GNinja -DBOARD=mps2/an521/cpu0/ns ..
       ninja run
 
    Using ``cmake`` and ``make``
@@ -164,7 +164,7 @@ and run it in qemu via the ``run`` command.
       cd <ZEPHYR_ROOT>/samples/tfm_integration/psa_crypto/
       rm -rf build
       mkdir build && cd build
-      cmake -DBOARD=mps2_an521_ns ..
+      cmake -DBOARD=mps2/an521/cpu0/ns ..
       make run
 
 On LPCxpresso55S69:

samples/tfm_integration/psa_crypto/sample.yaml

@@ -11,7 +11,7 @@ tests:
       - crypto
       - csr
       - mcuboot
-    platform_allow: mps2_an521_ns v2m_musca_s1_ns
+    platform_allow: mps2/an521/cpu0/ns v2m_musca_s1/musca_s1/ns
       nrf5340dk_nrf5340_cpuapp_ns nrf9160dk_nrf9160_ns
       stm32l562e_dk/stm32l562xx/ns bl5340_dvk_cpuapp_ns
     harness: console

samples/tfm_integration/psa_protected_storage/README.rst

@@ -46,7 +46,7 @@ Following is an example based on ``west build``
 
    .. code-block:: bash
 
-      $ west build samples/tfm_integration/psa_protected_storage/ -p -b mps2_an521_ns -t run
+      $ west build samples/tfm_integration/psa_protected_storage/ -p -b mps2/an521/cpu0/ns -t run
 
 Sample Output
 =============

samples/tfm_integration/psa_protected_storage/sample.yaml

@@ -4,13 +4,13 @@ sample:
 common:
   tags: psa
   platform_allow:
-    - mps2_an521_ns
+    - mps2/an521/cpu0/ns
-    - v2m_musca_s1_ns
+    - v2m_musca_s1/musca_s1/ns
     - nrf5340dk_nrf5340_cpuapp_ns
     - nrf9160dk_nrf9160_ns
     - bl5340_dvk_cpuapp_ns
   integration_platforms:
-    - mps2_an521_ns
+    - mps2/an521/cpu0/ns
   harness: console
   harness_config:
     type: multi_line

samples/tfm_integration/tfm_ipc/README.rst

@@ -33,21 +33,21 @@ executed on MPS2+ AN521 and ST Nucleo L552ZE Q.
 On MPS2+ AN521:
 ===============
 
-#. Build Zephyr with a non-secure configuration (``-DBOARD=mps2_an521_ns``).
+#. Build Zephyr with a non-secure configuration (``-DBOARD=mps2/an521/cpu0/ns``).
 
    .. code-block:: bash
 
       cd $ZEPHYR_ROOT/samples/tfm_integration/tfm_ipc/
       mkdir build
       cd build
-      cmake -DBOARD=mps2_an521_ns ..
+      cmake -DBOARD=mps2/an521/cpu0/ns ..
       make
 
 You can also use west as follows:
 
    .. code-block:: bash
 
-      $ west build -p -b mps2_an521_ns zephyr/samples/tfm_integration/tfm_ipc
+      $ west build -p -b mps2/an521/cpu0/ns zephyr/samples/tfm_integration/tfm_ipc
 
 
 #. Copy application binary files (mcuboot.bin and tfm_sign.bin) to ``<MPS2 device name>/SOFTWARE/``.
@@ -82,7 +82,7 @@ folder to update the ``-DGNUARM_PATH=/opt/toolchain/arm-none-eabi`` path.
 On QEMU:
 ========
 
-The MPS2+ AN521 target (``mps2_an521_ns``), which is based on a
+The MPS2+ AN521 target (``mps2/an521/cpu0/ns``), which is based on a
 dual core ARM Cortex-M33 setup, also allows you to run TF-M tests using QEMU if
 you don't have access to a supported ARMv8-M development board.
 
@@ -99,7 +99,7 @@ ninja or make, adding the ``run`` commands:
 
    .. code-block:: bash
 
-      $ west build -b mps2_an521_ns zephyr/samples/tfm_integration/tfm_ipc -t run
+      $ west build -b mps2/an521/cpu0/ns zephyr/samples/tfm_integration/tfm_ipc -t run
 
 Or, post build:
 

samples/tfm_integration/tfm_ipc/sample.yaml

@@ -9,16 +9,16 @@ tests:
       - trusted-firmware-m
       - mcuboot
     platform_allow:
-      - mps2_an521_ns
+      - mps2/an521/cpu0/ns
       - nrf5340dk_nrf5340_cpuapp_ns
       - nrf9160dk_nrf9160_ns
       - nucleo_l552ze_q/stm32l552xx/ns
       - stm32l562e_dk/stm32l562xx/ns
-      - v2m_musca_s1_ns
+      - v2m_musca_s1/musca_s1/ns
       - bl5340_dvk_cpuapp_ns
       - b_u585i_iot02a_ns
     integration_platforms:
-      - mps2_an521_ns
+      - mps2/an521/cpu0/ns
     harness: console
     harness_config:
       type: multi_line
@@ -31,7 +31,7 @@ tests:
     tags:
       - introduction
       - trusted-firmware-m
-    platform_allow: mps2_an521_ns
+    platform_allow: mps2/an521/cpu0/ns
     extra_configs:
       - CONFIG_TFM_BL2=n
     harness: console

samples/tfm_integration/tfm_psa_test/README.rst

@@ -32,7 +32,7 @@ You can indicate the desired test suite at build time via a config flag:
    .. code-block:: bash
 
      $ west build samples/tfm_integration/tfm_psa_test/ \
-       -p -b mps2_an521_ns -t run -- \
+       -p -b mps2/an521/cpu0/ns -t run -- \
        -DCONFIG_TFM_PSA_TEST_STORAGE=y
 
 Note that not all test suites are valid on all boards.
@@ -50,7 +50,7 @@ Following is an example based on ``west build``
 
    .. code-block:: bash
 
-      $ west build samples/tfm_integration/tfm_psa_test/ -p -b mps2_an521_ns -t run -- -DCONFIG_TFM_PSA_TEST_STORAGE=y
+      $ west build samples/tfm_integration/tfm_psa_test/ -p -b mps2/an521/cpu0/ns -t run -- -DCONFIG_TFM_PSA_TEST_STORAGE=y
 
 Sample Output
 =============

samples/tfm_integration/tfm_psa_test/sample.yaml

@@ -3,16 +3,16 @@ common:
     - trusted-firmware-m
     - mcuboot
   platform_allow:
-    - mps2_an521_ns
+    - mps2/an521/cpu0/ns
     - nrf5340dk_nrf5340_cpuapp_ns
     - nrf9160dk_nrf9160_ns
     - nrf9161dk_nrf9161_ns
-    - v2m_musca_s1_ns
+    - v2m_musca_s1/musca_s1/ns
   modules:
     - psa-arch-tests
     - tf-m-tests
   integration_platforms:
-    - mps2_an521_ns
+    - mps2/an521/cpu0/ns
   harness: console
   harness_config:
     type: multi_line

samples/tfm_integration/tfm_regression_test/README.rst

@@ -34,7 +34,7 @@ Following is an example based on ``west build``
 
    .. code-block:: bash
 
-      $ west build samples/tfm_integration/tfm_regression_test/ -p -b mps2_an521_ns -t run
+      $ west build samples/tfm_integration/tfm_regression_test/ -p -b mps2/an521/cpu0/ns -t run
 
 Sample Output
 =============

samples/tfm_integration/tfm_regression_test/sample.yaml

@@ -8,7 +8,7 @@ common:
     - nrf5340dk_nrf5340_cpuapp_ns
     - nrf9160dk_nrf9160_ns
     - nrf9161dk_nrf9161_ns
-    - v2m_musca_s1_ns
+    - v2m_musca_s1/musca_s1/ns
   integration_platforms:
     - nrf5340dk_nrf5340_cpuapp_ns
   harness: console

samples/tfm_integration/tfm_secure_partition/sample.yaml

@@ -2,12 +2,12 @@ common:
   tags:
     - trusted-firmware-m
   platform_allow:
-    - mps2_an521_ns
+    - mps2/an521/cpu0/ns
-    - v2m_musca_s1_ns
+    - v2m_musca_s1/musca_s1/ns
     - nrf5340dk_nrf5340_cpuapp_ns
     - nrf9160dk_nrf9160_ns
   integration_platforms:
-    - mps2_an521_ns
+    - mps2/an521/cpu0/ns
   harness: console
   harness_config:
     type: multi_line

samples/userspace/hello_world_user/sample.yaml

@@ -4,7 +4,7 @@ sample:
   name: hello world user
 common:
   integration_platforms:
-    - mps2_an385
+    - mps2/an385
   tags: introduction
   harness: console
   harness_config:

samples/userspace/prod_consumer/sample.yaml

@@ -3,7 +3,7 @@ sample:
   name: producer-consumer
 common:
   integration_platforms:
-    - mps2_an385
+    - mps2/an385
   tags: userspace
   harness: console
   harness_config:

samples/userspace/shared_mem/sample.yaml

@@ -4,7 +4,7 @@ sample:
   name: protected memory
 common:
   integration_platforms:
-    - mps2_an385
+    - mps2/an385
   tags: userspace
   harness: console
   harness_config:

tests/application_development/code_relocation/testcase.yaml

@@ -26,7 +26,7 @@ tests:
       - _CUSTOM_SECTION_NAME2
     platform_allow:
       - qemu_cortex_m3
-      - mps2_an385
+      - mps2/an385
       - sam_e70_xplained
     integration_platforms:
       - qemu_cortex_m3

tests/arch/arm/arm_irq_zero_latency_levels/testcase.yaml

@@ -9,8 +9,8 @@ tests:
   arch.arm.irq_zero_latency_levels:
     filter: not CONFIG_TRUSTED_EXECUTION_NONSECURE
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
   arch.arm.irq_zero_latency_levels.secure_fw:
     filter: CONFIG_TRUSTED_EXECUTION_SECURE
     integration_platforms:
-      - mps2_an521
+      - mps2/an521/cpu0

tests/arch/arm/arm_no_multithreading/testcase.yaml

@@ -8,8 +8,8 @@ tests:
     platform_allow:
       - qemu_cortex_m0
       - qemu_cortex_m3
-      - mps2_an385
+      - mps2/an385
-      - mps2_an521
+      - mps2/an521/cpu0
       - mps3/an547
       - nrf52840dk_nrf52840
       - nrf9160dk_nrf9160

tests/arch/arm/arm_sw_vector_relay/testcase.yaml

@@ -5,4 +5,4 @@ tests:
       - vector_relay
     arch_allow: arm
     integration_platforms:
-      - mps2_an385
+      - mps2/an385

tests/arch/arm/arm_thread_swap_tz/testcase.yaml

@@ -12,7 +12,7 @@ tests:
       - mps3/an547/ns
       - nucleo_l552ze_q/stm32l552xx/ns
     integration_platforms:
-      - mps2_an521_ns
+      - mps2/an521/cpu0/ns
   arch.arm.swap.tz_off:
     extra_configs:
       - CONFIG_ARM_NONSECURE_PREEMPTIBLE_SECURE_CALLS=n
@@ -21,4 +21,4 @@ tests:
       - mps3/an547/ns
       - nucleo_l552ze_q/stm32l552xx/ns
     integration_platforms:
-      - mps2_an521_ns
+      - mps2/an521/cpu0/ns

tests/arch/arm/arm_tz_wrap_func/testcase.yaml

@@ -7,4 +7,4 @@ tests:
       - tz_wrap_func
     filter: CONFIG_CPU_CORTEX_M
     integration_platforms:
-      - mps2_an385
+      - mps2/an385

tests/benchmarks/app_kernel/testcase.yaml

@@ -8,11 +8,11 @@ common:
 tests:
   benchmark.kernel.application:
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
       - qemu_x86
   benchmark.kernel.application.objcore.stats:
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
       - qemu_x86
     extra_configs:
       - CONFIG_OBJ_CORE=y
@@ -34,7 +34,7 @@ tests:
       - CONFIG_OBJ_CORE_STATS=y
   benchmark.kernel.application.timeslicing:
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
       - qemu_x86
     extra_configs:
       - CONFIG_TIMESLICING=y
@@ -42,7 +42,7 @@ tests:
     extra_args: CONF_FILE=prj_user.conf
     filter: CONFIG_ARCH_HAS_USERSPACE
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
       - qemu_x86
     extra_configs:
       - CONFIG_TIMESLICING=y

tests/benchmarks/cmsis_dsp/basicmath/testcase.yaml

@@ -12,11 +12,11 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
   benchmark.cmsis_dsp.basicmath.fpu:
     filter: CONFIG_CPU_HAS_FPU
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
       - mps3/an547
     tags:
       - fpu

tests/benchmarks/footprints/testcase.yaml

@@ -6,14 +6,14 @@ tests:
   benchmark.kernel.footprints.default:
     build_only: true
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
   benchmark.kernel.footprints.pm:
     tags:
       - pm
     build_only: true
     extra_args: CONF_FILE=prj_pm.conf
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
   benchmark.kernel.footprints.userspace:
     filter: CONFIG_ARCH_HAS_USERSPACE
     extra_args: CONF_FILE=prj_userspace.conf
@@ -25,4 +25,4 @@ tests:
       - userspace
     build_only: true
     integration_platforms:
-      - mps2_an385
+      - mps2/an385

tests/benchmarks/sched/testcase.yaml

@@ -4,7 +4,7 @@ tests:
       - benchmark
       - kernel
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
       - qemu_x86
     slow: true
     harness: console

tests/drivers/build_all/counter/testcase.yaml

@@ -5,6 +5,6 @@ common:
     - counter
 tests:
   drivers.counter.build.xlnx:
-    platform_allow: arty_a7_arm_designstart_m1
+    platform_allow: arty_a7/designstart_fpga_cortex_m1
     extra_configs:
       - CONFIG_COUNTER_XLNX_AXI_TIMER=y

tests/drivers/build_all/pwm/testcase.yaml

@@ -48,7 +48,7 @@ tests:
   drivers.pwm.xec.build:
     platform_allow: mec15xxevb_assy6853
   drivers.pwm.build.xlnx:
-    platform_allow: arty_a7_arm_designstart_m1
+    platform_allow: arty_a7/designstart_fpga_cortex_m1
   drivers.pwm.build.test:
     platform_allow: qemu_cortex_m3
   drivers.pwm.max31790.build:

tests/drivers/gpio/gpio_api_1pin/testcase.yaml

@@ -7,7 +7,7 @@ tests:
     min_flash: 48
     # Fix exclude when we can exclude just sim run
     platform_exclude:
-      - mps2_an385
+      - mps2/an385
-      - mps2_an521
+      - mps2/an521/cpu0
       - neorv32
     filter: dt_enabled_alias_with_parent_compat("led0", "gpio-leds")

tests/drivers/gpio/gpio_get_direction/testcase.yaml

@@ -7,7 +7,7 @@ tests:
     min_flash: 48
     # Fix exclude when we can exclude just sim run
     platform_exclude:
-      - mps2_an385
+      - mps2/an385
-      - mps2_an521
+      - mps2/an521/cpu0
       - neorv32
     filter: dt_enabled_alias_with_parent_compat("led0", "gpio-leds")

tests/drivers/sensor/generic/testcase.yaml

@@ -1,7 +1,7 @@
 common:
   integration_platforms:
     - qemu_x86
-    - mps2_an385
+    - mps2/an385
 tests:
   drivers.sensor.generic:
     tags:

tests/drivers/uart/uart_basic_api/testcase.yaml

@@ -6,7 +6,7 @@ tests:
     filter: CONFIG_UART_CONSOLE
     harness: keyboard
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
   drivers.uart.basic_api.wide:
     extra_configs:
       - CONFIG_UART_WIDE_DATA=y
@@ -26,7 +26,7 @@ tests:
     filter: CONFIG_UART_CONSOLE
     harness: keyboard
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
   drivers.uart.basic_api.shell:
     extra_args: CONF_FILE=prj_shell.conf
     min_flash: 64
@@ -36,7 +36,7 @@ tests:
     filter: CONFIG_UART_CONSOLE
     harness: keyboard
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
   drivers.uart.basic_api.cdc_acm:
     extra_args:
       - OVERLAY_CONFIG="overlay-usb.conf"

tests/kernel/fatal/exception/testcase.yaml

@@ -31,7 +31,7 @@ tests:
       - kernel
       - userspace
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
   kernel.common.stack_protection_armv8m_mpu_stack_guard:
     extra_args: CONF_FILE=prj_armv8m_mpu_stack_guard.conf
     filter: CONFIG_ARM_MPU and CONFIG_ARMV8_M_MAINLINE
@@ -40,7 +40,7 @@ tests:
       - kernel
       - userspace
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
   kernel.common.stack_sentinel:
     extra_args: CONF_FILE=sentinel.conf
     platform_exclude:

tests/kernel/threads/no-multithreading/testcase.yaml

@@ -5,8 +5,8 @@ tests:
     platform_allow:
       - qemu_cortex_m0
       - qemu_cortex_m3
-      - mps2_an385
+      - mps2/an385
-      - mps2_an521
+      - mps2/an521/cpu0
       - nrf52840dk_nrf52840
       - nrf9160dk_nrf9160
       - nrf51dk_nrf51422

tests/kernel/threads/thread_stack/testcase.yaml

@@ -7,7 +7,7 @@ tests:
     ignore_faults: true
     min_ram: 16
     integration_platforms:
-      - mps2_an521
+      - mps2/an521/cpu0
       - qemu_x86
   kernel.threads.armv8m_mpu_stack_guard:
     min_ram: 16
@@ -20,4 +20,4 @@ tests:
       - userspace
     ignore_faults: true
     integration_platforms:
-      - mps2_an521
+      - mps2/an521/cpu0

tests/kernel/timer/timer_monotonic/testcase.yaml

@@ -20,6 +20,6 @@ tests:
     tags:
       - kernel
       - timer
-    platform_allow: mps2_an385
+    platform_allow: mps2/an385
     extra_configs:
       - CONFIG_QEMU_ICOUNT=n

tests/kernel/usage/thread_runtime_stats/testcase.yaml

@@ -15,6 +15,6 @@ tests:
     filter: not CONFIG_SMP
     integration_platforms:
       - qemu_x86
-      - mps2_an385
+      - mps2/an385
     platform_exclude:
       - mr_canhubk3

tests/lib/c_lib/common/testcase.yaml

@@ -3,7 +3,7 @@ common:
     - clib
   ignore_faults: true
   integration_platforms:
-    - mps2_an385
+    - mps2/an385
 tests:
   libraries.libc.common: {}
   libraries.libc.common.minimal:

tests/lib/cmsis_dsp/bayes/testcase.yaml

@@ -5,7 +5,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags:
       - cmsis-dsp
@@ -15,7 +15,7 @@ tests:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_CPU_HAS_FPU
       and CONFIG_FULL_LIBC_SUPPORTED) or CONFIG_ARCH_POSIX
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
       - mps3/an547
     tags:
       - cmsis-dsp

tests/lib/cmsis_dsp/complexmath/testcase.yaml

@@ -5,7 +5,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
       - native_posix
     tags: cmsis-dsp
@@ -15,7 +15,7 @@ tests:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_CPU_HAS_FPU
       and CONFIG_FULL_LIBC_SUPPORTED) or CONFIG_ARCH_POSIX
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
       - mps3/an547
     tags:
       - cmsis-dsp

tests/lib/cmsis_dsp/distance/testcase.yaml

@@ -5,7 +5,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis_dsp
     min_flash: 64
@@ -14,7 +14,7 @@ tests:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_CPU_HAS_FPU
       and CONFIG_FULL_LIBC_SUPPORTED) or CONFIG_ARCH_POSIX
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
       - mps3/an547
     tags:
       - cmsis-dsp

tests/lib/cmsis_dsp/fastmath/testcase.yaml

@@ -5,7 +5,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis_dsp
     min_flash: 128
@@ -14,7 +14,7 @@ tests:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_CPU_HAS_FPU
       and CONFIG_FULL_LIBC_SUPPORTED) or CONFIG_ARCH_POSIX
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
       - mps3/an547
     tags:
       - cmsis-dsp

tests/lib/cmsis_dsp/filtering/testcase.yaml

@@ -13,7 +13,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis_dsp
     min_flash: 128
@@ -25,7 +25,7 @@ tests:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_CPU_HAS_FPU
       and CONFIG_FULL_LIBC_SUPPORTED) or CONFIG_ARCH_POSIX
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
       - mps3/an547
     tags:
       - cmsis-dsp
@@ -42,7 +42,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis-dsp
     min_flash: 128
@@ -54,7 +54,7 @@ tests:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_CPU_HAS_FPU
       and CONFIG_FULL_LIBC_SUPPORTED) or CONFIG_ARCH_POSIX
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
       - mps3/an547
     tags:
       - cmsis-dsp
@@ -71,7 +71,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis-dsp
     min_flash: 128
@@ -83,7 +83,7 @@ tests:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_CPU_HAS_FPU
       and CONFIG_FULL_LIBC_SUPPORTED) or CONFIG_ARCH_POSIX
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
       - mps3/an547
     tags:
       - cmsis-dsp
@@ -100,7 +100,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis-dsp
     min_flash: 256
@@ -112,7 +112,7 @@ tests:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_CPU_HAS_FPU
       and CONFIG_FULL_LIBC_SUPPORTED) or CONFIG_ARCH_POSIX
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
     platform_exclude:
       - mps3/an547
     tags:

tests/lib/cmsis_dsp/interpolation/testcase.yaml

@@ -5,7 +5,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis-dsp
     min_flash: 128
@@ -14,7 +14,7 @@ tests:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_CPU_HAS_FPU
       and CONFIG_FULL_LIBC_SUPPORTED) or CONFIG_ARCH_POSIX
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
       - mps3/an547
     tags:
       - cmsis-dsp

tests/lib/cmsis_dsp/matrix/testcase.yaml

@@ -10,7 +10,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis-dsp
     min_flash: 128
@@ -22,7 +22,7 @@ tests:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_CPU_HAS_FPU
       and CONFIG_FULL_LIBC_SUPPORTED) or CONFIG_ARCH_POSIX
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
       - mps3/an547
     tags:
       - cmsis-dsp
@@ -39,7 +39,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis-dsp
     min_flash: 128
@@ -51,7 +51,7 @@ tests:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_CPU_HAS_FPU
       and CONFIG_FULL_LIBC_SUPPORTED) or CONFIG_ARCH_POSIX
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
       - mps3/an547
     tags:
       - cmsis-dsp
@@ -68,7 +68,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis-dsp
     min_flash: 128
@@ -80,7 +80,7 @@ tests:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_CPU_HAS_FPU
       and CONFIG_FULL_LIBC_SUPPORTED) or CONFIG_ARCH_POSIX
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
       - mps3/an547
     tags:
       - cmsis-dsp
@@ -97,7 +97,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
     tags: cmsis-dsp
     min_flash: 128
     min_ram: 64
@@ -108,7 +108,7 @@ tests:
     filter: (CONFIG_CMSIS_DSP_FLOAT16 and (CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M)
       and CONFIG_CPU_HAS_FPU and CONFIG_FULL_LIBC_SUPPORTED)
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
       - mps3/an547
     tags:
       - cmsis-dsp
@@ -125,7 +125,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis-dsp
     min_flash: 128
@@ -137,7 +137,7 @@ tests:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_CPU_HAS_FPU
       and CONFIG_FULL_LIBC_SUPPORTED) or CONFIG_ARCH_POSIX
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
       - mps3/an547
     tags:
       - cmsis-dsp
@@ -154,7 +154,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis-dsp
     min_flash: 128
@@ -166,7 +166,7 @@ tests:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_CPU_HAS_FPU
       and CONFIG_FULL_LIBC_SUPPORTED) or CONFIG_ARCH_POSIX
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
       - mps3/an547
     tags:
       - cmsis-dsp
@@ -183,7 +183,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis-dsp
     platform_exclude: frdm_kw41z
@@ -196,7 +196,7 @@ tests:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_CPU_HAS_FPU
       and CONFIG_FULL_LIBC_SUPPORTED) or CONFIG_ARCH_POSIX
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
       - mps3/an547
     tags:
       - cmsis-dsp
@@ -214,7 +214,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis-dsp
     platform_exclude: frdm_kw41z
@@ -227,7 +227,7 @@ tests:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_CPU_HAS_FPU
       and CONFIG_FULL_LIBC_SUPPORTED) or CONFIG_ARCH_POSIX
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
       - mps3/an547
     tags:
       - cmsis-dsp
@@ -245,7 +245,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis-dsp
     platform_exclude: frdm_kw41z
@@ -258,7 +258,7 @@ tests:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_CPU_HAS_FPU
       and CONFIG_FULL_LIBC_SUPPORTED) or CONFIG_ARCH_POSIX
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
       - mps3/an547
     tags:
       - cmsis-dsp
@@ -276,7 +276,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
     tags: cmsis-dsp
     min_flash: 128
     min_ram: 144
@@ -287,7 +287,7 @@ tests:
     filter: (CONFIG_CMSIS_DSP_FLOAT16 and (CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M)
       and CONFIG_CPU_HAS_FPU and CONFIG_FULL_LIBC_SUPPORTED)
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
       - mps3/an547
     tags:
       - cmsis-dsp
@@ -304,7 +304,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis-dsp
     platform_exclude: frdm_kw41z
@@ -317,7 +317,7 @@ tests:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_CPU_HAS_FPU
       and CONFIG_FULL_LIBC_SUPPORTED) or CONFIG_ARCH_POSIX
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
       - mps3/an547
     tags:
       - cmsis-dsp
@@ -335,7 +335,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis-dsp
     platform_exclude: frdm_kw41z
@@ -348,7 +348,7 @@ tests:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_CPU_HAS_FPU
       and CONFIG_FULL_LIBC_SUPPORTED) or CONFIG_ARCH_POSIX
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
       - mps3/an547
     tags:
       - cmsis-dsp

tests/lib/cmsis_dsp/quaternionmath/testcase.yaml

@@ -5,7 +5,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis-dsp
     min_flash: 128
@@ -14,7 +14,7 @@ tests:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_CPU_HAS_FPU
       and CONFIG_FULL_LIBC_SUPPORTED) or CONFIG_ARCH_POSIX
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
       - mps3/an547
     tags:
       - cmsis-dsp

tests/lib/cmsis_dsp/statistics/testcase.yaml

@@ -5,7 +5,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis-dsp
     min_flash: 128
@@ -15,7 +15,7 @@ tests:
       and CONFIG_CPU_HAS_FPU
       and CONFIG_FULL_LIBC_SUPPORTED) or CONFIG_ARCH_POSIX
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
       - mps3/an547
     tags:
       - cmsis-dsp

tests/lib/cmsis_dsp/support/testcase.yaml

@@ -5,7 +5,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis-dsp
     min_flash: 128
@@ -14,7 +14,7 @@ tests:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_CPU_HAS_FPU
       and CONFIG_FULL_LIBC_SUPPORTED) or CONFIG_ARCH_POSIX
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
       - mps3/an547
     tags:
       - cmsis-dsp

tests/lib/cmsis_dsp/svm/testcase.yaml

@@ -5,7 +5,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis-dsp
     min_flash: 128
@@ -14,7 +14,7 @@ tests:
     filter: ((CONFIG_CPU_AARCH32_CORTEX_R or CONFIG_CPU_CORTEX_M) and CONFIG_CPU_HAS_FPU
       and CONFIG_FULL_LIBC_SUPPORTED) or CONFIG_ARCH_POSIX
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
       - mps3/an547
     tags:
       - cmsis-dsp

tests/lib/cmsis_dsp/transform/testcase.yaml

@@ -10,7 +10,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis-dsp
     min_flash: 512
@@ -38,7 +38,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis-dsp
     min_flash: 512
@@ -66,7 +66,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis-dsp
     min_flash: 1024
@@ -92,7 +92,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis-dsp
     min_flash: 1024
@@ -118,7 +118,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
     tags: cmsis-dsp
     min_flash: 512
     min_ram: 64
@@ -145,7 +145,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
     tags: cmsis-dsp
     min_flash: 512
     min_ram: 64
@@ -172,7 +172,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis-dsp
     min_flash: 1024
@@ -198,7 +198,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis-dsp
     min_flash: 512
@@ -226,7 +226,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis-dsp
     min_flash: 1024
@@ -252,7 +252,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: cmsis-dsp
     min_flash: 1024

tests/lib/cmsis_nn/testcase.yaml

@@ -4,7 +4,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
     tags: cmsis_nn
     min_flash: 64
     min_ram: 32

tests/lib/cpp/cxx/testcase.yaml

@@ -2,7 +2,7 @@ common:
   tags: cpp
   toolchain_exclude: xcc
   integration_platforms:
-    - mps2_an385
+    - mps2/an385
     - qemu_cortex_a53
 
 tests:

tests/lib/cpp/libcxx/testcase.yaml

@@ -10,7 +10,7 @@ tests:
       - CONFIG_GLIBCXX_LIBCPP=y
       - CONFIG_CPP_EXCEPTIONS=y
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
   cpp.libcxx.glibcxx.newlib_nano:
     filter: TOOLCHAIN_HAS_NEWLIB == 1
     toolchain_exclude: xcc
@@ -22,7 +22,7 @@ tests:
       - CONFIG_NEWLIB_LIBC_NANO=y
       - CONFIG_GLIBCXX_LIBCPP=y
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
   cpp.libcxx.glibcxx.picolibc:
     filter: TOOLCHAIN_HAS_PICOLIBC == 1
     toolchain_exclude: xcc
@@ -33,7 +33,7 @@ tests:
       - CONFIG_GLIBCXX_LIBCPP=y
       - CONFIG_CPP_EXCEPTIONS=y
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
   cpp.libcxx.arcmwdtlib:
     toolchain_allow: arcmwdt
     min_flash: 54

tests/lib/heap/src/main.c

@@ -14,7 +14,7 @@
  */
 
 #if defined(CONFIG_SOC_MPS2_AN521) && defined(CONFIG_QEMU_TARGET)
-/* mps2_an521 blows up if allowed to link into large area, even though
+/* mps2/an521 blows up if allowed to link into large area, even though
  * the link is successful and it claims the memory is there.  We get
  * hard faults on boot in qemu before entry to cstart() once MEMSZ is
  * allowed to get near 256kb.

tests/lib/heap_align/testcase.yaml

@@ -5,4 +5,4 @@ tests:
       - heap_align
     integration_platforms:
       - native_sim
-      - mps2_an521
+      - mps2/an521/cpu0

tests/lib/newlib/heap_listener/testcase.yaml

@@ -6,5 +6,5 @@ tests:
     filter: TOOLCHAIN_HAS_NEWLIB == 1
     arch_exclude: posix
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
       - qemu_x86

tests/lib/newlib/thread_safety/testcase.yaml

@@ -5,7 +5,7 @@ common:
     - clib
     - newlib
   integration_platforms:
-    - mps2_an521
+    - mps2/an521/cpu0
     - qemu_x86
 tests:
   libraries.libc.newlib.thread_safety:

tests/lib/shared_multi_heap/testcase.yaml

@@ -5,7 +5,7 @@ tests:
   libraries.shared_multi_heap:
     platform_allow:
       - qemu_cortex_a53
-      - mps2_an521
+      - mps2/an521/cpu0
     integration_platforms:
       - qemu_cortex_a53
     tags:

tests/lib/time/testcase.yaml

@@ -3,7 +3,7 @@ tests:
     tags: libc
     timeout: 180
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
     platform_exclude:
       - native_posix
       - native_posix_64

tests/modules/thrift/ThriftTest/testcase.yaml

@@ -8,7 +8,7 @@ common:
   # qemu_x86 exluded due to missing long double functions in SDK
   # See https://github.com/zephyrproject-rtos/sdk-ng/issues/603
   platform_allow:
-    - mps2_an385
+    - mps2/an385
     - qemu_cortex_a53
     - qemu_riscv32
     - qemu_riscv64

tests/net/lib/dns_sd/prj-no-ipv6.conf

@@ -24,5 +24,5 @@ CONFIG_DNS_SD_LOG_LEVEL_DBG=y
 CONFIG_ZTEST=y
 CONFIG_ZTEST_STACK_SIZE=2048
 
-# Maybe avoid stack overflow on mps2_an385?
+# Maybe avoid stack overflow on mps2/an385?
 CONFIG_MAIN_STACK_SIZE=2048

tests/net/lib/dns_sd/prj.conf

@@ -17,7 +17,7 @@ CONFIG_DNS_SD_LOG_LEVEL_DBG=y
 CONFIG_ZTEST=y
 CONFIG_ZTEST_STACK_SIZE=2048
 
-# Maybe avoid stack overflow on mps2_an385?
+# Maybe avoid stack overflow on mps2/an385?
 CONFIG_MAIN_STACK_SIZE=2048
 
 CONFIG_NET_MAX_CONTEXTS=8

tests/net/socket/poll/testcase.yaml

@@ -1,9 +1,9 @@
 common:
   depends_on: netif
-  # FIXME: This test fails very frequently on mps2_an385 due to the system
+  # FIXME: This test fails very frequently on mps2/an385 due to the system
   #        timer stability issues, so keep it disabled until the root cause
   #        is fixed (GitHub issue zephyrproject-rtos/zephyr#48608).
-  platform_exclude: mps2_an385
+  platform_exclude: mps2/an385
 tests:
   net.socket.poll:
     min_ram: 21

tests/net/socket/reuseaddr_reuseport/testcase.yaml

@@ -5,10 +5,10 @@ common:
   tags:
     - net
     - socket
-  # FIXME: This test fails very frequently on mps2_an385 due to the system
+  # FIXME: This test fails very frequently on mps2/an385 due to the system
   #        timer stability issues, so keep it disabled until the root cause
   #        is fixed (GitHub issue zephyrproject-rtos/zephyr#48608).
-  platform_exclude: mps2_an385
+  platform_exclude: mps2/an385
 tests:
   net.socket.reuseaddr_reuseport:
     extra_configs:

tests/net/socket/select/testcase.yaml

@@ -6,10 +6,10 @@ common:
     - socket
     - userspace
   filter: CONFIG_FULL_LIBC_SUPPORTED
-  # FIXME: This test fails very frequently on mps2_an385 due to the system
+  # FIXME: This test fails very frequently on mps2/an385 due to the system
   #        timer stability issues, so keep it disabled until the root cause
   #        is fixed (GitHub issue zephyrproject-rtos/zephyr#48608).
-  platform_exclude: mps2_an385
+  platform_exclude: mps2/an385
 tests:
   net.socket.select:
     extra_configs:

tests/net/socket/service/testcase.yaml

@@ -1,11 +1,11 @@
 common:
   depends_on: netif
-  # FIXME: This test fails very frequently on mps2_an385 due to the system
+  # FIXME: This test fails very frequently on mps2/an385 due to the system
   #        timer stability issues, so keep it disabled until the root cause
   #        is fixed (GitHub issue zephyrproject-rtos/zephyr#48608).
   # eventfd API does not work with native_posix so exclude it here
   platform_exclude:
-    - mps2_an385
+    - mps2/an385
     - native_posix
     - native_posix_64
 tests:

tests/net/socket/tcp/testcase.yaml

@@ -7,10 +7,10 @@ common:
     - userspace
   filter: CONFIG_FULL_LIBC_SUPPORTED
   timeout: 180
-  # FIXME: This test fails very frequently on mps2_an385 due to the system
+  # FIXME: This test fails very frequently on mps2/an385 due to the system
   #        timer stability issues, so keep it disabled until the root cause
   #        is fixed (GitHub issue zephyrproject-rtos/zephyr#48608).
-  platform_exclude: mps2_an385
+  platform_exclude: mps2/an385
 tests:
   net.socket.tcp:
     extra_configs:

tests/net/socket/tls/testcase.yaml

@@ -17,4 +17,4 @@ tests:
   net.socket.tls.preempt:
     extra_configs:
       - CONFIG_NET_TC_THREAD_PREEMPTIVE=y
-    platform_exclude: mps2_an385
+    platform_exclude: mps2/an385

tests/posix/common/testcase.yaml

@@ -81,7 +81,7 @@ tests:
     extra_configs:
       - CONFIG_SPIN_VALIDATE=n
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
   portability.posix.common.signal.strsignal_no_desc:
     extra_configs:
       - CONFIG_POSIX_SIGNAL_STRING_DESC=n

tests/subsys/dsp/basicmath/testcase.yaml

@@ -4,7 +4,7 @@ tests:
     integration_platforms:
       - frdm_k64f
       - sam_e70_xplained
-      - mps2_an521
+      - mps2/an521/cpu0
       - native_sim
     tags: zdsp
     min_flash: 128
@@ -12,7 +12,7 @@ tests:
   zdsp.basicmath.fpu:
     filter: (CONFIG_CPU_HAS_FPU and CONFIG_FULL_LIBC_SUPPORTED) or CONFIG_ARCH_POSIX
     integration_platforms:
-      - mps2_an521_remote
+      - mps2/an521/cpu1
       - mps3/an547
     tags:
       - zdsp

tests/subsys/logging/log_switch_format/testcase.yaml

@@ -13,7 +13,7 @@ common:
 tests:
   logging.format.switch.deferred:
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
       - qemu_x86
     extra_args: OVERLAY_CONFIG=overlay_deferred.conf
     # "CONFIG_FULL_LIBC_SUPPORTED" filter was applied
@@ -28,7 +28,7 @@ tests:
   logging.format.switch.immediate:
     extra_args: OVERLAY_CONFIG=overlay_immediate.conf
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
       - qemu_x86
     filter: CONFIG_FULL_LIBC_SUPPORTED
     extra_configs:
@@ -36,7 +36,7 @@ tests:
   logging.format.switch.custom_output:
     extra_args: OVERLAY_CONFIG=overlay_custom_output.conf
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
       - qemu_x86
     filter: CONFIG_FULL_LIBC_SUPPORTED
     extra_configs:

tests/subsys/logging/log_syst/testcase.yaml

@@ -18,7 +18,7 @@ tests:
     # Not all compilers announced in Zephyr support full libc
     filter: CONFIG_FULL_LIBC_SUPPORTED
     integration_platforms:
-      - mps2_an385
+      - mps2/an385
       - qemu_x86
       - sam_e70_xplained
     extra_configs: