boards: mimxrt1060_evk: Convert to variants

Convert qspi and hyperflash to variants instead of revisions by popular demand. And convert evkb into a revision instead of a different board. Signed-off-by: Declan Snyder <[email protected]>
zephyrproject-rtos · Nov 21, 2024 · 4fa9fde · 4fa9fde
1 parent 0e8fc3f
commit 4fa9fde
Show file tree

Hide file tree

Showing 60 changed files with 70 additions and 65 deletions.
diff --git a/boards/nxp/mimxrt1060_evk/CMakeLists.txt b/boards/nxp/mimxrt1060_evk/CMakeLists.txt
@@ -12,7 +12,7 @@ endif()
 
 if(CONFIG_NXP_IMXRT_BOOT_HEADER)
   zephyr_library()
-  if(CONFIG_BOARD_MIMXRT1060_EVKB)
+  if(${BOARD_REVISION} STREQUAL "B")
     set(FLASH_CONF evkbmimxrt1060_flexspi_nor_config.c)
     set(BOARD_NAME evkbmimxrt1060)
   elseif(CONFIG_DT_HAS_NXP_IMX_FLEXSPI_NOR_ENABLED)

diff --git a/boards/nxp/mimxrt1060_evk/Kconfig.defconfig b/boards/nxp/mimxrt1060_evk/Kconfig.defconfig
@@ -3,7 +3,7 @@
 # Copyright 2018,2023 NXP
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_MIMXRT1060_EVK || BOARD_MIMXRT1060_EVKB
+if BOARD_MIMXRT1060_EVK
 
 config DEVICE_CONFIGURATION_DATA
 	default y
@@ -25,4 +25,4 @@ endif # ETH_MCUX
 
 endif # NETWORKING
 
-endif # BOARD_MIMXRT1060_EVK || BOARD_MIMXRT1060_EVKB
+endif # BOARD_MIMXRT1060_EVK
diff --git a/boards/nxp/mimxrt1060_evk/Kconfig.mimxrt1060_evkb b/boards/nxp/mimxrt1060_evk/Kconfig.mimxrt1060_evkb
diff --git a/boards/nxp/mimxrt1060_evk/board.cmake b/boards/nxp/mimxrt1060_evk/board.cmake
@@ -4,13 +4,19 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
+if (NOT ("${BOARD_QUALIFIERS}" MATCHES "qspi"
+      OR "${BOARD_QUALIFIERS}" MATCHES "hyperflash"))
+  message(FATAL_ERROR "Please specify a board flash variant for the mimxrt1060_evk:\n"
+                      "mimxrt1060_evk//qspi or mimxrt1060_evk//hyperflash\n")
+endif()
+
 board_runner_args(pyocd "--target=mimxrt1060")
 board_runner_args(jlink "--device=MIMXRT1062xxx6A")
 board_runner_args(linkserver  "--device=MIMXRT1062xxxxA:EVK-MIMXRT1060")
 
-if (("${BOARD_REVISION}" STREQUAL "qspi") OR CONFIG_BOARD_MIMXRT1060_EVKB)
+if (("${BOARD_QUALIFIERS}" MATCHES "qspi") OR ("${BOARD_REVISION}" STREQUAL "B"))
   board_runner_args(jlink "--loader=BankAddr=0x60000000&Loader=QSPI")
-elseif ("${BOARD_REVISION}" STREQUAL "hyperflash")
+elseif ("${BOARD_QUALIFIERS}" MATCHES "hyperflash")
   board_runner_args(jlink "--loader=BankAddr=0x60000000&Loader=HyperFlash")
 endif()
 

diff --git a/boards/nxp/mimxrt1060_evk/board.yml b/boards/nxp/mimxrt1060_evk/board.yml
@@ -2,16 +2,14 @@ boards:
   - name: mimxrt1060_evk
     full_name: MIMXRT1060-EVK
     vendor: nxp
-    revision:
-      format: "custom"
-      default: "qspi"
-      revisions:
-        - name: "qspi"
-        - name: "hyperflash"
-    socs:
-      - name: mimxrt1062
-  - name: mimxrt1060_evkb
-    full_name: MIMXRT1060-EVKB
-    vendor: nxp
     socs:
       - name: mimxrt1062
