hwmv2: boards: Convert IMXRT boards

Convert IMXRT boards except RT595

Co-authored-by: Declan Snyder <declan.snyder@nxp.com>
Co-authored-by: Daniel DeGrasse <daniel.degrasse@nxp.com>

Signed-off-by: Declan Snyder <declan.snyder@nxp.com>

boards/boards_legacy/arm/mimxrt1010_evk/Kconfig.defconfig

@@ -1,15 +0,0 @@
-# MIMXRT1010-EVK board
-
-# Copyright (c) 2019, NXP
-# SPDX-License-Identifier: Apache-2.0
-
-if BOARD_MIMXRT1010_EVK
-
-config BOARD
-	default "mimxrt1010_evk" if BOARD_MIMXRT1010_EVK
-
-choice CODE_LOCATION
-	default CODE_FLEXSPI
-endchoice
-
-endif # BOARD_MIMXRT1010_EVK

boards/boards_legacy/arm/mimxrt1015_evk/Kconfig.defconfig

@@ -1,15 +0,0 @@
-# MIMXRT1015-EVK board
-
-# Copyright (c) 2019, NXP
-# SPDX-License-Identifier: Apache-2.0
-
-if BOARD_MIMXRT1015_EVK
-
-config BOARD
-	default "mimxrt1015_evk" if BOARD_MIMXRT1015_EVK
-
-choice CODE_LOCATION
-	default CODE_FLEXSPI
-endchoice
-
-endif # BOARD_MIMXRT1015_EVK

boards/boards_legacy/arm/mimxrt1050_evk/Kconfig.board

@@ -1,12 +0,0 @@
-# Copyright (c) 2017, NXP
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_MIMXRT1050_EVK
-	bool "NXP MIMXRT1050-EVK"
-	depends on SOC_SERIES_IMX_RT
-	select SOC_PART_NUMBER_MIMXRT1052DVL6A
-
-config BOARD_MIMXRT1050_EVK_QSPI
-	bool "NXP MIMXRT1050-EVK-QSPI"
-	depends on SOC_SERIES_IMX_RT
-	select SOC_PART_NUMBER_MIMXRT1052DVL6A

boards/boards_legacy/arm/mimxrt1050_evk/board.cmake

@@ -1,18 +0,0 @@
-#
-# Copyright (c) 2017, NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-board_runner_args(jlink "--device=MCIMXRT1052")
-
-if(${CONFIG_BOARD_MIMXRT1050_EVK_QSPI})
-    board_runner_args(jlink "--loader=BankAddr=0x60000000&Loader=QSPI")
-    board_runner_args(pyocd "--target=mimxrt1050_quadspi")
-else()
-    board_runner_args(pyocd "--target=mimxrt1050_hyperflash")
-    board_runner_args(linkserver  "--device=MIMXRT1052xxxxB:EVKB-IMXRT1050")
-    include(${ZEPHYR_BASE}/boards/common/linkserver.board.cmake)
-endif()
-
-include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
-include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)

boards/boards_legacy/arm/mimxrt1050_evk/mimxrt1050_evk_qspi_defconfig

@@ -1,16 +0,0 @@
-#
-# Copyright (c) 2017, NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-CONFIG_SOC_MIMXRT1052=y
-CONFIG_SOC_SERIES_IMX_RT=y
-CONFIG_BOARD_MIMXRT1050_EVK_QSPI=y
-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

boards/boards_legacy/arm/mimxrt1060_evk/Kconfig.board

@@ -1,17 +0,0 @@
-# Copyright (c) 2018, NXP
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_MIMXRT1060_EVK
-	bool "NXP MIMXRT1060-EVK"
-	depends on SOC_SERIES_IMX_RT
-	select SOC_PART_NUMBER_MIMXRT1062DVL6A
-
-config BOARD_MIMXRT1060_EVK_HYPERFLASH
-	bool "NXP MIMXRT1060-EVK-HYPERFLASH"
-	depends on SOC_SERIES_IMX_RT
-	select SOC_PART_NUMBER_MIMXRT1062DVL6A
-
-config BOARD_MIMXRT1060_EVKB
-	bool "NXP MIMXRT1060-EVKB"
-	depends on SOC_SERIES_IMX_RT
-	select SOC_PART_NUMBER_MIMXRT1062DVL6A

boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evk_hyperflash_defconfig

@@ -1,16 +0,0 @@
-#
-# Copyright (c) 2018, NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-CONFIG_SOC_MIMXRT1062=y
-CONFIG_SOC_SERIES_IMX_RT=y
-CONFIG_BOARD_MIMXRT1060_EVK_HYPERFLASH=y
-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

boards/boards_legacy/arm/mimxrt1160_evk/Kconfig.board

@@ -1,12 +0,0 @@
-# Copyright (c) 2021, NXP
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_MIMXRT1160_EVK_CM7
-	bool "NXP MIMXRT1160-EVK CM7"
-	depends on SOC_MIMXRT1166_CM7
-	select SOC_PART_NUMBER_MIMXRT1166DVM6A
-
-config BOARD_MIMXRT1160_EVK_CM4
-	bool "NXP MIMXRT1160-EVK CM4"
-	depends on SOC_MIMXRT1166_CM4
-	select SOC_PART_NUMBER_MIMXRT1166DVM6A

boards/boards_legacy/arm/mimxrt1170_evk/Kconfig.board

@@ -1,22 +0,0 @@
-# Copyright 2021,2023 NXP
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_MIMXRT1170_EVK_CM7
-	bool "NXP MIMXRT1170-EVK CM7"
-	depends on SOC_MIMXRT1176_CM7
-	select SOC_PART_NUMBER_MIMXRT1176DVMAA
-
-config BOARD_MIMXRT1170_EVK_CM4
-	bool "NXP MIMXRT1170-EVK CM4"
-	depends on SOC_MIMXRT1176_CM4
-	select SOC_PART_NUMBER_MIMXRT1176DVMAA
-
-config BOARD_MIMXRT1170_EVKB_CM7
-	bool "NXP MIMXRT1170-EVKB CM7"
-	depends on SOC_MIMXRT1176_CM7
-	select SOC_PART_NUMBER_MIMXRT1176DVMAA
-
-config BOARD_MIMXRT1170_EVKB_CM4
-	bool "NXP MIMXRT1170-EVKB CM4"
-	depends on SOC_MIMXRT1176_CM4
-	select SOC_PART_NUMBER_MIMXRT1176DVMAA

boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evk_cm7_defconfig

@@ -1,17 +0,0 @@
-#
-# Copyright 2021,2023 NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-CONFIG_BOARD_MIMXRT1170_EVK_CM7=y
-CONFIG_SOC_MIMXRT1176_CM7=y
-CONFIG_SOC_SERIES_IMX_RT=y
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-CONFIG_SERIAL=y
-CONFIG_GPIO=y
-CONFIG_ARM_MPU=y
-CONFIG_HW_STACK_PROTECTION=y
-CONFIG_FLEXSPI_CONFIG_BLOCK_OFFSET=0x400
-CONFIG_PINCTRL=y

boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evkb_cm4_defconfig

@@ -1,16 +0,0 @@
-#
-# Copyright 2023 NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-CONFIG_BOARD_MIMXRT1170_EVKB_CM4=y
-CONFIG_SOC_MIMXRT1176_CM4=y
-CONFIG_SOC_SERIES_IMX_RT=y
-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

boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evkb_cm7_defconfig

@@ -1,17 +0,0 @@
-#
-# Copyright 2023 NXP
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-CONFIG_BOARD_MIMXRT1170_EVKB_CM7=y
-CONFIG_SOC_MIMXRT1176_CM7=y
-CONFIG_SOC_SERIES_IMX_RT=y
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-CONFIG_SERIAL=y
-CONFIG_GPIO=y
-CONFIG_ARM_MPU=y
-CONFIG_HW_STACK_PROTECTION=y
-CONFIG_FLEXSPI_CONFIG_BLOCK_OFFSET=0x400
-CONFIG_PINCTRL=y

