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 · Oct 15, 2024 · 2217a25 · 2217a25
1 parent 03959a2
commit 2217a25
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 16 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/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/...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/subsys/usb/dfu/sample.yaml b/samples/subsys/usb/dfu/sample.yaml
@@ -6,7 +6,6 @@ common:
   arch_exclude: posix
   platform_exclude:
     - mimxrt1010_evk
-    - mimxrt1050_evk@qspi
     - mimxrt1020_evk
     - mimxrt1015_evk
     - mimxrt1060_evk