diff --git a/boards/nxp/mimxrt1050_evk/Kconfig.defconfig b/boards/nxp/mimxrt1050_evk/Kconfig.defconfig
index 56603850195..90fc7a76598 100644
--- 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
index c53e6474ca1..321eeee8134 100644
--- a/boards/nxp/mimxrt1050_evk/board.cmake
+++ b/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")
diff --git a/boards/nxp/mimxrt1050_evk/board.yml b/boards/nxp/mimxrt1050_evk/board.yml
index 48b8680e4b5..0d06dbd8d1a 100644
--- 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/doc/index.rst b/boards/nxp/mimxrt1050_evk/doc/index.rst
index 71e4fd4b967..379498dd33b 100644
--- a/boards/nxp/mimxrt1050_evk/doc/index.rst
+++ b/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
 ===============
diff --git a/boards/nxp/mimxrt1050_evk/mimxrt1050_evk.dts b/boards/nxp/mimxrt1050_evk/mimxrt1050_evk.dtsi
similarity index 100%
rename from boards/nxp/mimxrt1050_evk/mimxrt1050_evk.dts
rename to boards/nxp/mimxrt1050_evk/mimxrt1050_evk.dtsi
diff --git a/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_defconfig b/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_hyperflash_defconfig
similarity index 100%
rename from boards/nxp/mimxrt1050_evk/mimxrt1050_evk_defconfig
rename to boards/nxp/mimxrt1050_evk/mimxrt1050_evk_hyperflash_defconfig
diff --git a/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_hyperflash.overlay b/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_hyperflash.dts
similarity index 98%
rename from boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
rename to boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_hyperflash.dts
index 346aaca819f..e0aa389326a 100644
--- a/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
+++ b/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 = &s26ks512s0;
diff --git a/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_hyperflash.yaml b/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_hyperflash.yaml
index 73b20bcead3..c44f53326df 100644
--- a/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_hyperflash.yaml
+++ b/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_hyperflash.yaml
@@ -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
diff --git a/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_qspi.overlay b/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_qspi.dts
similarity index 97%
rename from boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_qspi.overlay
rename to boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_qspi.dts
index 4930433268a..ca5a924d282 100644
--- a/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_qspi.overlay
+++ b/boards/nxp/mimxrt1050_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
index 7f1f557d9da..68c150c9366 100644
--- 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
new file mode 100644
index 00000000000..a9e39fa1d73
--- /dev/null
+++ b/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_qspi_defconfig
@@ -0,0 +1,12 @@
+#
+# 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
diff --git a/boards/nxp/mimxrt1050_evk/revision.cmake b/boards/nxp/mimxrt1050_evk/revision.cmake
deleted file mode 100644
index 3e6f006a735..00000000000
--- a/boards/nxp/mimxrt1050_evk/revision.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-if (NOT DEFINED BOARD_REVISION)
-  set(BOARD_REVISION "hyperflash")
-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")
-  endif()
-endif()
diff --git a/samples/bluetooth/peripheral_ht/sample.yaml b/samples/bluetooth/peripheral_ht/sample.yaml
index 0c3557d96a6..2861fc7ff6c 100644
--- a/samples/bluetooth/peripheral_ht/sample.yaml
+++ b/samples/bluetooth/peripheral_ht/sample.yaml
@@ -16,7 +16,7 @@ tests:
     harness: bluetooth
     platform_allow:
       - mimxrt1020_evk
-      - mimxrt1050_evk
+      - mimxrt1050_evk/mimxrt1052/hyperflash
       - mimxrt1060_evk
       - frdm_k64f
     tags: bluetooth
diff --git a/samples/drivers/adc/adc_dt/boards/mimxrt1050_evk.overlay b/samples/drivers/adc/adc_dt/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
similarity index 100%
rename from samples/drivers/adc/adc_dt/boards/mimxrt1050_evk.overlay
rename to samples/drivers/adc/adc_dt/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
diff --git a/samples/drivers/display/sample.yaml b/samples/drivers/display/sample.yaml
index ffd4e0adf62..9b42ecb2534 100644
--- a/samples/drivers/display/sample.yaml
+++ b/samples/drivers/display/sample.yaml
@@ -62,7 +62,7 @@ tests:
     platform_allow:
       - mimxrt1064_evk
       - mimxrt1060_evk
-      - mimxrt1050_evk
+      - mimxrt1050_evk/mimxrt1052/hyperflash
       - mimxrt1040_evk
     integration_platforms:
       - mimxrt1040_evk