boards/boards_legacy/arm/mimxrt685_evk/Kconfig.board

@@ -1,8 +0,0 @@
-# Copyright (c) 2020, NXP
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_MIMXRT685_EVK
-	bool "NXP MIMXRT685-EVK"
-	depends on SOC_SERIES_IMX_RT6XX
-	select SOC_PART_NUMBER_MIMXRT685SFVKB
-	select NXP_IMX_RT6XX_BOOT_HEADER if !BOOTLOADER_MCUBOOT

boards/boards_legacy/arm/teensy4/Kconfig.board

@@ -1,15 +0,0 @@
-#
-# Copyright (c) 2020, Bernhard Kraemer
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-config BOARD_TEENSY40
-	bool "PJRC TEENSY40"
-	depends on SOC_SERIES_IMX_RT
-	select SOC_PART_NUMBER_MIMXRT1062DVL6A
-
-config BOARD_TEENSY41
-	bool "PJRC TEENSY41"
-	depends on SOC_SERIES_IMX_RT
-	select SOC_PART_NUMBER_MIMXRT1062DVJ6A

boards/madmachine/index.rst

@@ -0,0 +1,10 @@
+.. _boards-mad-machine:
+
+Mad Machine
+###########
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*

boards/madmachine/mm_feather/CMakeLists.txt

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-if(CONFIG_NXP_IMX_RT_BOOT_HEADER)
+if(CONFIG_NXP_IMXRT_BOOT_HEADER)
   zephyr_compile_definitions(XIP_BOOT_HEADER_ENABLE=1)
   zephyr_compile_definitions(XIP_BOOT_HEADER_DCD_ENABLE=1)
   zephyr_compile_definitions(BOARD_FLASH_SIZE=CONFIG_FLASH_SIZE*1024)

boards/madmachine/mm_feather/Kconfig.defconfig

@@ -6,13 +6,6 @@
 
 if BOARD_MM_FEATHER
 
-config BOARD
-	default "mm_feather"
-
-choice CODE_LOCATION
-	default CODE_FLEXSPI
-endchoice
-
 config DEVICE_CONFIGURATION_DATA
 	default y
 

boards/madmachine/mm_feather/Kconfig.mm_feather

@@ -1,10 +1,7 @@
-#
 # Copyright (c) 2021, MADMACHINE LIMITED
-#
+# Copyright 2024 NXP
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_MM_FEATHER
-	bool "MM MM-FEATHER"
-	depends on SOC_SERIES_IMX_RT
 	select SOC_PART_NUMBER_MIMXRT1062DVL6A
+	select SOC_MIMXRT1062

boards/madmachine/mm_feather/board.yml

@@ -0,0 +1,5 @@
+board:
+  name: mm_feather
+  vendor: madmachine
+  socs:
+    - name: mimxrt1062

boards/madmachine/mm_feather/flexspi_nor_config.c

@@ -8,7 +8,7 @@
 
 #include <flexspi_nor_config.h>
 
-#ifdef CONFIG_NXP_IMX_RT_BOOT_HEADER
+#ifdef CONFIG_NXP_IMXRT_BOOT_HEADER
 #if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
 __attribute__((section(".boot_hdr.conf")))
 #elif defined(__ICCARM__)
@@ -40,4 +40,4 @@ const struct flexspi_nor_config_t Qspiflash_config = {
 	.blockSize = 256u * 1024u,
 	.isUniformBlockSize = false,
 };
-#endif /* CONFIG_NXP_IMX_RT_BOOT_HEADER */
+#endif /* CONFIG_NXP_IMXRT_BOOT_HEADER */

boards/madmachine/mm_feather/mm_feather_defconfig

