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

Hide file tree

Showing 18 changed files with 34 additions and 33 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
@@ -8,9 +8,9 @@ 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
@@ -4,10 +4,12 @@ boards:
     vendor: nxp
     socs:
       - name: mimxrt1062
+        variants:
+          - name: "qspi"
+          - name: "hyperflash"
     revision:
-      format: "custom"
-  - name: mimxrt1060_evkb
-    full_name: MIMXRT1060-EVKB
-    vendor: nxp
-    socs:
-      - name: mimxrt1062
+      format: "letter"
+      default: "A"
+      revisions:
+        - name: "A"
+        - name: "B"
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/...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/boards/nxp/mimxrt1060_evk/system_off/sample.yaml b/samples/boards/nxp/mimxrt1060_evk/system_off/sample.yaml
@@ -7,6 +7,6 @@ tests:
     build_only: true
     platform_allow:
       - mimxrt1060_evk
-      - mimxrt1060_evkb
+      - mimxrt1060_evk@B
     integration_platforms:
       - mimxrt1060_evk
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/samples/subsys/usb/dfu/sample.yaml b/samples/subsys/usb/dfu/sample.yaml
@@ -11,7 +11,6 @@ common:
     - mimxrt1060_evk
     - sam4l_ek
     - mimxrt1050_evk
-    - mimxrt1060_evk@hyperflash
     - nucleo_f207zg
     - teensy40
     - teensy41