boards: nxp: convert mimxrt595_evk to hardware model v2

Convert mimxrt595_evk to hardware model v2. Both the CM33 and Fusion F1
DSP devicetrees are moved to reside in the same board folder

Signed-off-by: Daniel DeGrasse <daniel.degrasse@nxp.com>

boards/boards_legacy/arm/mimxrt595_evk/Kconfig

@@ -1,8 +0,0 @@
-# Copyright 2022, NXP
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_INIT_PRIORITY
-	int "Board initialization priority"
-	default 45
-	help
-	  Board initialization priority.

boards/boards_legacy/arm/mimxrt595_evk/Kconfig.board

@@ -1,9 +0,0 @@
-# Copyright (c) 2022, NXP
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_MIMXRT595_EVK
-	bool "NXP MIMXRT595-EVK"
-	depends on SOC_SERIES_IMX_RT5XX
-	select CODE_DATA_RELOCATION_SRAM
-	select SOC_PART_NUMBER_MIMXRT595SFFOC
-	select NXP_IMX_RT5XX_BOOT_HEADER if !BOOTLOADER_MCUBOOT

boards/boards_legacy/xtensa/nxp_adsp_rt595/Kconfig.board

@@ -1,6 +0,0 @@
-# Copyright (c) 2023 Google LLC.
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_NXP_ADSP_RT595
-	bool "NXP ADSP RT595"
-	depends on SOC_SERIES_NXP_RT5XX

boards/boards_legacy/xtensa/nxp_adsp_rt595/Kconfig.defconfig

@@ -1,9 +0,0 @@
-# Copyright (c) 2023 Google LLC.
-# SPDX-License-Identifier: Apache-2.0
-
-if BOARD_NXP_ADSP_RT595
-
-config BOARD
-	default "nxp_adsp_rt595"
-
-endif # BOARD_NXP_ADSP_RT595

boards/nxp/mimxrt595_evk/CMakeLists.txt

@@ -4,12 +4,14 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-zephyr_library()
-zephyr_library_sources(board.c)
-zephyr_library_include_directories(.)
+if(CONFIG_BOARD_MIMXRT595_EVK_MIMXRT595S_CM33)
+  zephyr_library()
+  zephyr_library_sources(board.c)
+  zephyr_library_include_directories(.)
+endif()
 
-if(CONFIG_NXP_IMX_RT5XX_BOOT_HEADER)
-  if(NOT DEFINED CONFIG_BOARD_MIMXRT595_EVK)
+if(CONFIG_NXP_IMXRT_BOOT_HEADER)
+  if(NOT DEFINED CONFIG_BOARD_MIMXRT595_EVK_MIMXRT595S_CM33)
     message(WARNING "It appears you are using the board definition for "
      "the MIMXRT595-EVK, but targeting a custom board. You may need to "
      "update your flash configuration block data")

boards/nxp/mimxrt595_evk/Kconfig

@@ -1,11 +1,18 @@
+# Copyright 2022, NXP
 # Copyright (c) 2023 Google LLC.
 # SPDX-License-Identifier: Apache-2.0
 
+config BOARD_INIT_PRIORITY
+	int "Board initialization priority"
+	default 45
+	help
+	  Board initialization priority.
+
 DT_ADSP_RESET_MEM := $(dt_nodelabel_path,adsp_reset)
 DT_ADSP_DATA_MEM := $(dt_nodelabel_path,adsp_data)
 DT_ADSP_TEXT_MEM := $(dt_nodelabel_path,adsp_text)
 
-if BOARD_NXP_ADSP_RT595
+if BOARD_MIMXRT595_EVK_MIMXRT595S_F1
 
 config RT595_ADSP_STACK_SIZE
 	hex "Boot time stack size"
@@ -38,4 +45,4 @@ config RT595_ADSP_TEXT_MEM_SIZE
 	hex
 	default $(dt_node_reg_size_hex,$(DT_ADSP_TEXT_MEM))
 
-endif # BOARD_NXP_ADSP_RT595
+endif # BOARD_MIMXRT595_EVK_RT595_F1

boards/nxp/mimxrt595_evk/Kconfig.defconfig

@@ -3,10 +3,7 @@
 # Copyright 2022-2023, NXP
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_MIMXRT595_EVK
-
-config BOARD
-	default "mimxrt595_evk_cm33"
+if BOARD_MIMXRT595_EVK_MIMXRT595S_CM33
 
 config FLASH_MCUX_FLEXSPI_MX25UM51345G
 	default y if FLASH
