From c11964536345a31fdbbd2b0a8c0e913721e205bd Mon Sep 17 00:00:00 2001
From: Declan Snyder <declan.snyder@nxp.com>
Date: Mon, 7 Oct 2024 12:35:09 -0500
Subject: [PATCH] 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 <declan.snyder@nxp.com>
---
 boards/nxp/mimxrt1060_evk/CMakeLists.txt           |  2 +-
 boards/nxp/mimxrt1060_evk/Kconfig.defconfig        |  4 ++--
 boards/nxp/mimxrt1060_evk/Kconfig.mimxrt1060_evkb  |  5 -----
 boards/nxp/mimxrt1060_evk/board.cmake              |  4 ++--
 boards/nxp/mimxrt1060_evk/board.yml                | 14 ++++++++------
 .../{mimxrt1060_evk.dts => mimxrt1060_evk.dtsi}    |  0
 ...onfig => mimxrt1060_evk_mimxrt1062_B_defconfig} |  0
 ...ay => mimxrt1060_evk_mimxrt1062_hyperflash.dts} |  2 ++
 .../mimxrt1060_evk_mimxrt1062_hyperflash.yaml      |  2 +-
 ...mimxrt1060_evk_mimxrt1062_hyperflash_defconfig} |  0
 ....overlay => mimxrt1060_evk_mimxrt1062_qspi.dts} |  2 ++
 ...ts => mimxrt1060_evk_mimxrt1062_qspi_B.overlay} |  3 ---
 ....yaml => mimxrt1060_evk_mimxrt1062_qspi_B.yaml} |  2 +-
 .../mimxrt1060_evk_mimxrt1062_qspi_defconfig       | 13 +++++++++++++
 boards/nxp/mimxrt1060_evk/revision.cmake           |  9 ---------
 .../nxp/mimxrt1060_evk/system_off/sample.yaml      |  2 +-
 samples/drivers/i2s/output/README.rst              |  2 +-
 samples/subsys/usb/dfu/sample.yaml                 |  1 -
 18 files changed, 34 insertions(+), 33 deletions(-)
 delete mode 100644 boards/nxp/mimxrt1060_evk/Kconfig.mimxrt1060_evkb
 rename boards/nxp/mimxrt1060_evk/{mimxrt1060_evk.dts => mimxrt1060_evk.dtsi} (100%)
 rename boards/nxp/mimxrt1060_evk/{mimxrt1060_evkb_defconfig => mimxrt1060_evk_mimxrt1062_B_defconfig} (100%)
 rename boards/nxp/mimxrt1060_evk/{mimxrt1060_evk_mimxrt1062_hyperflash.overlay => mimxrt1060_evk_mimxrt1062_hyperflash.dts} (98%)
 rename boards/nxp/mimxrt1060_evk/{mimxrt1060_evk_defconfig => mimxrt1060_evk_mimxrt1062_hyperflash_defconfig} (100%)
 rename boards/nxp/mimxrt1060_evk/{mimxrt1060_evk_mimxrt1062_qspi.overlay => mimxrt1060_evk_mimxrt1062_qspi.dts} (97%)
 rename boards/nxp/mimxrt1060_evk/{mimxrt1060_evkb.dts => mimxrt1060_evk_mimxrt1062_qspi_B.overlay} (75%)
 rename boards/nxp/mimxrt1060_evk/{mimxrt1060_evkb.yaml => mimxrt1060_evk_mimxrt1062_qspi_B.yaml} (90%)
 create mode 100644 boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi_defconfig
 delete mode 100644 boards/nxp/mimxrt1060_evk/revision.cmake

