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

Author: decsny

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

boards/nxp/mimxrt1050_evk/board.cmake

@@ -3,10 +3,17 @@
 #
 # 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 mimxrt1050_evk:\n"
+                      "mimxrt1050_evk/mimxrt1052/qspi or mimxrt1050_evk/mimxrt1052/hyperflash\n")
+endif()
+
 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")

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

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_hyperflash_defconfig`
 
 Other hardware features are not currently supported by the port.
 
@@ -298,6 +298,17 @@ The RT1050 SoC has two USB OTG (USBOTG) controllers that supports both
 device and host functions through its micro USB connectors.
 Only USB device function is supported in Zephyr at the moment.
 
+Board Targets
+*************
+
+This board has two variants that can be targeted,
+depending on which flash to set as ``zephyr,flash``:
+
+* ``mimxrt1050_evk/mimxrt1052/hyperflash`` is the default variant for the out of box
+  setup of the board using hyperflash.
+* ``mimxrt1050_evk/mimxrt1052/qspi`` is for a board that has been reworked to use the
+  qspi flash instead of hyperflash.
+
 Programming and Debugging
 *************************
 
@@ -364,7 +375,7 @@ Here is an example for the :zephyr:code-sample:`hello_world` application.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: mimxrt1050_evk
+   :board: mimxrt1050_evk//hyperflash
    :goals: flash
 
 Open a serial terminal, reset the board (press the SW4 button), and you should
@@ -373,7 +384,7 @@ see the following message in the terminal:
 .. code-block:: console
 
    ***** Booting Zephyr OS v1.14.0-rc1 *****
-   Hello World! mimxrt1050_evk
+   Hello World! mimxrt1050_evk//hyperflash
 
 Debugging
 =========
@@ -382,7 +393,7 @@ Here is an example for the :zephyr:code-sample:`hello_world` application.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: mimxrt1050_evk
+   :board: mimxrt1050_evk//hyperflash
    :goals: debug
 
 Open a serial terminal, step through the application in your debugger, and you
@@ -391,7 +402,7 @@ should see the following message in the terminal:
 .. code-block:: console
 
    ***** Booting Zephyr OS v1.14.0-rc1 *****
-   Hello World! mimxrt1050_evk
+   Hello World! mimxrt1050_evk//hyperflash
 
 Troubleshooting
 ===============

boards/nxp/mimxrt1050_evk/mimxrt1050_evk.dts renamed to boards/nxp/mimxrt1050_evk/mimxrt1050_evk.dtsi

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

boards/nxp/mimxrt1050_evk/mimxrt1050_evk_defconfig renamed to boards/nxp/mimxrt1050_evk/mimxrt1050_evk_hyperflash_defconfig

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

boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_hyperflash.overlay renamed to boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_hyperflash.dts

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

boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_hyperflash.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