@@ -39,4 +36,4 @@ config PM_DEVICE
 config REGULATOR
 	default y if PM || POWEROFF
 
-endif # BOARD_MIMXRT595_EVK
+endif # BOARD_MIMXRT595_EVK_MIMXRT595S_CM33

boards/nxp/mimxrt595_evk/Kconfig.mimxrt595_evk

@@ -0,0 +1,10 @@
+#
+# Copyright 2024 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+config BOARD_MIMXRT595_EVK
+	select SOC_PART_NUMBER_MIMXRT595SFFOC
+	select SOC_MIMXRT595S_CM33 if BOARD_MIMXRT595_EVK_MIMXRT595S_CM33
+	select SOC_MIMXRT595S_F1 if BOARD_MIMXRT595_EVK_MIMXRT595S_F1

boards/nxp/mimxrt595_evk/board.yml

@@ -0,0 +1,5 @@
+board:
+  name: mimxrt595_evk
+  vendor: nxp
+  socs:
+    - name: mimxrt595s

boards/nxp/mimxrt595_evk/doc/index.rst

@@ -118,7 +118,7 @@ already supported, which can also be re-used on this mimxrt595_evk board:
 
 The default configuration can be found in the defconfig file:
 
-	``boards/arm/mimxrt595_evk/mimxrt595_evk_cm33_defconfig``
+   :zephyr_file:`boards/nxp/mimxrt595_evk/mimxrt595_evk_mimxrt595s_cm33_defconfig`
 
 Other hardware features are not currently supported by the port.
 
@@ -179,13 +179,13 @@ configured as USART for the console and the remaining are not used.
 Fusion F1 DSP Core
 ==================
 
-You can build a Zephyr application for the RT500 DSP core using nxp_adsp_rt595
-board. Xtensa toolchain supporting RT500 DSP core is included in Zephyr SDK.
+You can build a Zephyr application for the RT500 DSP core by targeting the F1
+SOC. Xtensa toolchain supporting RT500 DSP core is included in Zephyr SDK.
 To build the hello_world sample for the RT500 DSP core:
 
 .. code-block:: shell
 
-   $ west build -b nxp_adsp_rt595 samples/hello_world
+   $ west build -b mimxrt595_evk/mimxrt595s/f1 samples/hello_world
 
 For detailed instructions on how to debug DSP firmware, please refer to
 this document: `Getting Started with Xplorer for EVK-MIMXRT595`_
@@ -249,7 +249,7 @@ Here is an example for the :ref:`hello_world` application. This example uses the
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: mimxrt595_evk_cm33
+   :board: mimxrt595_evk/mimxrt595s/cm33
    :goals: flash
 
 Open a serial terminal, reset the board (press the RESET button), and you should
@@ -258,7 +258,7 @@ see the following message in the terminal:
 .. code-block:: console
 
    *** Booting Zephyr OS v2.7 ***
-   Hello World! mimxrt595_evk_cm33
+   Hello World! mimxrt595_evk
 
 Debugging
 =========
@@ -268,7 +268,7 @@ Here is an example for the :ref:`hello_world` application. This example uses the
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: mimxrt595_evk_cm33
+   :board: mimxrt595_evk/mimxrt595s/cm33
    :goals: debug
 
 Open a serial terminal, step through the application in your debugger, and you
@@ -277,7 +277,7 @@ should see the following message in the terminal:
 .. code-block:: console
 
    *** Booting Zephyr OS v2.7 ***
-   Hello World! mimxrt595_evk_cm33
+   Hello World! mimxrt595_evk
 
 Troubleshooting
 ===============

boards/nxp/mimxrt595_evk/mimxrt595_evk_mimxrt595s_cm33.dts

@@ -9,7 +9,7 @@
 #include <nxp/nxp_rt5xx.dtsi>
 #include <zephyr/dt-bindings/input/input-event-codes.h>
 