diff --git a/boards/nxp/mimxrt1060_evk/CMakeLists.txt b/boards/nxp/mimxrt1060_evk/CMakeLists.txt
index 29c2d6f9068a623..2778972698b482b 100644
--- 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
index 899e8b3ffe0f229..bc06c96f7b80aeb 100644
--- 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
deleted file mode 100644
index d2f59c8c9cfa906..000000000000000
--- a/boards/nxp/mimxrt1060_evk/Kconfig.mimxrt1060_evkb
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2024 NXP
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_MIMXRT1060_EVKB
-	select SOC_PART_NUMBER_MIMXRT1062DVL6A
diff --git a/boards/nxp/mimxrt1060_evk/board.cmake b/boards/nxp/mimxrt1060_evk/board.cmake
index 722afd541f71209..ef7e121a0eddf70 100644
--- 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
index c3787a5385ef100..30a5701b1feb7ed 100644
--- 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 b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk.dtsi
similarity index 100%
rename from boards/nxp/mimxrt1060_evk/mimxrt1060_evk.dts
rename to boards/nxp/mimxrt1060_evk/mimxrt1060_evk.dtsi
diff --git a/boards/nxp/mimxrt1060_evk/mimxrt1060_evkb_defconfig b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_B_defconfig
similarity index 100%
rename from boards/nxp/mimxrt1060_evk/mimxrt1060_evkb_defconfig
rename to boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_B_defconfig
diff --git a/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_hyperflash.overlay b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_hyperflash.dts
similarity index 98%
rename from boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_hyperflash.overlay
rename to boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_hyperflash.dts
index 27e013f2cad8a98..f7f8197a3123fe9 100644
--- a/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_hyperflash.overlay
+++ b/boards/nxp/mimxrt1060_evk/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
index c453d1c9ee6ff4a..90a13babc6067e8 100644
--- 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/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_defconfig b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_hyperflash_defconfig
similarity index 100%
rename from boards/nxp/mimxrt1060_evk/mimxrt1060_evk_defconfig
rename to boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_hyperflash_defconfig
diff --git a/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi.overlay b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi.dts
similarity index 97%
rename from boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi.overlay
rename to boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi.dts
index 8a0abae2fb3ba49..496fac77a559756 100644
--- a/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi.overlay
+++ b/boards/nxp/mimxrt1060_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_evkb.dts b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi_B.overlay
similarity index 75%
rename from boards/nxp/mimxrt1060_evk/mimxrt1060_evkb.dts
rename to boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi_B.overlay
index 905d32d89aa41de..284679eaa9f28fa 100644
--- a/boards/nxp/mimxrt1060_evk/mimxrt1060_evkb.dts
+++ b/boards/nxp/mimxrt1060_evk/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/boards/nxp/mimxrt1060_evk/mimxrt1060_evkb.yaml b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi_B.yaml
similarity index 90%
rename from boards/nxp/mimxrt1060_evk/mimxrt1060_evkb.yaml
rename to boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi_B.yaml
index 3f9306c1e036298..5c9f42d5ef717a6 100644
--- a/boards/nxp/mimxrt1060_evk/mimxrt1060_evkb.yaml
+++ b/boards/nxp/mimxrt1060_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
new file mode 100644
index 000000000000000..8af2d46280907d4
--- /dev/null
+++ 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
deleted file mode 100644
index 97a3da96ea4905e..000000000000000
--- a/boards/nxp/mimxrt1060_evk/revision.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-if (NOT DEFINED BOARD_REVISION)
-  set(BOARD_REVISION "qspi")
-else ()
-  if (NOT (BOARD_REVISION STREQUAL "hyperflash") AND NOT (BOARD_REVISION STREQUAL "qspi"))
-    message(FATAL_ERROR "Invalid board revision, ${BOARD_REVISION}, valid revisions are: hyperflash, qspi")
-  elseif (BOARD_REVISION STREQUAL "hyperflash" AND CONFIG_BOARD_MIMXRT1060_EVKB)
-    message(FATAL_ERROR "hyperflash not supported on RT1060 EVKB")
-  endif()
-endif()
diff --git a/samples/boards/nxp/mimxrt1060_evk/system_off/sample.yaml b/samples/boards/nxp/mimxrt1060_evk/system_off/sample.yaml
index a871dcc74f8dbf1..0d3214bc65850d3 100644
--- 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
index d8e10d81e0e1303..baccfa0e98cbc4a 100644
--- 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
index eda165faca6e3a7..d1a4c4fec2624f6 100644
--- 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