diff --git a/samples/drivers/led/led_strip/boards/mimxrt1050_evk.overlay b/samples/drivers/led/led_strip/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
similarity index 100%
rename from samples/drivers/led/led_strip/boards/mimxrt1050_evk.overlay
rename to samples/drivers/led/led_strip/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
diff --git a/samples/drivers/led/led_strip/sample.yaml b/samples/drivers/led/led_strip/sample.yaml
index 4bc7135af81..a776f0ca2d0 100644
--- a/samples/drivers/led/led_strip/sample.yaml
+++ b/samples/drivers/led/led_strip/sample.yaml
@@ -8,4 +8,4 @@ tests:
     harness_config:
       fixture: fixture_led_strip
     integration_platforms:
-      - mimxrt1050_evk
+      - mimxrt1050_evk/mimxrt1052/hyperflash
diff --git a/samples/sensor/die_temp_polling/boards/mimxrt1050_evk.overlay b/samples/sensor/die_temp_polling/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
similarity index 100%
rename from samples/sensor/die_temp_polling/boards/mimxrt1050_evk.overlay
rename to samples/sensor/die_temp_polling/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
diff --git a/samples/sensor/qdec/boards/mimxrt1050_evk.overlay b/samples/sensor/qdec/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
similarity index 100%
rename from samples/sensor/qdec/boards/mimxrt1050_evk.overlay
rename to samples/sensor/qdec/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
diff --git a/samples/subsys/display/lvgl/sample.yaml b/samples/subsys/display/lvgl/sample.yaml
index 606710da369..b9eab6d8edb 100644
--- a/samples/subsys/display/lvgl/sample.yaml
+++ b/samples/subsys/display/lvgl/sample.yaml
@@ -76,7 +76,7 @@ tests:
     platform_allow:
       - mimxrt1064_evk
       - mimxrt1060_evk
-      - mimxrt1050_evk
+      - mimxrt1050_evk/mimxrt1052/hyperflash
       - mimxrt1040_evk
     integration_platforms:
       - mimxrt1040_evk
@@ -89,7 +89,7 @@ tests:
     platform_allow:
       - mimxrt1064_evk
       - mimxrt1060_evk
-      - mimxrt1050_evk
+      - mimxrt1050_evk/mimxrt1052/hyperflash
       - mimxrt1040_evk
     integration_platforms:
       - mimxrt1040_evk
diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
index b1312de4029..6280e68d731 100644
--- a/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
+++ b/samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml
@@ -74,7 +74,7 @@ tests:
       - mimxrt1020_evk
       - mimxrt1024_evk
       - mimxrt1040_evk
-      - mimxrt1050_evk
+      - mimxrt1050_evk/mimxrt1052/hyperflash
       - mimxrt1060_evk
       - mimxrt1062_fmurt6
       - mimxrt1064_evk
@@ -132,7 +132,7 @@ tests:
       - mimxrt1020_evk
       - mimxrt1024_evk
       - mimxrt1040_evk
-      - mimxrt1050_evk
+      - mimxrt1050_evk/mimxrt1052/hyperflash
       - mimxrt1060_evk
       - mimxrt1062_fmurt6
       - mimxrt1064_evk
diff --git a/samples/subsys/tracing/sample.yaml b/samples/subsys/tracing/sample.yaml
index 76771f774ac..7bd19aac5c1 100644
--- a/samples/subsys/tracing/sample.yaml
+++ b/samples/subsys/tracing/sample.yaml
@@ -24,7 +24,7 @@ tests:
   sample.tracing.format.sysview:
     platform_allow:
       - nrf52840dk/nrf52840
-      - mimxrt1050_evk
+      - mimxrt1050_evk/mimxrt1052/hyperflash
       - mimxrt1064_evk
     integration_platforms:
       - nrf52840dk/nrf52840
diff --git a/samples/subsys/usb/dfu/sample.yaml b/samples/subsys/usb/dfu/sample.yaml
index daf55acb508..e41fdfd44fd 100644
--- a/samples/subsys/usb/dfu/sample.yaml
+++ b/samples/subsys/usb/dfu/sample.yaml
@@ -6,13 +6,12 @@ common:
   arch_exclude: posix
   platform_exclude:
     - mimxrt1010_evk
-    - mimxrt1050_evk@qspi
     - mimxrt1020_evk
     - mimxrt1015_evk
-    - mimxrt1060_evk
     - sam4l_ek
-    - mimxrt1050_evk
-    - mimxrt1060_evk@hyperflash
+    - mimxrt1050_evk/mimxrt1052/hyperflash
+    - mimxrt1050_evk/mimxrt1052/qspi
+    - mimxrt1060_evk/mimxrt1062/hyperflash
     - nucleo_f207zg
     - teensy40
     - teensy41
diff --git a/tests/boot/test_mcuboot/testcase.yaml b/tests/boot/test_mcuboot/testcase.yaml
index a19a51485d1..f5ee70b30dc 100644
--- a/tests/boot/test_mcuboot/testcase.yaml
+++ b/tests/boot/test_mcuboot/testcase.yaml
@@ -31,7 +31,7 @@ tests:
       - mimxrt1020_evk
       - mimxrt1024_evk
       - mimxrt1040_evk