+        variants:
+          - name: "qspi"
+          - name: "hyperflash"
+    revision:
+      format: "letter"
+      default: "A"
+      revisions:
+        - name: "A"
+        - name: "B"
diff --git a/boards/nxp/mimxrt1060_evk/doc/index.rst b/boards/nxp/mimxrt1060_evk/doc/index.rst
@@ -150,7 +150,7 @@ already supported, which can also be re-used on this mimxrt1060_evk board:
 +-----------+------------+-------------------------------------+
 
 The default configuration can be found in
-:zephyr_file:`boards/nxp/mimxrt1060_evk/mimxrt1060_evk_defconfig`
+:zephyr_file:`boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi_defconfig`
 
 Other hardware features are not currently supported by the port.
 

diff --git a/boards/nxp/mimxrt1060_evk/mimxrt1060_evk.dts → ...ds/nxp/mimxrt1060_evk/mimxrt1060_evk.dtsi b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk.dts → ...ds/nxp/mimxrt1060_evk/mimxrt1060_evk.dtsi
diff --git a/.../mimxrt1060_evk/mimxrt1060_evkb_defconfig → ...evk/mimxrt1060_evk_mimxrt1062_B_defconfig b/.../mimxrt1060_evk/mimxrt1060_evkb_defconfig → ...evk/mimxrt1060_evk_mimxrt1062_B_defconfig
diff --git a/...xrt1060_evk_mimxrt1062_hyperflash.overlay → .../mimxrt1060_evk_mimxrt1062_hyperflash.dts b/...xrt1060_evk_mimxrt1062_hyperflash.overlay → .../mimxrt1060_evk_mimxrt1062_hyperflash.dts
@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include "mimxrt1060_evk.dtsi"
+
 / {
 	chosen {
 		zephyr,flash-controller = &s26ks512s0;

diff --git a/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_hyperflash.yaml b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_hyperflash.yaml
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-identifier: mimxrt1060_evk@hyperflash
+identifier: mimxrt1060_evk/mimxrt1062/hyperflash
 name: NXP MIMXRT1060-EVK-HYPERFLASH
 type: mcu
 arch: arm

diff --git a/...p/mimxrt1060_evk/mimxrt1060_evk_defconfig → ...t1060_evk_mimxrt1062_hyperflash_defconfig b/...p/mimxrt1060_evk/mimxrt1060_evk_defconfig → ...t1060_evk_mimxrt1062_hyperflash_defconfig
diff --git a/...vk/mimxrt1060_evk_mimxrt1062_qspi.overlay → ...60_evk/mimxrt1060_evk_mimxrt1062_qspi.dts b/...vk/mimxrt1060_evk_mimxrt1062_qspi.overlay → ...60_evk/mimxrt1060_evk_mimxrt1062_qspi.dts
@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include "mimxrt1060_evk.dtsi"
+
 / {
 	chosen {
 		zephyr,flash-controller = &is25wp064;

diff --git a/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi.yaml b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi.yaml
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-identifier: mimxrt1060_evk
+identifier: mimxrt1060_evk/mimxrt1062/qspi
 name: NXP MIMXRT1060-EVK
 type: mcu
 arch: arm

diff --git a/...ds/nxp/mimxrt1060_evk/mimxrt1060_evkb.dts → .../mimxrt1060_evk_mimxrt1062_qspi_B.overlay b/...ds/nxp/mimxrt1060_evk/mimxrt1060_evkb.dts → .../mimxrt1060_evk_mimxrt1062_qspi_B.overlay
@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "mimxrt1060_evk.dts"
-#include "mimxrt1060_evk_mimxrt1062_qspi.overlay"
-
 /* FLEXPWM not routed to LED on this EVK */
 &flexpwm2_pwm3 {
 	status = "disabled";

diff --git a/...s/nxp/mimxrt1060_evk/mimxrt1060_evkb.yaml → ...evk/mimxrt1060_evk_mimxrt1062_qspi_B.yaml b/...s/nxp/mimxrt1060_evk/mimxrt1060_evkb.yaml → ...evk/mimxrt1060_evk_mimxrt1062_qspi_B.yaml
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-identifier: mimxrt1060_evkb
+identifier: mimxrt1060_evk@B/mimxrt1062/qspi
 name: NXP MIMXRT1060-EVKB
 type: mcu
 arch: arm

diff --git a/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi_defconfig b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi_defconfig
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2018, NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_GPIO=y
+CONFIG_ARM_MPU=y
+CONFIG_HW_STACK_PROTECTION=y
+CONFIG_PINCTRL=y
diff --git a/boards/nxp/mimxrt1060_evk/revision.cmake b/boards/nxp/mimxrt1060_evk/revision.cmake
diff --git a/samples/bluetooth/peripheral_ht/sample.yaml b/samples/bluetooth/peripheral_ht/sample.yaml
@@ -17,7 +17,7 @@ tests:
     platform_allow:
       - mimxrt1020_evk
       - mimxrt1050_evk/mimxrt1052/hyperflash
-      - mimxrt1060_evk
+      - mimxrt1060_evk/mimxrt1062/qspi
       - frdm_k64f
     tags: bluetooth
     extra_args: SHIELD=frdm_kw41z

diff --git a/samples/boards/nxp/mimxrt1060_evk/system_off/sample.yaml b/samples/boards/nxp/mimxrt1060_evk/system_off/sample.yaml
@@ -6,7 +6,7 @@ tests:
   sample.boards.mimxrt1060_evk.system_off:
     build_only: true
     platform_allow:
-      - mimxrt1060_evk
-      - mimxrt1060_evkb
+      - mimxrt1060_evk/mimxrt1062/qspi
+      - mimxrt1060_evk@B
     integration_platforms:
-      - mimxrt1060_evk
+      - mimxrt1060_evk/mimxrt1062/qspi
diff --git a/.../adc/adc_dt/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay b/.../adc/adc_dt/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay
diff --git a/samples/drivers/display/sample.yaml b/samples/drivers/display/sample.yaml
@@ -49,7 +49,7 @@ tests:
   sample.display.rk043fn02h_ct:
     platform_allow:
       - mimxrt1064_evk
-      - mimxrt1060_evk
+      - mimxrt1060_evk/mimxrt1062/qspi
       - mimxrt1050_evk/mimxrt1052/hyperflash
       - mimxrt1040_evk
     tags: display

diff --git a/samples/drivers/i2s/output/README.rst b/samples/drivers/i2s/output/README.rst
@@ -31,6 +31,6 @@ To build and flash the application:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/drivers/i2s/output
-   :board: mimxrt1060_evkb
+   :board: mimxrt1060_evk@B
    :goals: build flash
    :compact:
diff --git a/...i2s/output/boards/mimxrt1060_evkb.overlay → .../mimxrt1060_evk_mimxrt1062_qspi_B.overlay b/...i2s/output/boards/mimxrt1060_evkb.overlay → .../mimxrt1060_evk_mimxrt1062_qspi_B.overlay
diff --git a/samples/subsys/display/lvgl/sample.yaml b/samples/subsys/display/lvgl/sample.yaml
@@ -73,7 +73,7 @@ tests:
   samples.subsys.display.lvgl.rk043fn66hs_ctg:
     platform_allow:
       - mimxrt1064_evk
-      - mimxrt1060_evk
+      - mimxrt1060_evk/mimxrt1062/qspi
       - mimxrt1050_evk/mimxrt1052/hyperflash
       - mimxrt1040_evk
     tags: display
@@ -84,7 +84,7 @@ tests:
   samples.subsys.display.lvgl.rk043fn02h_ct:
     platform_allow:
       - mimxrt1064_evk
-      - mimxrt1060_evk
+      - mimxrt1060_evk/mimxrt1062/qspi
       - mimxrt1050_evk/mimxrt1052/hyperflash
       - mimxrt1040_evk
     tags: display

diff --git a/samples/subsys/fs/littlefs/sample.yaml b/samples/subsys/fs/littlefs/sample.yaml
@@ -12,7 +12,7 @@ tests:
       - particle_xenon
       - disco_l475_iot1
       - mimxrt685_evk/mimxrt685s/cm33
-      - mimxrt1060_evk
+      - mimxrt1060_evk/mimxrt1062/qspi
       - mimxrt1064_evk
       - qemu_x86
       - native_sim

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
@@ -69,7 +69,7 @@ tests:
       - mimxrt1024_evk
       - mimxrt1040_evk
       - mimxrt1050_evk/mimxrt1052/hyperflash
-      - mimxrt1060_evk
+      - mimxrt1060_evk/mimxrt1062/qspi
       - mimxrt1062_fmurt6
       - mimxrt1064_evk
       - mimxrt1160_evk/mimxrt1166/cm7
@@ -127,7 +127,7 @@ tests:
       - mimxrt1024_evk
       - mimxrt1040_evk
       - mimxrt1050_evk/mimxrt1052/hyperflash
-      - mimxrt1060_evk
+      - mimxrt1060_evk/mimxrt1062/qspi
       - mimxrt1062_fmurt6
       - mimxrt1064_evk
       - mimxrt1160_evk/mimxrt1166/cm7
@@ -141,7 +141,7 @@ tests:
       - mg100
     integration_platforms:
       - nrf52840dk/nrf52840
-      - mimxrt1060_evk
+      - mimxrt1060_evk/mimxrt1062/qspi
       - mimxrt1064_evk
   sample.mcumgr.smp_svr.shell_mgmt:
     extra_args: EXTRA_CONF_FILE="overlay-shell-mgmt.conf"

diff --git a/samples/subsys/shell/fs/sample.yaml b/samples/subsys/shell/fs/sample.yaml
@@ -10,7 +10,7 @@ tests:
   sample.filesystem.shell:
     platform_allow:
       - reel_board
-      - mimxrt1060_evk
+      - mimxrt1060_evk/mimxrt1062/qspi
       - mr_canhubk3
       - native_sim
     integration_platforms:

diff --git a/samples/subsys/usb/cdc_acm/sample.yaml b/samples/subsys/usb/cdc_acm/sample.yaml
@@ -21,7 +21,7 @@ tests:
       - stm32f723e_disco
       - nucleo_f413zh
       - mimxrt685_evk/mimxrt685s/cm33
-      - mimxrt1060_evk
+      - mimxrt1060_evk/mimxrt1062/qspi
     harness: console
     harness_config:
       type: one_line

diff --git a/samples/subsys/usb/dfu/sample.yaml b/samples/subsys/usb/dfu/sample.yaml
@@ -8,6 +8,7 @@ common:
     - mimxrt1010_evk
     - mimxrt1020_evk
     - mimxrt1015_evk
+    - mimxrt1060_evk/mimxrt1062/qspi
     - sam4l_ek
     - mimxrt1050_evk/mimxrt1052/hyperflash
     - mimxrt1050_evk/mimxrt1052/qspi

diff --git a/samples/subsys/usb/hid-keyboard/sample.yaml b/samples/subsys/usb/hid-keyboard/sample.yaml
@@ -13,7 +13,7 @@ common:
     - stm32f723e_disco
     - nucleo_f413zh
     - mimxrt685_evk/mimxrt685s/cm33
-    - mimxrt1060_evk
+    - mimxrt1060_evk/mimxrt1062/qspi
 tests:
   sample.usbd.hid-keyboard:
     tags: usb

diff --git a/samples/subsys/usb/hid-mouse/sample.yaml b/samples/subsys/usb/hid-mouse/sample.yaml
@@ -22,7 +22,7 @@ tests:
       - stm32f723e_disco
       - nucleo_f413zh
       - mimxrt685_evk/mimxrt685s/cm33
-      - mimxrt1060_evk
+      - mimxrt1060_evk/mimxrt1062/qspi
     extra_args:
       - CONF_FILE="usbd_next_prj.conf"
       - EXTRA_DTC_OVERLAY_FILE="usbd_next.overlay"

diff --git a/samples/subsys/usb/mass/sample.yaml b/samples/subsys/usb/mass/sample.yaml
@@ -29,7 +29,7 @@ tests:
       - stm32f723e_disco
       - nucleo_f413zh
       - mimxrt685_evk/mimxrt685s/cm33
-      - mimxrt1060_evk
+      - mimxrt1060_evk/mimxrt1062/qspi
     extra_args:
       - CONF_FILE="usbd_next_prj.conf"
       - EXTRA_DTC_OVERLAY_FILE="ramdisk.overlay"

diff --git a/samples/subsys/usb/shell/sample.yaml b/samples/subsys/usb/shell/sample.yaml
@@ -10,7 +10,7 @@ tests:
       - nrf54h20dk/nrf54h20/cpuapp
       - frdm_k64f
       - mimxrt685_evk/mimxrt685s/cm33
-      - mimxrt1060_evk
+      - mimxrt1060_evk/mimxrt1062/qspi
     harness: keyboard
     tags: usb
   sample.usbh.shell:

diff --git a/tests/application_development/code_relocation/testcase.yaml b/tests/application_development/code_relocation/testcase.yaml
@@ -7,7 +7,7 @@ tests:
     extra_configs:
       - CONFIG_RELOCATE_TO_ITCM=y
     platform_allow:
-      - mimxrt1060_evk
+      - mimxrt1060_evk/mimxrt1062/qspi
   application_development.code_relocation_kinetis:
     filter: CONFIG_CPU_HAS_NXP_MPU
     arch_allow: arm

diff --git a/...tooth/shell/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay b/...tooth/shell/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay
diff --git a/tests/boot/test_mcuboot/testcase.yaml b/tests/boot/test_mcuboot/testcase.yaml
@@ -32,7 +32,7 @@ tests:
       - mimxrt1024_evk
       - mimxrt1040_evk
       - mimxrt1050_evk/mimxrt1052/hyperflash
-      - mimxrt1060_evk
+      - mimxrt1060_evk/mimxrt1062/qspi
       - mimxrt1062_fmurt6
       - mimxrt1064_evk
       - mimxrt1160_evk/mimxrt1166/cm7

diff --git a/...adc/adc_api/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay b/...adc/adc_api/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay
diff --git a/...dc/adc_api/boards/mimxrt1060_evkb.overlay → .../mimxrt1060_evk_mimxrt1062_qspi_B.overlay b/...dc/adc_api/boards/mimxrt1060_evkb.overlay → .../mimxrt1060_evk_mimxrt1062_qspi_B.overlay
diff --git a/...r_basic_api/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay b/...r_basic_api/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay
diff --git a/tests/drivers/disk/disk_access/testcase.yaml b/tests/drivers/disk/disk_access/testcase.yaml
@@ -10,7 +10,7 @@ tests:
       - CONFIG_DISK_DRIVER_SDMMC=y
     tags: mcux
     integration_platforms:
-      - mimxrt1060_evk
+      - mimxrt1060_evk/mimxrt1062/qspi
       - mimxrt1050_evk/mimxrt1052/hyperflash
       - mimxrt1064_evk
   drivers.disk.ram:

diff --git a/...en_transfer/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay b/...en_transfer/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay
diff --git a/...n_transfer/boards/mimxrt1060_evkb.overlay → .../mimxrt1060_evk_mimxrt1062_qspi_B.overlay b/...n_transfer/boards/mimxrt1060_evkb.overlay → .../mimxrt1060_evk_mimxrt1062_qspi_B.overlay
diff --git a/...nk_transfer/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay b/...nk_transfer/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay
diff --git a/tests/drivers/dma/chan_link_transfer/testcase.yaml b/tests/drivers/dma/chan_link_transfer/testcase.yaml
@@ -10,7 +10,7 @@ tests:
       - mimxrt595_evk/mimxrt595s/cm33
       - mimxrt1010_evk
       - mimxrt1050_evk/mimxrt1052/hyperflash
-      - mimxrt1060_evk
+      - mimxrt1060_evk/mimxrt1062/qspi
       - mimxrt1064_evk
       - mimxrt1160_evk/mimxrt1166/cm7
       - mimxrt1170_evk/mimxrt1176/cm7

diff --git a/...op_transfer/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay b/...op_transfer/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay
diff --git a/...p_transfer/boards/mimxrt1060_evkb.overlay → .../mimxrt1060_evk_mimxrt1062_qspi_B.overlay b/...p_transfer/boards/mimxrt1060_evkb.overlay → .../mimxrt1060_evk_mimxrt1062_qspi_B.overlay
diff --git a/...tter_gather/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay b/...tter_gather/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay
diff --git a/tests/drivers/dma/scatter_gather/testcase.yaml b/tests/drivers/dma/scatter_gather/testcase.yaml
@@ -8,7 +8,7 @@ tests:
       - intel_adsp/cavs25
       - frdm_k64f
       - mimxrt1010_evk
-      - mimxrt1060_evk
+      - mimxrt1060_evk/mimxrt1062/qspi
       - lpcxpresso55s36
       - native_sim
       - native_sim/native/64

diff --git a/tests/drivers/flash/common/testcase.yaml b/tests/drivers/flash/common/testcase.yaml
@@ -35,7 +35,7 @@ tests:
       or dt_label_with_parent_compat_enabled("storage_partition", "nordic,owned-partitions")))
     integration_platforms:
       - qemu_x86
-      - mimxrt1060_evk
+      - mimxrt1060_evk/mimxrt1062/qspi
   drivers.flash.common.no_explicit_erase:
     platform_allow:
       - nrf54l15dk/nrf54l15/cpuapp

diff --git a/...o_basic_api/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay b/...o_basic_api/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay
diff --git a/..._basic_api/boards/mimxrt1060_evkb.overlay → .../mimxrt1060_evk_mimxrt1062_qspi_B.overlay b/..._basic_api/boards/mimxrt1060_evkb.overlay → .../mimxrt1060_evk_mimxrt1062_qspi_B.overlay
diff --git a/tests/drivers/gpio/gpio_basic_api/testcase.yaml b/tests/drivers/gpio/gpio_basic_api/testcase.yaml
@@ -54,7 +54,7 @@ tests:
       - mimxrt595_evk/mimxrt595s/cm33
       - mimxrt1020_evk
       - mimxrt1040_evk
-      - mimxrt1060_evk
+      - mimxrt1060_evk/mimxrt1062/qspi
       - mimxrt1060_evkb
       - lpcxpresso55s69/lpc55s69/cpu0
       - lpcxpresso55s36
@@ -68,7 +68,7 @@ tests:
       - mimxrt595_evk/mimxrt595s/cm33
       - mimxrt1020_evk
       - mimxrt1040_evk
-      - mimxrt1060_evk
+      - mimxrt1060_evk/mimxrt1062/qspi
       - mimxrt1060_evkb
       - lpcxpresso55s69/lpc55s69/cpu0
       - lpcxpresso55s36

diff --git a/..._target_api/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay b/..._target_api/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay
diff --git a/tests/drivers/i2c/i2c_target_api/testcase.yaml b/tests/drivers/i2c/i2c_target_api/testcase.yaml
@@ -42,7 +42,7 @@ tests:
       - mimxrt1180_evk/mimxrt1189/cm33
       - mimxrt1180_evk/mimxrt1189/cm7
       - mimxrt1040_evk
-      - mimxrt1060_evk
+      - mimxrt1060_evk/mimxrt1062/qspi
       - frdm_ke17z512
       - frdm_mcxn236
       - max32655evkit/max32655/m4

diff --git a/...pwm/pwm_api/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay b/...pwm/pwm_api/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay
diff --git a/...pi_loopback/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay b/...pi_loopback/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay
diff --git a/...t_async_api/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay b/...t_async_api/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay
diff --git a/..._async_api/boards/mimxrt1060_evkb.overlay → .../mimxrt1060_evk_mimxrt1062_qspi_B.overlay b/..._async_api/boards/mimxrt1060_evkb.overlay → .../mimxrt1060_evk_mimxrt1062_qspi_B.overlay
diff --git a/...fs/littlefs/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay b/...fs/littlefs/boards/mimxrt1060_evk.overlay → ...ds/mimxrt1060_evk_mimxrt1062_qspi.overlay