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]>

Author: decsny

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)

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

boards/nxp/mimxrt1060_evk/Kconfig.mimxrt1060_evkb

@@ -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/mimxrt1062/qspi or mimxrt1060_evk/mimxrt1062/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()
 

boards/nxp/mimxrt1060_evk/board.cmake

@@ -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"

boards/nxp/mimxrt1060_evk/board.yml

@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include "mimxrt1060_evk.dtsi"
+
 / {
 	chosen {
 		zephyr,flash-controller = &s26ks512s0;

boards/nxp/mimxrt1060_evk/doc/index.rst

@@ -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