-      - mimxrt1050_evk
+      - mimxrt1050_evk/mimxrt1052/hyperflash
       - mimxrt1060_evk
       - mimxrt1062_fmurt6
       - mimxrt1064_evk
diff --git a/tests/drivers/adc/adc_api/boards/mimxrt1050_evk.overlay b/tests/drivers/adc/adc_api/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
similarity index 100%
rename from tests/drivers/adc/adc_api/boards/mimxrt1050_evk.overlay
rename to tests/drivers/adc/adc_api/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
diff --git a/tests/drivers/disk/disk_access/testcase.yaml b/tests/drivers/disk/disk_access/testcase.yaml
index d4c2b537a62..983c0dd940b 100644
--- a/tests/drivers/disk/disk_access/testcase.yaml
+++ b/tests/drivers/disk/disk_access/testcase.yaml
@@ -11,7 +11,7 @@ tests:
     tags: mcux
     integration_platforms:
       - mimxrt1060_evk
-      - mimxrt1050_evk
+      - mimxrt1050_evk/mimxrt1052/hyperflash
       - mimxrt1064_evk
   drivers.disk.ram:
     platform_allow: qemu_x86_64
diff --git a/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1050_evk.overlay b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
similarity index 100%
rename from tests/drivers/dma/chan_blen_transfer/boards/mimxrt1050_evk.overlay
rename to tests/drivers/dma/chan_blen_transfer/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
diff --git a/tests/drivers/dma/chan_link_transfer/boards/mimxrt1050_evk.overlay b/tests/drivers/dma/chan_link_transfer/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
similarity index 100%
rename from tests/drivers/dma/chan_link_transfer/boards/mimxrt1050_evk.overlay
rename to tests/drivers/dma/chan_link_transfer/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
diff --git a/tests/drivers/dma/chan_link_transfer/testcase.yaml b/tests/drivers/dma/chan_link_transfer/testcase.yaml
index 516a61a6ce3..f5c24ad4321 100644
--- a/tests/drivers/dma/chan_link_transfer/testcase.yaml
+++ b/tests/drivers/dma/chan_link_transfer/testcase.yaml
@@ -9,7 +9,7 @@ tests:
       - frdm_k64f
       - mimxrt595_evk/mimxrt595s/cm33
       - mimxrt1010_evk
-      - mimxrt1050_evk
+      - mimxrt1050_evk/mimxrt1052/hyperflash
       - mimxrt1060_evk
       - mimxrt1064_evk
       - mimxrt1160_evk/mimxrt1166/cm7
diff --git a/tests/drivers/dma/loop_transfer/boards/mimxrt1050_evk.overlay b/tests/drivers/dma/loop_transfer/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
similarity index 100%
rename from tests/drivers/dma/loop_transfer/boards/mimxrt1050_evk.overlay
rename to tests/drivers/dma/loop_transfer/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/mimxrt1050_evk.overlay b/tests/drivers/gpio/gpio_basic_api/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
similarity index 100%
rename from tests/drivers/gpio/gpio_basic_api/boards/mimxrt1050_evk.overlay
rename to tests/drivers/gpio/gpio_basic_api/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
diff --git a/tests/drivers/spi/spi_loopback/boards/mimxrt1050_evk.overlay b/tests/drivers/spi/spi_loopback/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
similarity index 100%
rename from tests/drivers/spi/spi_loopback/boards/mimxrt1050_evk.overlay
rename to tests/drivers/spi/spi_loopback/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
diff --git a/tests/drivers/uart/uart_async_api/boards/mimxrt1050_evk.overlay b/tests/drivers/uart/uart_async_api/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
similarity index 100%
rename from tests/drivers/uart/uart_async_api/boards/mimxrt1050_evk.overlay
rename to tests/drivers/uart/uart_async_api/boards/mimxrt1050_evk_mimxrt1052_hyperflash.overlay
diff --git a/tests/drivers/watchdog/wdt_basic_api/testcase.yaml b/tests/drivers/watchdog/wdt_basic_api/testcase.yaml
index 365d2e56a9d..b9c938bf528 100644
--- a/tests/drivers/watchdog/wdt_basic_api/testcase.yaml
+++ b/tests/drivers/watchdog/wdt_basic_api/testcase.yaml
@@ -126,5 +126,5 @@ tests:
       - s32z2xxdc2/s32z270/rtu0
   drivers.watchdog.mimxrt1050_evk_ti_tps382x:
     filter: dt_compat_enabled("ti,tps382x")
-    platform_allow: mimxrt1050_evk
+    platform_allow: mimxrt1050_evk/mimxrt1052/hyperflash
     extra_args: DTC_OVERLAY_FILE="boards/mimxrt1050_evk_ti_tps382x.overlay"