boards: mimxrt1050_evk: Switch to variants

Switch from using revisions for hyperflash/qspi to using variants, by popular demand. Signed-off-by: Declan Snyder <[email protected]>
zephyrproject-rtos · Nov 21, 2024 · 0e8fc3f · 0e8fc3f
1 parent f235ddb
commit 0e8fc3f
Show file tree

Hide file tree

Showing 23 changed files with 40 additions and 33 deletions.
diff --git a/boards/nxp/mimxrt1050_evk/Kconfig.defconfig b/boards/nxp/mimxrt1050_evk/Kconfig.defconfig
@@ -10,6 +10,7 @@ config DEVICE_CONFIGURATION_DATA
 
 config NXP_IMX_EXTERNAL_SDRAM
 	default y
+
 if NETWORKING
 
 config NET_L2_ETHERNET

diff --git a/boards/nxp/mimxrt1050_evk/board.cmake b/boards/nxp/mimxrt1050_evk/board.cmake
@@ -6,7 +6,7 @@
 board_runner_args(jlink "--device=MCIMXRT1052")
 board_runner_args(linkserver "--device=MIMXRT1052xxxxB:EVKB-IMXRT1050")
 
-if("${BOARD_REVISION}" STREQUAL "qspi")
+if("${BOARD_QUALIFIERS}" MATCHES "qspi")
   board_runner_args(jlink "--loader=BankAddr=0x60000000&Loader=QSPI")
   board_runner_args(pyocd "--target=mimxrt1050_quadspi")
   board_runner_args(linkserver "--override=/device/memory/3/flash-driver=MIMXRT1050_SFDP_QSPI.cfx")

diff --git a/boards/nxp/mimxrt1050_evk/board.yml b/boards/nxp/mimxrt1050_evk/board.yml
@@ -4,9 +4,6 @@ board:
   vendor: nxp
   socs:
     - name: mimxrt1052
-  revision:
-    format: "custom"
-    default: "hyperflash"
-    revisions:
-      - name: "hyperflash"
-      - name: "qspi"
+      variants:
+        - name: hyperflash
+        - name: qspi
diff --git a/boards/nxp/mimxrt1050_evk/doc/index.rst b/boards/nxp/mimxrt1050_evk/doc/index.rst
@@ -138,7 +138,7 @@ already supported, which can also be re-used on this mimxrt1050_evk board:
 +-----------+------------+-------------------------------------+
 
 The default configuration can be found in
-:zephyr_file:`boards/nxp/mimxrt1050_evk/mimxrt1050_evk_defconfig`
+:zephyr_file:`boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_hyperflash_defconfig`
 
 Other hardware features are not currently supported by the port.
 