-#include "mimxrt595_evk_cm33-pinctrl.dtsi"
+#include "mimxrt595_evk_mimxrt595s_cm33-pinctrl.dtsi"
 
 
 / {

boards/nxp/mimxrt595_evk/mimxrt595_evk_mimxrt595s_cm33.yaml

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-identifier: mimxrt595_evk_cm33
+identifier: mimxrt595_evk/mimxrt595s/cm33
 name: NXP MIMXRT595-EVK
 type: mcu
 arch: arm

boards/nxp/mimxrt595_evk/mimxrt595_evk_mimxrt595s_cm33_defconfig

@@ -1,12 +1,9 @@
 #
-# Copyright 2022, NXP
+# Copyright 2022,2024 NXP
 #
 # SPDX-License-Identifier: Apache-2.0
 #
 
-CONFIG_SOC_MIMXRT595S_CM33=y
-CONFIG_SOC_SERIES_IMX_RT5XX=y
-CONFIG_BOARD_MIMXRT595_EVK=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y

boards/nxp/mimxrt595_evk/mimxrt595_evk_mimxrt595s_f1.yaml

@@ -1,5 +1,5 @@
-identifier: nxp_adsp_rt595
-name: i.MXRT595 DSP
+identifier: mimxrt595_evk/mimxrt595s/f1
+name: i.MXRT595 Fusion F1 DSP
 type: mcu
 arch: xtensa
 toolchain:

boards/nxp/mimxrt595_evk/mimxrt595_evk_mimxrt595s_f1_defconfig

@@ -1,7 +1,4 @@
-CONFIG_SOC_SERIES_NXP_RT5XX=y
-CONFIG_SOC_NXP_RT595=y
-CONFIG_BOARD_NXP_ADSP_RT595=y
-
 CONFIG_GEN_ISR_TABLES=y
 CONFIG_GEN_IRQ_VECTOR_TABLE=n
 CONFIG_XTENSA_SMALL_VECTOR_TABLE_ENTRY=y
+CONFIG_NXP_IMXRT_BOOT_HEADER=n

boards/shields/g1120b0mipi/doc/index.rst

@@ -55,7 +55,7 @@ example:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/drivers/display
-   :board: mimxrt595_evk_cm33
+   :board: mimxrt595_evk/mimxrt595s/cm33
    :shield: g1120b0mipi
    :goals: build
 

samples/boards/mimxrt595_evk/system_off/CMakeLists.txt

@@ -4,6 +4,6 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(mimxrt595_evk_cm33_system_off)
+project(mimxrt595_evk_system_off)
 
 target_sources(app PRIVATE src/main.c)

samples/boards/mimxrt595_evk/system_off/README.rst

@@ -22,8 +22,8 @@ Building, Flashing and Running
 ******************************
 
 .. zephyr-app-commands::
-   :zephyr-app: samples/boards/mimxrt595_evk_cm33/system_off
-   :board: mimxrt595_evk_cm33
+   :zephyr-app: samples/boards/mimxrt595_evk/system_off
+   :board: mimxrt595_evk/mimxrt595s/cm33
    :goals: build flash
    :compact:
 

samples/boards/mimxrt595_evk/system_off/sample.yaml

@@ -8,6 +8,6 @@ sample:
 common:
   tags: power
 tests:
-  sample.boards.mimxrt595_evk_cm33.system_off:
+  sample.boards.mimxrt595_evk.system_off:
     build_only: true
-    platform_allow: mimxrt595_evk_cm33
+    platform_allow: mimxrt595_evk/mimxrt595s/cm33

samples/drivers/display/sample.yaml

@@ -95,7 +95,7 @@ tests:
     harness_config:
       fixture: fixture_display
   sample.display.mcux_dcnano_lcdif:
-    platform_allow: mimxrt595_evk_cm33
+    platform_allow: mimxrt595_evk/mimxrt595s/cm33
     tags: display
     harness: console
     extra_args: SHIELD=rk055hdmipi4m
@@ -136,7 +136,7 @@ tests:
     harness_config:
       fixture: fixture_display
   sample.display.g1120b0mipi:
-    platform_allow: mimxrt595_evk_cm33
+    platform_allow: mimxrt595_evk/mimxrt595s/cm33
     tags: display
     harness: console
     extra_args: SHIELD=g1120b0mipi

samples/drivers/memc/README.rst

@@ -23,11 +23,11 @@ This application can be built and executed on an RT595 EVK as follows:
 .. zephyr-app-commands::
    :zephyr-app: samples/drivers/memc
    :host-os: unix
-   :board: mimxrt595_evk_cm33
+   :board: mimxrt595_evk/mimxrt595s/cm33
    :goals: run
    :compact:
 
-To build for another board, change "mimxrt595_evk_cm33" above to that
+To build for another board, change "mimxrt595_evk/mimxrt595s/cm33" above to that
 board's name.
 
 Sample Output

samples/drivers/memc/sample.yaml

@@ -5,7 +5,7 @@ common:
   tags: memc
   filter: dt_alias_exists("sram-ext")
   integration_platforms:
-    - mimxrt595_evk_cm33
+    - mimxrt595_evk/mimxrt595s/cm33
   harness: console
   harness_config:
     type: one_line

samples/sensor/fxos8700/README.rst

@@ -129,7 +129,7 @@ Sample can be built and executed for the MIMXRT595-EVK as follows:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/sensor/fxos8700
-   :board: mimxrt595_evk_cm33
+   :board: mimxrt595_evk/mimxrt595s/cm33
    :goals: build flash
    :compact:
 

samples/sensor/fxos8700/sample.yaml

@@ -19,7 +19,7 @@ tests:
       - mimxrt685_evk
       - frdm_k22f
       - mimxrt1024_evk
-      - mimxrt595_evk_cm33
+      - mimxrt595_evk/mimxrt595s/cm33
     integration_platforms:
       - frdm_k64f
     extra_configs:
@@ -35,7 +35,7 @@ tests:
       - lpcxpresso55s69_cpu0
       - reel_board
       - mimxrt685_evk
-      - mimxrt595_evk_cm33
+      - mimxrt595_evk/mimxrt595s/cm33
     integration_platforms:
       - bbc_microbit
     extra_args: CONF_FILE=prj_accel.conf

samples/subsys/display/lvgl/sample.yaml

@@ -37,7 +37,7 @@ tests:
     extra_args: SHIELD="rk055hdmipi4m"
     platform_allow:
       - mimxrt1170_evk/mimxrt1176/cm7
-      - mimxrt595_evk_cm33
+      - mimxrt595_evk/mimxrt595s/cm33
     integration_platforms:
       - mimxrt1170_evk/mimxrt1176/cm7
   sample.subsys.display.lvgl.st_b_lcd40_dsi1_mb1166:

tests/boot/test_mcuboot/testcase.yaml

@@ -31,7 +31,7 @@ tests:
       - mimxrt1064_evk
       - mimxrt1160_evk/mimxrt1166/cm7
       - mimxrt1170_evk/mimxrt1176/cm7
-      - mimxrt595_evk_cm33
+      - mimxrt595_evk/mimxrt595s/cm33
       - mimxrt685_evk
       - nrf52840dk/nrf52840
     integration_platforms:

tests/drivers/audio/dmic_api/testcase.yaml

@@ -5,4 +5,4 @@ tests:
     harness: ztest
     filter: dt_alias_exists("dmic-dev")
     integration_platforms:
-      - mimxrt595_evk_cm33
+      - mimxrt595_evk/mimxrt595s/cm33

tests/drivers/disk/disk_performance/testcase.yaml

@@ -10,7 +10,7 @@ tests:
     tags: sdhc
     integration_platforms:
       - mimxrt1064_evk
-      - mimxrt595_evk_cm33
+      - mimxrt595_evk/mimxrt595s/cm33
   drivers.disk.disk_performance.disk.nvme:
     extra_configs:
       - CONFIG_NVME=y

tests/drivers/dma/chan_link_transfer/testcase.yaml

@@ -7,7 +7,7 @@ tests:
       - dma
     platform_allow:
       - frdm_k64f
-      - mimxrt595_evk_cm33
+      - mimxrt595_evk/mimxrt595s/cm33
       - mimxrt1050_evk
       - mimxrt1060_evk
       - mimxrt1064_evk

tests/drivers/i2s/i2s_api/testcase.yaml

@@ -6,7 +6,7 @@ tests:
       - userspace
     filter: not CONFIG_I2S_TEST_USE_GPIO_LOOPBACK
     platform_exclude:
-      - mimxrt595_evk_cm33
+      - mimxrt595_evk/mimxrt595s/cm33
       - mimxrt685_evk
   drivers.i2s.gpio_loopback:
     depends_on:
@@ -18,7 +18,7 @@ tests:
     filter: CONFIG_I2S_TEST_USE_GPIO_LOOPBACK
     harness: ztest
     platform_exclude:
-      - mimxrt595_evk
+      - mimxrt595_evk/mimxrt595s/cm33
       - mimxrt685_evk
     harness_config:
       fixture: gpio_loopback

tests/subsys/pm/power_mgmt_soc/testcase.yaml

@@ -9,7 +9,7 @@ tests:
       - nucleo_wb55rg
       - nucleo_l476rg
       - twr_ke18f
-      - mimxrt595_evk_cm33
+      - mimxrt595_evk/mimxrt595s/cm33
     tags: pm
     integration_platforms:
       - mec15xxevb_assy6853

tests/subsys/sd/mmc/testcase.yaml

@@ -10,4 +10,4 @@ tests:
     tags: sdhc
     min_ram: 32
     integration_platforms:
-      - mimxrt595_evk_cm33
+      - mimxrt595_evk/mimxrt595s/cm33