@@ -4,8 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-CONFIG_SOC_MIMXRT1062=y
-CONFIG_SOC_SERIES_IMX_RT=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y

boards/madmachine/mm_swiftio/CMakeLists.txt

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-if(CONFIG_NXP_IMX_RT_BOOT_HEADER)
+if(CONFIG_NXP_IMXRT_BOOT_HEADER)
   zephyr_compile_definitions(XIP_BOOT_HEADER_ENABLE=1)
   zephyr_compile_definitions(XIP_BOOT_HEADER_DCD_ENABLE=1)
   zephyr_compile_definitions(BOARD_FLASH_SIZE=CONFIG_FLASH_SIZE*1024)

boards/madmachine/mm_swiftio/Kconfig.defconfig

@@ -6,13 +6,6 @@
 
 if BOARD_MM_SWIFTIO
 
-config BOARD
-	default "mm_swiftio"
-
-choice CODE_LOCATION
-	default CODE_FLEXSPI
-endchoice
-
 config DEVICE_CONFIGURATION_DATA
 	default y
 

boards/madmachine/mm_swiftio/Kconfig.mm_swiftio

@@ -1,10 +1,6 @@
-#
 # Copyright (c) 2019, MADMACHINE LIMITED
-#
+# Copyright 2024 NXP
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_MM_SWIFTIO
-	bool "MM MM-SWIFTIO"
-	depends on SOC_SERIES_IMX_RT
-	select SOC_PART_NUMBER_MIMXRT1052DVL6A
+	select SOC_PART_NUMBER_MIMXRT1052DVL6B

boards/madmachine/mm_swiftio/board.yml

@@ -0,0 +1,5 @@
+board:
+  name: mm_swiftio
+  vendor: madmachine
+  socs:
+    - name: mimxrt1052

boards/madmachine/mm_swiftio/flexspi_nor_config.c

@@ -8,7 +8,7 @@
 
 #include <flexspi_nor_config.h>
 
-#ifdef CONFIG_NXP_IMX_RT_BOOT_HEADER
+#ifdef CONFIG_NXP_IMXRT_BOOT_HEADER
 #if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
 __attribute__((section(".boot_hdr.conf")))
 #elif defined(__ICCARM__)
@@ -40,4 +40,4 @@ const struct flexspi_nor_config_t Qspiflash_config = {
 	.blockSize = 256u * 1024u,
 	.isUniformBlockSize = false,
 };
-#endif /* CONFIG_NXP_IMX_RT_BOOT_HEADER */
+#endif /* CONFIG_NXP_IMXRT_BOOT_HEADER */

boards/madmachine/mm_swiftio/mm_swiftio_defconfig

@@ -4,8 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-CONFIG_SOC_MIMXRT1052=y
-CONFIG_SOC_SERIES_IMX_RT=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y

boards/nxp/mimxrt1010_evk/CMakeLists.txt

@@ -7,7 +7,7 @@
 zephyr_library()
 zephyr_library_sources(init.c)
 