diff --git a/boards/nxp/mimxrt1050_evk/mimxrt1050_evk.dts → ...ds/nxp/mimxrt1050_evk/mimxrt1050_evk.dtsi b/boards/nxp/mimxrt1050_evk/mimxrt1050_evk.dts → ...ds/nxp/mimxrt1050_evk/mimxrt1050_evk.dtsi
diff --git a/...p/mimxrt1050_evk/mimxrt1050_evk_defconfig → ...0_evk/mimxrt1050_evk_hyperflash_defconfig b/...p/mimxrt1050_evk/mimxrt1050_evk_defconfig → ...0_evk/mimxrt1050_evk_hyperflash_defconfig
diff --git a/...xrt1050_evk_mimxrt1052_hyperflash.overlay → .../mimxrt1050_evk_mimxrt1052_hyperflash.dts b/...xrt1050_evk_mimxrt1052_hyperflash.overlay → .../mimxrt1050_evk_mimxrt1052_hyperflash.dts
@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include "mimxrt1050_evk.dtsi"
+
 / {
 	chosen {
 		zephyr,flash-controller = &s26ks512s0;

diff --git a/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_hyperflash.yaml b/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_hyperflash.yaml
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-identifier: mimxrt1050_evk
+identifier: mimxrt1050_evk/mimxrt1052/hyperflash
 name: NXP MIMXRT1050-EVK
 type: mcu
 arch: arm

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

diff --git a/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_qspi.yaml b/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_qspi.yaml
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-identifier: mimxrt1050_evk@qspi
+identifier: mimxrt1050_evk/mimxrt1052/qspi
 name: NXP MIMXRT1050-EVK-QSPI
 type: mcu
 arch: arm

diff --git a/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_qspi_defconfig b/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_qspi_defconfig
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2017, 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/mimxrt1050_evk/revision.cmake b/boards/nxp/mimxrt1050_evk/revision.cmake
diff --git a/samples/bluetooth/peripheral_ht/sample.yaml b/samples/bluetooth/peripheral_ht/sample.yaml
@@ -16,7 +16,7 @@ tests:
     harness: bluetooth
     platform_allow:
       - mimxrt1020_evk
-      - mimxrt1050_evk
+      - mimxrt1050_evk/mimxrt1052/hyperflash
       - mimxrt1060_evk
       - frdm_k64f
     tags: bluetooth

diff --git a/samples/drivers/display/sample.yaml b/samples/drivers/display/sample.yaml
@@ -50,7 +50,7 @@ tests:
     platform_allow:
       - mimxrt1064_evk
       - mimxrt1060_evk
-      - mimxrt1050_evk
+      - mimxrt1050_evk/mimxrt1052/hyperflash
       - mimxrt1040_evk
     tags: display
     harness: console

diff --git a/samples/drivers/led/led_strip/sample.yaml b/samples/drivers/led/led_strip/sample.yaml
@@ -8,4 +8,4 @@ tests:
     harness_config:
       fixture: fixture_led_strip
     integration_platforms:
-      - mimxrt1050_evk
+      - mimxrt1050_evk/mimxrt1052/hyperflash
diff --git a/samples/subsys/display/lvgl/sample.yaml b/samples/subsys/display/lvgl/sample.yaml
@@ -74,7 +74,7 @@ tests:
     platform_allow:
       - mimxrt1064_evk
       - mimxrt1060_evk
-      - mimxrt1050_evk
+      - mimxrt1050_evk/mimxrt1052/hyperflash
       - mimxrt1040_evk
     tags: display
     harness: console
@@ -85,7 +85,7 @@ tests:
     platform_allow:
       - mimxrt1064_evk
       - mimxrt1060_evk
-      - mimxrt1050_evk
+      - mimxrt1050_evk/mimxrt1052/hyperflash
       - mimxrt1040_evk
     tags: display
     harness: console

diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
@@ -68,7 +68,7 @@ tests:
       - mimxrt1020_evk
       - mimxrt1024_evk
       - mimxrt1040_evk
-      - mimxrt1050_evk
+      - mimxrt1050_evk/mimxrt1052/hyperflash
       - mimxrt1060_evk
       - mimxrt1062_fmurt6
       - mimxrt1064_evk
@@ -126,7 +126,7 @@ tests:
       - mimxrt1020_evk
       - mimxrt1024_evk
       - mimxrt1040_evk
-      - mimxrt1050_evk
+      - mimxrt1050_evk/mimxrt1052/hyperflash
       - mimxrt1060_evk
       - mimxrt1062_fmurt6
       - mimxrt1064_evk

diff --git a/samples/subsys/tracing/sample.yaml b/samples/subsys/tracing/sample.yaml
@@ -24,7 +24,7 @@ tests:
   sample.tracing.format.sysview:
     platform_allow:
       - nrf52840dk/nrf52840
-      - mimxrt1050_evk
+      - mimxrt1050_evk/mimxrt1052/hyperflash
       - mimxrt1064_evk
     integration_platforms:
       - nrf52840dk/nrf52840

diff --git a/samples/subsys/usb/dfu/sample.yaml b/samples/subsys/usb/dfu/sample.yaml
@@ -6,13 +6,12 @@ common:
   arch_exclude: posix
   platform_exclude:
     - mimxrt1010_evk
-    - mimxrt1050_evk@qspi
     - mimxrt1020_evk
     - mimxrt1015_evk
-    - mimxrt1060_evk
     - sam4l_ek
-    - mimxrt1050_evk
-    - mimxrt1060_evk@hyperflash
+    - mimxrt1050_evk/mimxrt1052/hyperflash
+    - mimxrt1050_evk/mimxrt1052/qspi
+    - mimxrt1060_evk/mimxrt1062/hyperflash
     - nucleo_f207zg
     - teensy40
     - teensy41

diff --git a/tests/boot/test_mcuboot/testcase.yaml b/tests/boot/test_mcuboot/testcase.yaml
@@ -31,7 +31,7 @@ tests:
       - mimxrt1020_evk
       - mimxrt1024_evk
       - mimxrt1040_evk
-      - mimxrt1050_evk
+      - mimxrt1050_evk/mimxrt1052/hyperflash
       - mimxrt1060_evk
       - mimxrt1062_fmurt6
       - mimxrt1064_evk

diff --git a/tests/drivers/disk/disk_access/testcase.yaml b/tests/drivers/disk/disk_access/testcase.yaml
@@ -11,7 +11,7 @@ tests:
     tags: mcux
     integration_platforms:
       - mimxrt1060_evk
-      - mimxrt1050_evk
+      - mimxrt1050_evk/mimxrt1052/hyperflash
       - mimxrt1064_evk
   drivers.disk.ram:
     platform_allow: qemu_x86_64

diff --git a/tests/drivers/dma/chan_link_transfer/testcase.yaml b/tests/drivers/dma/chan_link_transfer/testcase.yaml
@@ -9,7 +9,7 @@ tests:
       - frdm_k64f
       - mimxrt595_evk/mimxrt595s/cm33
       - mimxrt1010_evk
-      - mimxrt1050_evk
+      - mimxrt1050_evk/mimxrt1052/hyperflash
       - mimxrt1060_evk
       - mimxrt1064_evk
       - mimxrt1160_evk/mimxrt1166/cm7

diff --git a/tests/drivers/watchdog/wdt_basic_api/testcase.yaml b/tests/drivers/watchdog/wdt_basic_api/testcase.yaml
@@ -124,5 +124,5 @@ tests:
       - mr_canhubk3
   drivers.watchdog.mimxrt1050_evk_ti_tps382x:
     filter: dt_compat_enabled("ti,tps382x")
-    platform_allow: mimxrt1050_evk
+    platform_allow: mimxrt1050_evk/mimxrt1052/hyperflash
     extra_args: DTC_OVERLAY_FILE="boards/mimxrt1050_evk_ti_tps382x.overlay"