-if(CONFIG_NXP_IMX_RT_BOOT_HEADER)
+if(CONFIG_NXP_IMXRT_BOOT_HEADER)
   if(NOT DEFINED CONFIG_BOARD_MIMXRT1010_EVK)
     message(WARNING "It appears you are using the board definition for "
      "the MIMXRT1010-EVK, but targeting a custom board. You may need to "

boards/nxp/mimxrt1010_evk/Kconfig.mimxrt1010_evk

@@ -1,10 +1,5 @@
-#
 # Copyright (c) 2019, NXP
-#
 # SPDX-License-Identifier: Apache-2.0
-#
 
 config BOARD_MIMXRT1010_EVK
-	bool "NXP MIMXRT1010-EVK"
-	depends on SOC_SERIES_IMX_RT
 	select SOC_PART_NUMBER_MIMXRT1011DAE5A

boards/nxp/mimxrt1010_evk/board.yml

@@ -0,0 +1,5 @@
+board:
+  name: mimxrt1010_evk
+  vendor: nxp
+  socs:
+    - name: mimxrt1011

boards/nxp/mimxrt1010_evk/init.c

@@ -7,7 +7,7 @@
 
 void SystemInitHook(void)
 {
-#ifdef CONFIG_CODE_FLEXSPI
+#if DT_SAME_NODE(DT_NODELABEL(flexspi), DT_PARENT(DT_CHOSEN(flash)))
 	/* AT25SF128A SPI Flash on the RT1010-EVK requires special alignment
 	 * considerations, so set the READADDROPT bit in the FlexSPI so it
 	 * will fetch more data than each AHB burst requires to meet alignment
@@ -18,5 +18,5 @@ void SystemInitHook(void)
 	 * the instruction cache in very early boot.
 	 */
 	FLEXSPI->AHBCR |= FLEXSPI_AHBCR_READADDROPT_MASK;
-#endif /* CONFIG_CODE_FLEXSPI */
+#endif
 }

boards/nxp/mimxrt1010_evk/mimxrt1010_evk_defconfig

@@ -4,8 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-CONFIG_SOC_MIMXRT1011=y
-CONFIG_SOC_SERIES_IMX_RT=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y

boards/nxp/mimxrt1015_evk/CMakeLists.txt

@@ -5,7 +5,7 @@
 #
 
 
-if(CONFIG_NXP_IMX_RT_BOOT_HEADER)
+if(CONFIG_NXP_IMXRT_BOOT_HEADER)
   zephyr_library()
   if(NOT DEFINED CONFIG_BOARD_MIMXRT1015_EVK)
     message(WARNING "It appears you are using the board definition for "

boards/nxp/mimxrt1015_evk/Kconfig.mimxrt1015_evk

@@ -2,6 +2,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_MIMXRT1015_EVK
-	bool "NXP MIMXRT1015-EVK"
-	depends on SOC_SERIES_IMX_RT
 	select SOC_PART_NUMBER_MIMXRT1015DAF5A

boards/nxp/mimxrt1015_evk/board.yml

@@ -0,0 +1,5 @@
+board:
+  name: mimxrt1015_evk
+  vendor: nxp
+  socs:
+    - name: mimxrt1015

boards/nxp/mimxrt1015_evk/mimxrt1015_evk_defconfig

@@ -4,8 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-CONFIG_SOC_MIMXRT1015=y
-CONFIG_SOC_SERIES_IMX_RT=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y

boards/nxp/mimxrt1020_evk/CMakeLists.txt

@@ -5,7 +5,7 @@
 #
 
 
-if(CONFIG_NXP_IMX_RT_BOOT_HEADER)
+if(CONFIG_NXP_IMXRT_BOOT_HEADER)
   zephyr_library()
   if(NOT DEFINED CONFIG_BOARD_MIMXRT1020_EVK)
     message(WARNING "It appears you are using the board definition for "

boards/nxp/mimxrt1020_evk/Kconfig.defconfig

@@ -5,13 +5,6 @@
 
 if BOARD_MIMXRT1020_EVK
 
-config BOARD
-	default "mimxrt1020_evk" if BOARD_MIMXRT1020_EVK
-
-choice CODE_LOCATION
-	default CODE_FLEXSPI
-endchoice
-
 config DEVICE_CONFIGURATION_DATA
 	default y
 

boards/nxp/mimxrt1020_evk/Kconfig.mimxrt1020_evk

@@ -2,6 +2,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_MIMXRT1020_EVK
-	bool "NXP MIMXRT1020-EVK"
-	depends on SOC_SERIES_IMX_RT
 	select SOC_PART_NUMBER_MIMXRT1021DAG5A

boards/nxp/mimxrt1020_evk/board.yml

@@ -0,0 +1,5 @@
+board:
+  name: mimxrt1020_evk
+  vendor: nxp
+  socs:
+    - name: mimxrt1021

boards/nxp/mimxrt1020_evk/mimxrt1020_evk_defconfig

@@ -4,8 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-CONFIG_SOC_MIMXRT1021=y
-CONFIG_SOC_SERIES_IMX_RT=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y

boards/nxp/mimxrt1024_evk/CMakeLists.txt

@@ -5,7 +5,7 @@
 #
 
 
-if(CONFIG_NXP_IMX_RT_BOOT_HEADER)
+if(CONFIG_NXP_IMXRT_BOOT_HEADER)
   zephyr_library()
   if(NOT DEFINED CONFIG_BOARD_MIMXRT1024_EVK)
     message(WARNING "It appears you are using the board definition for "

boards/nxp/mimxrt1024_evk/Kconfig.defconfig

@@ -5,13 +5,6 @@
 
 if BOARD_MIMXRT1024_EVK
 
-config BOARD
-	default "mimxrt1024_evk" if BOARD_MIMXRT1024_EVK
-
-choice CODE_LOCATION
-	default CODE_FLEXSPI
-endchoice
-
 config DEVICE_CONFIGURATION_DATA
 	default y
 

boards/nxp/mimxrt1024_evk/Kconfig.mimxrt1024_evk

@@ -2,6 +2,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_MIMXRT1024_EVK
-	bool "NXP MIMXRT1024-EVK"
-	depends on SOC_SERIES_IMX_RT
 	select SOC_PART_NUMBER_MIMXRT1024DAG5A

boards/nxp/mimxrt1024_evk/board.yml

@@ -0,0 +1,5 @@
+board:
+  name: mimxrt1024_evk
+  vendor: nxp
+  socs:
+    - name: mimxrt1024

boards/nxp/mimxrt1024_evk/mimxrt1024_evk_defconfig

@@ -4,8 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-CONFIG_SOC_MIMXRT1024=y
-CONFIG_SOC_SERIES_IMX_RT=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y

boards/nxp/mimxrt1040_evk/CMakeLists.txt

@@ -5,7 +5,7 @@
 #
 
 
-if(CONFIG_NXP_IMX_RT_BOOT_HEADER)
+if(CONFIG_NXP_IMXRT_BOOT_HEADER)
   zephyr_library()
   if(NOT DEFINED CONFIG_BOARD_MIMXRT1040_EVK)
     message(WARNING "It appears you are using the board definition for "

boards/nxp/mimxrt1040_evk/Kconfig.defconfig

@@ -3,13 +3,6 @@
 
 if BOARD_MIMXRT1040_EVK
 
-config BOARD
-	default "mimxrt1040_evk" if BOARD_MIMXRT1040_EVK
-
-choice CODE_LOCATION
-	default CODE_FLEXSPI
-endchoice
-
 config DEVICE_CONFIGURATION_DATA
 	default y
 

boards/nxp/mimxrt1040_evk/Kconfig.mimxrt1040_evk

@@ -2,6 +2,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_MIMXRT1040_EVK
-	bool "NXP MIMXRT1040-EVK"
-	depends on SOC_SERIES_IMX_RT
 	select SOC_PART_NUMBER_MIMXRT1042XJM5B

boards/nxp/mimxrt1040_evk/board.yml

@@ -0,0 +1,5 @@
+board:
+  name: mimxrt1040_evk
+  vendor: nxp
+  socs:
+    - name: mimxrt1042

boards/nxp/mimxrt1040_evk/doc/index.rst

@@ -303,7 +303,7 @@ Boot Header
 
 If the debug probe fails to connect with the following error, it's possible
 that the boot header in QSPI is invalid or corrupted. The boot header is
-configured by :kconfig:option:`CONFIG_NXP_IMX_RT_BOOT_HEADER`.
+configured by :kconfig:option:`CONFIG_NXP_IMXRT_BOOT_HEADER`.
 
 .. code-block:: console
 

boards/nxp/mimxrt1040_evk/mimxrt1040_evk_defconfig

@@ -4,9 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-CONFIG_SOC_MIMXRT1042=y
-CONFIG_SOC_SERIES_IMX_RT=y
-CONFIG_BOARD_MIMXRT1040_EVK=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y

boards/nxp/mimxrt1050_evk/CMakeLists.txt

@@ -10,11 +10,11 @@ CONFIG_DISPLAY: Running this firmware on a board without a display may damage th
 ")
 endif()
 
-if(CONFIG_NXP_IMX_RT_BOOT_HEADER)
+if(CONFIG_NXP_IMXRT_BOOT_HEADER)
   zephyr_library()
-  if(CONFIG_BOARD_MIMXRT1050_EVK)
+  if(CONFIG_DT_HAS_NXP_IMX_FLEXSPI_HYPERFLASH_ENABLED)
     set(FLASH_CONF evkbimxrt1050_flexspi_nor_config.c)
-  elseif(CONFIG_BOARD_MIMXRT1050_EVK_QSPI)
+  elseif(CONFIG_DT_HAS_NXP_IMX_FLEXSPI_NOR_ENABLED)
     set(FLASH_CONF evkbimxrt1050_flexspi_nor_qspi_config.c)
   else()
     message(WARNING "It appears you are using the board definition for "

boards/nxp/mimxrt1050_evk/Kconfig.defconfig

@@ -3,15 +3,7 @@
 # Copyright (c) 2017, NXP
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_MIMXRT1050_EVK || BOARD_MIMXRT1050_EVK_QSPI
-
-config BOARD
-	default "mimxrt1050_evk" if BOARD_MIMXRT1050_EVK
-	default "mimxrt1050_evk_qspi" if BOARD_MIMXRT1050_EVK_QSPI
-
-choice CODE_LOCATION
-	default CODE_FLEXSPI
-endchoice
+if BOARD_MIMXRT1050_EVK
 
 config DEVICE_CONFIGURATION_DATA
 	default y
@@ -19,18 +11,6 @@ config DEVICE_CONFIGURATION_DATA
 config NXP_IMX_EXTERNAL_SDRAM
 	default y
 
-if FLASH
-
-config FLASH_MCUX_FLEXSPI_HYPERFLASH
-	default y if BOARD_MIMXRT1050_EVK
-	default n if BOARD_MIMXRT1050_EVK_QSPI
-
-config FLASH_MCUX_FLEXSPI_NOR
-	default y if BOARD_MIMXRT1050_EVK_QSPI
-	default n if BOARD_MIMXRT1050_EVK
-
-endif #FLASH
-
 config INPUT
 	default y if LVGL
 
@@ -69,4 +49,4 @@ endchoice
 
 endif # LVGL
 
-endif # BOARD_MIMXRT1050_EVK || BOARD_MIMXRT1050_EVK_QSPI
+endif # BOARD_MIMXRT1050_EVK

boards/nxp/mimxrt1050_evk/Kconfig.mimxrt1050_evk

@@ -0,0 +1,5 @@
+# Copyright (c) 2017, NXP
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_MIMXRT1050_EVK
+	select SOC_PART_NUMBER_MIMXRT1052DVL6B

boards/nxp/mimxrt1050_evk/board.cmake

@@ -0,0 +1,18 @@
+#
+# Copyright 2017, 2024 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+board_runner_args(jlink "--device=MCIMXRT1052")
+
+if("${BOARD_REVISION}" STREQUAL "qspi")
+  board_runner_args(jlink "--loader=BankAddr=0x60000000&Loader=QSPI")
+  board_runner_args(pyocd "--target=mimxrt1050_quadspi")
+else()
+  board_runner_args(pyocd "--target=mimxrt1050_hyperflash")
+  board_runner_args(linkserver  "--device=MIMXRT1052xxxxB:EVKB-IMXRT1050")
+  include(${ZEPHYR_BASE}/boards/common/linkserver.board.cmake)
+endif()
+
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)