diff --git a/boards/boards_legacy/arm/mimxrt1010_evk/Kconfig.defconfig b/boards/boards_legacy/arm/mimxrt1010_evk/Kconfig.defconfig deleted file mode 100644 index da98cdf9ffaec18..000000000000000 --- a/boards/boards_legacy/arm/mimxrt1010_evk/Kconfig.defconfig +++ /dev/null @@ -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 diff --git a/boards/boards_legacy/arm/mimxrt1015_evk/Kconfig.defconfig b/boards/boards_legacy/arm/mimxrt1015_evk/Kconfig.defconfig deleted file mode 100644 index 215f75a827ee6a7..000000000000000 --- a/boards/boards_legacy/arm/mimxrt1015_evk/Kconfig.defconfig +++ /dev/null @@ -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 diff --git a/boards/boards_legacy/arm/mimxrt1050_evk/Kconfig.board b/boards/boards_legacy/arm/mimxrt1050_evk/Kconfig.board deleted file mode 100644 index 9627ee203198b77..000000000000000 --- a/boards/boards_legacy/arm/mimxrt1050_evk/Kconfig.board +++ /dev/null @@ -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 diff --git a/boards/boards_legacy/arm/mimxrt1050_evk/board.cmake b/boards/boards_legacy/arm/mimxrt1050_evk/board.cmake deleted file mode 100644 index 265ce1cd5f8d5f9..000000000000000 --- a/boards/boards_legacy/arm/mimxrt1050_evk/board.cmake +++ /dev/null @@ -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) diff --git a/boards/boards_legacy/arm/mimxrt1050_evk/mimxrt1050_evk_qspi_defconfig b/boards/boards_legacy/arm/mimxrt1050_evk/mimxrt1050_evk_qspi_defconfig deleted file mode 100644 index 5ad5307db8caaba..000000000000000 --- a/boards/boards_legacy/arm/mimxrt1050_evk/mimxrt1050_evk_qspi_defconfig +++ /dev/null @@ -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 diff --git a/boards/boards_legacy/arm/mimxrt1060_evk/Kconfig.board b/boards/boards_legacy/arm/mimxrt1060_evk/Kconfig.board deleted file mode 100644 index d075c432477e7f9..000000000000000 --- a/boards/boards_legacy/arm/mimxrt1060_evk/Kconfig.board +++ /dev/null @@ -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 diff --git a/boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evk_hyperflash_defconfig b/boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evk_hyperflash_defconfig deleted file mode 100644 index 418a8293e11dd61..000000000000000 --- a/boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evk_hyperflash_defconfig +++ /dev/null @@ -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 diff --git a/boards/boards_legacy/arm/mimxrt1160_evk/Kconfig.board b/boards/boards_legacy/arm/mimxrt1160_evk/Kconfig.board deleted file mode 100644 index 2f7b3533bf7bfdd..000000000000000 --- a/boards/boards_legacy/arm/mimxrt1160_evk/Kconfig.board +++ /dev/null @@ -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 diff --git a/boards/boards_legacy/arm/mimxrt1170_evk/Kconfig.board b/boards/boards_legacy/arm/mimxrt1170_evk/Kconfig.board deleted file mode 100644 index b3b5a6e78f87592..000000000000000 --- a/boards/boards_legacy/arm/mimxrt1170_evk/Kconfig.board +++ /dev/null @@ -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 diff --git a/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evk_cm7_defconfig b/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evk_cm7_defconfig deleted file mode 100644 index db4c2d5c5a88a79..000000000000000 --- a/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evk_cm7_defconfig +++ /dev/null @@ -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 diff --git a/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evkb_cm4_defconfig b/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evkb_cm4_defconfig deleted file mode 100644 index b1dd310aa4bf22f..000000000000000 --- a/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evkb_cm4_defconfig +++ /dev/null @@ -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 diff --git a/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evkb_cm7_defconfig b/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evkb_cm7_defconfig deleted file mode 100644 index a59d2e39e479617..000000000000000 --- a/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evkb_cm7_defconfig +++ /dev/null @@ -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 diff --git a/boards/boards_legacy/arm/mimxrt685_evk/Kconfig.board b/boards/boards_legacy/arm/mimxrt685_evk/Kconfig.board deleted file mode 100644 index e1223fa03f398e8..000000000000000 --- a/boards/boards_legacy/arm/mimxrt685_evk/Kconfig.board +++ /dev/null @@ -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 diff --git a/boards/boards_legacy/arm/teensy4/Kconfig.board b/boards/boards_legacy/arm/teensy4/Kconfig.board deleted file mode 100644 index f0f5f55a8e0e73e..000000000000000 --- a/boards/boards_legacy/arm/teensy4/Kconfig.board +++ /dev/null @@ -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 diff --git a/boards/madmachine/index.rst b/boards/madmachine/index.rst new file mode 100644 index 000000000000000..a43bebd08ad4c61 --- /dev/null +++ b/boards/madmachine/index.rst @@ -0,0 +1,10 @@ +.. _boards-mad-machine: + +Mad Machine +########### + +.. toctree:: + :maxdepth: 1 + :glob: + + **/* diff --git a/boards/boards_legacy/arm/mm_feather/CMakeLists.txt b/boards/madmachine/mm_feather/CMakeLists.txt similarity index 92% rename from boards/boards_legacy/arm/mm_feather/CMakeLists.txt rename to boards/madmachine/mm_feather/CMakeLists.txt index e20be4b42e07374..623a4b901ac154f 100644 --- a/boards/boards_legacy/arm/mm_feather/CMakeLists.txt +++ b/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) diff --git a/boards/boards_legacy/arm/mm_feather/Kconfig.defconfig b/boards/madmachine/mm_feather/Kconfig.defconfig similarity index 77% rename from boards/boards_legacy/arm/mm_feather/Kconfig.defconfig rename to boards/madmachine/mm_feather/Kconfig.defconfig index 80201fdcb8645f5..a2503d832b4fa9b 100644 --- a/boards/boards_legacy/arm/mm_feather/Kconfig.defconfig +++ b/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 diff --git a/boards/boards_legacy/arm/mm_feather/Kconfig.board b/boards/madmachine/mm_feather/Kconfig.mm_feather similarity index 71% rename from boards/boards_legacy/arm/mm_feather/Kconfig.board rename to boards/madmachine/mm_feather/Kconfig.mm_feather index c003514fdab1228..33a0180483d3a2e 100644 --- a/boards/boards_legacy/arm/mm_feather/Kconfig.board +++ b/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 diff --git a/boards/boards_legacy/arm/mm_feather/board.cmake b/boards/madmachine/mm_feather/board.cmake similarity index 100% rename from boards/boards_legacy/arm/mm_feather/board.cmake rename to boards/madmachine/mm_feather/board.cmake diff --git a/boards/madmachine/mm_feather/board.yml b/boards/madmachine/mm_feather/board.yml new file mode 100644 index 000000000000000..1b9ca3f2c7c10af --- /dev/null +++ b/boards/madmachine/mm_feather/board.yml @@ -0,0 +1,5 @@ +board: + name: mm_feather + vendor: madmachine + socs: + - name: mimxrt1062 diff --git a/boards/boards_legacy/arm/mm_feather/doc/index.rst b/boards/madmachine/mm_feather/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/mm_feather/doc/index.rst rename to boards/madmachine/mm_feather/doc/index.rst diff --git a/boards/boards_legacy/arm/mm_feather/doc/mm_feather.jpg b/boards/madmachine/mm_feather/doc/mm_feather.jpg similarity index 100% rename from boards/boards_legacy/arm/mm_feather/doc/mm_feather.jpg rename to boards/madmachine/mm_feather/doc/mm_feather.jpg diff --git a/boards/boards_legacy/arm/mm_feather/flexspi_nor_config.c b/boards/madmachine/mm_feather/flexspi_nor_config.c similarity index 92% rename from boards/boards_legacy/arm/mm_feather/flexspi_nor_config.c rename to boards/madmachine/mm_feather/flexspi_nor_config.c index 647dac001c92aeb..c229eda7d995851 100644 --- a/boards/boards_legacy/arm/mm_feather/flexspi_nor_config.c +++ b/boards/madmachine/mm_feather/flexspi_nor_config.c @@ -8,7 +8,7 @@ #include -#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 */ diff --git a/boards/boards_legacy/arm/mm_feather/mm_feather-pinctrl.dtsi b/boards/madmachine/mm_feather/mm_feather-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/mm_feather/mm_feather-pinctrl.dtsi rename to boards/madmachine/mm_feather/mm_feather-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/mm_feather/mm_feather.dts b/boards/madmachine/mm_feather/mm_feather.dts similarity index 100% rename from boards/boards_legacy/arm/mm_feather/mm_feather.dts rename to boards/madmachine/mm_feather/mm_feather.dts diff --git a/boards/boards_legacy/arm/mm_feather/mm_feather.yaml b/boards/madmachine/mm_feather/mm_feather.yaml similarity index 100% rename from boards/boards_legacy/arm/mm_feather/mm_feather.yaml rename to boards/madmachine/mm_feather/mm_feather.yaml diff --git a/boards/boards_legacy/arm/mm_feather/mm_feather_defconfig b/boards/madmachine/mm_feather/mm_feather_defconfig similarity index 83% rename from boards/boards_legacy/arm/mm_feather/mm_feather_defconfig rename to boards/madmachine/mm_feather/mm_feather_defconfig index 1ec155fc2fedd8b..65cb3610d48c324 100644 --- a/boards/boards_legacy/arm/mm_feather/mm_feather_defconfig +++ b/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 diff --git a/boards/boards_legacy/arm/mm_feather/mmfeather_sdram_ini_dcd.c b/boards/madmachine/mm_feather/mmfeather_sdram_ini_dcd.c similarity index 100% rename from boards/boards_legacy/arm/mm_feather/mmfeather_sdram_ini_dcd.c rename to boards/madmachine/mm_feather/mmfeather_sdram_ini_dcd.c diff --git a/boards/boards_legacy/arm/mm_swiftio/CMakeLists.txt b/boards/madmachine/mm_swiftio/CMakeLists.txt similarity index 92% rename from boards/boards_legacy/arm/mm_swiftio/CMakeLists.txt rename to boards/madmachine/mm_swiftio/CMakeLists.txt index 8fb1964f3209ace..c3084a6b71b923c 100644 --- a/boards/boards_legacy/arm/mm_swiftio/CMakeLists.txt +++ b/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) diff --git a/boards/boards_legacy/arm/mm_swiftio/Kconfig.defconfig b/boards/madmachine/mm_swiftio/Kconfig.defconfig similarity index 77% rename from boards/boards_legacy/arm/mm_swiftio/Kconfig.defconfig rename to boards/madmachine/mm_swiftio/Kconfig.defconfig index 95fe8e06d9c8e97..207e95b67570019 100644 --- a/boards/boards_legacy/arm/mm_swiftio/Kconfig.defconfig +++ b/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 diff --git a/boards/boards_legacy/arm/mm_swiftio/Kconfig.board b/boards/madmachine/mm_swiftio/Kconfig.mm_swiftio similarity index 51% rename from boards/boards_legacy/arm/mm_swiftio/Kconfig.board rename to boards/madmachine/mm_swiftio/Kconfig.mm_swiftio index 65352dfdc01cc33..11ed8ddafd5e082 100644 --- a/boards/boards_legacy/arm/mm_swiftio/Kconfig.board +++ b/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 diff --git a/boards/boards_legacy/arm/mm_swiftio/board.cmake b/boards/madmachine/mm_swiftio/board.cmake similarity index 100% rename from boards/boards_legacy/arm/mm_swiftio/board.cmake rename to boards/madmachine/mm_swiftio/board.cmake diff --git a/boards/madmachine/mm_swiftio/board.yml b/boards/madmachine/mm_swiftio/board.yml new file mode 100644 index 000000000000000..784e79c52adf4d0 --- /dev/null +++ b/boards/madmachine/mm_swiftio/board.yml @@ -0,0 +1,5 @@ +board: + name: mm_swiftio + vendor: madmachine + socs: + - name: mimxrt1052 diff --git a/boards/boards_legacy/arm/mm_swiftio/doc/index.rst b/boards/madmachine/mm_swiftio/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/mm_swiftio/doc/index.rst rename to boards/madmachine/mm_swiftio/doc/index.rst diff --git a/boards/boards_legacy/arm/mm_swiftio/doc/mm_swiftio.jpg b/boards/madmachine/mm_swiftio/doc/mm_swiftio.jpg similarity index 100% rename from boards/boards_legacy/arm/mm_swiftio/doc/mm_swiftio.jpg rename to boards/madmachine/mm_swiftio/doc/mm_swiftio.jpg diff --git a/boards/boards_legacy/arm/mm_swiftio/flexspi_nor_config.c b/boards/madmachine/mm_swiftio/flexspi_nor_config.c similarity index 92% rename from boards/boards_legacy/arm/mm_swiftio/flexspi_nor_config.c rename to boards/madmachine/mm_swiftio/flexspi_nor_config.c index 647dac001c92aeb..c229eda7d995851 100644 --- a/boards/boards_legacy/arm/mm_swiftio/flexspi_nor_config.c +++ b/boards/madmachine/mm_swiftio/flexspi_nor_config.c @@ -8,7 +8,7 @@ #include -#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 */ diff --git a/boards/boards_legacy/arm/mm_swiftio/mm_swiftio-pinctrl.dtsi b/boards/madmachine/mm_swiftio/mm_swiftio-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/mm_swiftio/mm_swiftio-pinctrl.dtsi rename to boards/madmachine/mm_swiftio/mm_swiftio-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/mm_swiftio/mm_swiftio.dts b/boards/madmachine/mm_swiftio/mm_swiftio.dts similarity index 100% rename from boards/boards_legacy/arm/mm_swiftio/mm_swiftio.dts rename to boards/madmachine/mm_swiftio/mm_swiftio.dts diff --git a/boards/boards_legacy/arm/mm_swiftio/mm_swiftio.yaml b/boards/madmachine/mm_swiftio/mm_swiftio.yaml similarity index 100% rename from boards/boards_legacy/arm/mm_swiftio/mm_swiftio.yaml rename to boards/madmachine/mm_swiftio/mm_swiftio.yaml diff --git a/boards/boards_legacy/arm/mm_swiftio/mm_swiftio_defconfig b/boards/madmachine/mm_swiftio/mm_swiftio_defconfig similarity index 83% rename from boards/boards_legacy/arm/mm_swiftio/mm_swiftio_defconfig rename to boards/madmachine/mm_swiftio/mm_swiftio_defconfig index d09c986b33ad4cf..0aee57c3625b406 100644 --- a/boards/boards_legacy/arm/mm_swiftio/mm_swiftio_defconfig +++ b/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 diff --git a/boards/boards_legacy/arm/mm_swiftio/mmswiftio_sdram_ini_dcd.c b/boards/madmachine/mm_swiftio/mmswiftio_sdram_ini_dcd.c similarity index 100% rename from boards/boards_legacy/arm/mm_swiftio/mmswiftio_sdram_ini_dcd.c rename to boards/madmachine/mm_swiftio/mmswiftio_sdram_ini_dcd.c diff --git a/boards/boards_legacy/arm/mimxrt1010_evk/CMakeLists.txt b/boards/nxp/mimxrt1010_evk/CMakeLists.txt similarity index 97% rename from boards/boards_legacy/arm/mimxrt1010_evk/CMakeLists.txt rename to boards/nxp/mimxrt1010_evk/CMakeLists.txt index 53422e1b03058a7..260448d63c76acd 100644 --- a/boards/boards_legacy/arm/mimxrt1010_evk/CMakeLists.txt +++ b/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 " diff --git a/boards/boards_legacy/arm/mimxrt1010_evk/Kconfig.board b/boards/nxp/mimxrt1010_evk/Kconfig.mimxrt1010_evk similarity index 67% rename from boards/boards_legacy/arm/mimxrt1010_evk/Kconfig.board rename to boards/nxp/mimxrt1010_evk/Kconfig.mimxrt1010_evk index 7ccc20510739deb..faf3f0c884d30f3 100644 --- a/boards/boards_legacy/arm/mimxrt1010_evk/Kconfig.board +++ b/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 diff --git a/boards/boards_legacy/arm/mimxrt1010_evk/board.cmake b/boards/nxp/mimxrt1010_evk/board.cmake similarity index 100% rename from boards/boards_legacy/arm/mimxrt1010_evk/board.cmake rename to boards/nxp/mimxrt1010_evk/board.cmake diff --git a/boards/nxp/mimxrt1010_evk/board.yml b/boards/nxp/mimxrt1010_evk/board.yml new file mode 100644 index 000000000000000..8c5dd6f1d750207 --- /dev/null +++ b/boards/nxp/mimxrt1010_evk/board.yml @@ -0,0 +1,5 @@ +board: + name: mimxrt1010_evk + vendor: nxp + socs: + - name: mimxrt1011 diff --git a/boards/boards_legacy/arm/mimxrt1010_evk/doc/index.rst b/boards/nxp/mimxrt1010_evk/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/mimxrt1010_evk/doc/index.rst rename to boards/nxp/mimxrt1010_evk/doc/index.rst diff --git a/boards/boards_legacy/arm/mimxrt1010_evk/doc/mimxrt1010_evk.jpg b/boards/nxp/mimxrt1010_evk/doc/mimxrt1010_evk.jpg similarity index 100% rename from boards/boards_legacy/arm/mimxrt1010_evk/doc/mimxrt1010_evk.jpg rename to boards/nxp/mimxrt1010_evk/doc/mimxrt1010_evk.jpg diff --git a/boards/boards_legacy/arm/mimxrt1010_evk/init.c b/boards/nxp/mimxrt1010_evk/init.c similarity index 88% rename from boards/boards_legacy/arm/mimxrt1010_evk/init.c rename to boards/nxp/mimxrt1010_evk/init.c index 1e62f4b5a6ba576..1fd4b67e457e851 100644 --- a/boards/boards_legacy/arm/mimxrt1010_evk/init.c +++ b/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 } diff --git a/boards/boards_legacy/arm/mimxrt1010_evk/mimxrt1010_evk-pinctrl.dtsi b/boards/nxp/mimxrt1010_evk/mimxrt1010_evk-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/mimxrt1010_evk/mimxrt1010_evk-pinctrl.dtsi rename to boards/nxp/mimxrt1010_evk/mimxrt1010_evk-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/mimxrt1010_evk/mimxrt1010_evk.dts b/boards/nxp/mimxrt1010_evk/mimxrt1010_evk.dts similarity index 100% rename from boards/boards_legacy/arm/mimxrt1010_evk/mimxrt1010_evk.dts rename to boards/nxp/mimxrt1010_evk/mimxrt1010_evk.dts diff --git a/boards/boards_legacy/arm/mimxrt1010_evk/mimxrt1010_evk.yaml b/boards/nxp/mimxrt1010_evk/mimxrt1010_evk.yaml similarity index 100% rename from boards/boards_legacy/arm/mimxrt1010_evk/mimxrt1010_evk.yaml rename to boards/nxp/mimxrt1010_evk/mimxrt1010_evk.yaml diff --git a/boards/boards_legacy/arm/mimxrt1010_evk/mimxrt1010_evk_defconfig b/boards/nxp/mimxrt1010_evk/mimxrt1010_evk_defconfig similarity index 79% rename from boards/boards_legacy/arm/mimxrt1010_evk/mimxrt1010_evk_defconfig rename to boards/nxp/mimxrt1010_evk/mimxrt1010_evk_defconfig index 2e6ad98a5e79b69..dc0fdc31f2ae433 100644 --- a/boards/boards_legacy/arm/mimxrt1010_evk/mimxrt1010_evk_defconfig +++ b/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 diff --git a/boards/boards_legacy/arm/mimxrt1015_evk/CMakeLists.txt b/boards/nxp/mimxrt1015_evk/CMakeLists.txt similarity index 97% rename from boards/boards_legacy/arm/mimxrt1015_evk/CMakeLists.txt rename to boards/nxp/mimxrt1015_evk/CMakeLists.txt index 005b4f2398d46c8..115153b462b1df7 100644 --- a/boards/boards_legacy/arm/mimxrt1015_evk/CMakeLists.txt +++ b/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 " diff --git a/boards/boards_legacy/arm/mimxrt1015_evk/Kconfig.board b/boards/nxp/mimxrt1015_evk/Kconfig.mimxrt1015_evk similarity index 70% rename from boards/boards_legacy/arm/mimxrt1015_evk/Kconfig.board rename to boards/nxp/mimxrt1015_evk/Kconfig.mimxrt1015_evk index a5dee5762f866b1..3685fc618b555a9 100644 --- a/boards/boards_legacy/arm/mimxrt1015_evk/Kconfig.board +++ b/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 diff --git a/boards/boards_legacy/arm/mimxrt1015_evk/board.cmake b/boards/nxp/mimxrt1015_evk/board.cmake similarity index 100% rename from boards/boards_legacy/arm/mimxrt1015_evk/board.cmake rename to boards/nxp/mimxrt1015_evk/board.cmake diff --git a/boards/nxp/mimxrt1015_evk/board.yml b/boards/nxp/mimxrt1015_evk/board.yml new file mode 100644 index 000000000000000..5f26dc3898b7e04 --- /dev/null +++ b/boards/nxp/mimxrt1015_evk/board.yml @@ -0,0 +1,5 @@ +board: + name: mimxrt1015_evk + vendor: nxp + socs: + - name: mimxrt1015 diff --git a/boards/boards_legacy/arm/mimxrt1015_evk/doc/index.rst b/boards/nxp/mimxrt1015_evk/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/mimxrt1015_evk/doc/index.rst rename to boards/nxp/mimxrt1015_evk/doc/index.rst diff --git a/boards/boards_legacy/arm/mimxrt1015_evk/doc/mimxrt1015_evk.jpg b/boards/nxp/mimxrt1015_evk/doc/mimxrt1015_evk.jpg similarity index 100% rename from boards/boards_legacy/arm/mimxrt1015_evk/doc/mimxrt1015_evk.jpg rename to boards/nxp/mimxrt1015_evk/doc/mimxrt1015_evk.jpg diff --git a/boards/boards_legacy/arm/mimxrt1015_evk/mimxrt1015_evk-pinctrl.dtsi b/boards/nxp/mimxrt1015_evk/mimxrt1015_evk-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/mimxrt1015_evk/mimxrt1015_evk-pinctrl.dtsi rename to boards/nxp/mimxrt1015_evk/mimxrt1015_evk-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/mimxrt1015_evk/mimxrt1015_evk.dts b/boards/nxp/mimxrt1015_evk/mimxrt1015_evk.dts similarity index 100% rename from boards/boards_legacy/arm/mimxrt1015_evk/mimxrt1015_evk.dts rename to boards/nxp/mimxrt1015_evk/mimxrt1015_evk.dts diff --git a/boards/boards_legacy/arm/mimxrt1015_evk/mimxrt1015_evk.yaml b/boards/nxp/mimxrt1015_evk/mimxrt1015_evk.yaml similarity index 100% rename from boards/boards_legacy/arm/mimxrt1015_evk/mimxrt1015_evk.yaml rename to boards/nxp/mimxrt1015_evk/mimxrt1015_evk.yaml diff --git a/boards/boards_legacy/arm/mimxrt1015_evk/mimxrt1015_evk_defconfig b/boards/nxp/mimxrt1015_evk/mimxrt1015_evk_defconfig similarity index 79% rename from boards/boards_legacy/arm/mimxrt1015_evk/mimxrt1015_evk_defconfig rename to boards/nxp/mimxrt1015_evk/mimxrt1015_evk_defconfig index 3268f61aebccfeb..dc0fdc31f2ae433 100644 --- a/boards/boards_legacy/arm/mimxrt1015_evk/mimxrt1015_evk_defconfig +++ b/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 diff --git a/boards/boards_legacy/arm/mimxrt1020_evk/CMakeLists.txt b/boards/nxp/mimxrt1020_evk/CMakeLists.txt similarity index 98% rename from boards/boards_legacy/arm/mimxrt1020_evk/CMakeLists.txt rename to boards/nxp/mimxrt1020_evk/CMakeLists.txt index 09e7641d928d9d9..63a6d289e6d936e 100644 --- a/boards/boards_legacy/arm/mimxrt1020_evk/CMakeLists.txt +++ b/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 " diff --git a/boards/boards_legacy/arm/mimxrt1020_evk/Kconfig.defconfig b/boards/nxp/mimxrt1020_evk/Kconfig.defconfig similarity index 74% rename from boards/boards_legacy/arm/mimxrt1020_evk/Kconfig.defconfig rename to boards/nxp/mimxrt1020_evk/Kconfig.defconfig index 4ecf9c39c1d8c4d..9c2251e2e609b7b 100644 --- a/boards/boards_legacy/arm/mimxrt1020_evk/Kconfig.defconfig +++ b/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 diff --git a/boards/boards_legacy/arm/mimxrt1020_evk/Kconfig.board b/boards/nxp/mimxrt1020_evk/Kconfig.mimxrt1020_evk similarity index 70% rename from boards/boards_legacy/arm/mimxrt1020_evk/Kconfig.board rename to boards/nxp/mimxrt1020_evk/Kconfig.mimxrt1020_evk index e8ac44ef1926971..a616953d3447bba 100644 --- a/boards/boards_legacy/arm/mimxrt1020_evk/Kconfig.board +++ b/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 diff --git a/boards/boards_legacy/arm/mimxrt1020_evk/board.cmake b/boards/nxp/mimxrt1020_evk/board.cmake similarity index 100% rename from boards/boards_legacy/arm/mimxrt1020_evk/board.cmake rename to boards/nxp/mimxrt1020_evk/board.cmake diff --git a/boards/nxp/mimxrt1020_evk/board.yml b/boards/nxp/mimxrt1020_evk/board.yml new file mode 100644 index 000000000000000..4df4def13bc42e4 --- /dev/null +++ b/boards/nxp/mimxrt1020_evk/board.yml @@ -0,0 +1,5 @@ +board: + name: mimxrt1020_evk + vendor: nxp + socs: + - name: mimxrt1021 diff --git a/boards/boards_legacy/arm/mimxrt1020_evk/doc/index.rst b/boards/nxp/mimxrt1020_evk/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/mimxrt1020_evk/doc/index.rst rename to boards/nxp/mimxrt1020_evk/doc/index.rst diff --git a/boards/boards_legacy/arm/mimxrt1020_evk/doc/mimxrt1020_evk.jpg b/boards/nxp/mimxrt1020_evk/doc/mimxrt1020_evk.jpg similarity index 100% rename from boards/boards_legacy/arm/mimxrt1020_evk/doc/mimxrt1020_evk.jpg rename to boards/nxp/mimxrt1020_evk/doc/mimxrt1020_evk.jpg diff --git a/boards/boards_legacy/arm/mimxrt1020_evk/mimxrt1020_evk-pinctrl.dtsi b/boards/nxp/mimxrt1020_evk/mimxrt1020_evk-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/mimxrt1020_evk/mimxrt1020_evk-pinctrl.dtsi rename to boards/nxp/mimxrt1020_evk/mimxrt1020_evk-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/mimxrt1020_evk/mimxrt1020_evk.dts b/boards/nxp/mimxrt1020_evk/mimxrt1020_evk.dts similarity index 100% rename from boards/boards_legacy/arm/mimxrt1020_evk/mimxrt1020_evk.dts rename to boards/nxp/mimxrt1020_evk/mimxrt1020_evk.dts diff --git a/boards/boards_legacy/arm/mimxrt1020_evk/mimxrt1020_evk.yaml b/boards/nxp/mimxrt1020_evk/mimxrt1020_evk.yaml similarity index 100% rename from boards/boards_legacy/arm/mimxrt1020_evk/mimxrt1020_evk.yaml rename to boards/nxp/mimxrt1020_evk/mimxrt1020_evk.yaml diff --git a/boards/boards_legacy/arm/mimxrt1020_evk/mimxrt1020_evk_defconfig b/boards/nxp/mimxrt1020_evk/mimxrt1020_evk_defconfig similarity index 79% rename from boards/boards_legacy/arm/mimxrt1020_evk/mimxrt1020_evk_defconfig rename to boards/nxp/mimxrt1020_evk/mimxrt1020_evk_defconfig index 3ca8b4d09f09c18..8af2d46280907d4 100644 --- a/boards/boards_legacy/arm/mimxrt1020_evk/mimxrt1020_evk_defconfig +++ b/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 diff --git a/boards/boards_legacy/arm/mimxrt1024_evk/CMakeLists.txt b/boards/nxp/mimxrt1024_evk/CMakeLists.txt similarity index 98% rename from boards/boards_legacy/arm/mimxrt1024_evk/CMakeLists.txt rename to boards/nxp/mimxrt1024_evk/CMakeLists.txt index b7e94224cc75329..229a396bcf6afed 100644 --- a/boards/boards_legacy/arm/mimxrt1024_evk/CMakeLists.txt +++ b/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 " diff --git a/boards/boards_legacy/arm/mimxrt1024_evk/Kconfig.defconfig b/boards/nxp/mimxrt1024_evk/Kconfig.defconfig similarity index 79% rename from boards/boards_legacy/arm/mimxrt1024_evk/Kconfig.defconfig rename to boards/nxp/mimxrt1024_evk/Kconfig.defconfig index db0a2eb1fedc903..f9bc8cbfe608bfd 100644 --- a/boards/boards_legacy/arm/mimxrt1024_evk/Kconfig.defconfig +++ b/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 diff --git a/boards/boards_legacy/arm/mimxrt1024_evk/Kconfig.board b/boards/nxp/mimxrt1024_evk/Kconfig.mimxrt1024_evk similarity index 70% rename from boards/boards_legacy/arm/mimxrt1024_evk/Kconfig.board rename to boards/nxp/mimxrt1024_evk/Kconfig.mimxrt1024_evk index e3468871e2a1e5a..e1e69dc4565f064 100644 --- a/boards/boards_legacy/arm/mimxrt1024_evk/Kconfig.board +++ b/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 diff --git a/boards/boards_legacy/arm/mimxrt1024_evk/board.cmake b/boards/nxp/mimxrt1024_evk/board.cmake similarity index 100% rename from boards/boards_legacy/arm/mimxrt1024_evk/board.cmake rename to boards/nxp/mimxrt1024_evk/board.cmake diff --git a/boards/nxp/mimxrt1024_evk/board.yml b/boards/nxp/mimxrt1024_evk/board.yml new file mode 100644 index 000000000000000..c9420ad2b758664 --- /dev/null +++ b/boards/nxp/mimxrt1024_evk/board.yml @@ -0,0 +1,5 @@ +board: + name: mimxrt1024_evk + vendor: nxp + socs: + - name: mimxrt1024 diff --git a/boards/boards_legacy/arm/mimxrt1024_evk/doc/index.rst b/boards/nxp/mimxrt1024_evk/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/mimxrt1024_evk/doc/index.rst rename to boards/nxp/mimxrt1024_evk/doc/index.rst diff --git a/boards/boards_legacy/arm/mimxrt1024_evk/doc/mimxrt1024_evk.jpg b/boards/nxp/mimxrt1024_evk/doc/mimxrt1024_evk.jpg similarity index 100% rename from boards/boards_legacy/arm/mimxrt1024_evk/doc/mimxrt1024_evk.jpg rename to boards/nxp/mimxrt1024_evk/doc/mimxrt1024_evk.jpg diff --git a/boards/boards_legacy/arm/mimxrt1024_evk/dts/nxp,enet-experimental.overlay b/boards/nxp/mimxrt1024_evk/dts/nxp,enet-experimental.overlay similarity index 100% rename from boards/boards_legacy/arm/mimxrt1024_evk/dts/nxp,enet-experimental.overlay rename to boards/nxp/mimxrt1024_evk/dts/nxp,enet-experimental.overlay diff --git a/boards/boards_legacy/arm/mimxrt1024_evk/mimxrt1024_evk-pinctrl.dtsi b/boards/nxp/mimxrt1024_evk/mimxrt1024_evk-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/mimxrt1024_evk/mimxrt1024_evk-pinctrl.dtsi rename to boards/nxp/mimxrt1024_evk/mimxrt1024_evk-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/mimxrt1024_evk/mimxrt1024_evk.dts b/boards/nxp/mimxrt1024_evk/mimxrt1024_evk.dts similarity index 100% rename from boards/boards_legacy/arm/mimxrt1024_evk/mimxrt1024_evk.dts rename to boards/nxp/mimxrt1024_evk/mimxrt1024_evk.dts diff --git a/boards/boards_legacy/arm/mimxrt1024_evk/mimxrt1024_evk.yaml b/boards/nxp/mimxrt1024_evk/mimxrt1024_evk.yaml similarity index 100% rename from boards/boards_legacy/arm/mimxrt1024_evk/mimxrt1024_evk.yaml rename to boards/nxp/mimxrt1024_evk/mimxrt1024_evk.yaml diff --git a/boards/boards_legacy/arm/mimxrt1024_evk/mimxrt1024_evk_defconfig b/boards/nxp/mimxrt1024_evk/mimxrt1024_evk_defconfig similarity index 79% rename from boards/boards_legacy/arm/mimxrt1024_evk/mimxrt1024_evk_defconfig rename to boards/nxp/mimxrt1024_evk/mimxrt1024_evk_defconfig index c41a65e312d979d..591d807155216c4 100644 --- a/boards/boards_legacy/arm/mimxrt1024_evk/mimxrt1024_evk_defconfig +++ b/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 diff --git a/boards/boards_legacy/arm/mimxrt1040_evk/CMakeLists.txt b/boards/nxp/mimxrt1040_evk/CMakeLists.txt similarity index 98% rename from boards/boards_legacy/arm/mimxrt1040_evk/CMakeLists.txt rename to boards/nxp/mimxrt1040_evk/CMakeLists.txt index 98ff54d4bc23121..9fc000a98ab3ba7 100644 --- a/boards/boards_legacy/arm/mimxrt1040_evk/CMakeLists.txt +++ b/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 " diff --git a/boards/boards_legacy/arm/mimxrt1040_evk/Kconfig.defconfig b/boards/nxp/mimxrt1040_evk/Kconfig.defconfig similarity index 63% rename from boards/boards_legacy/arm/mimxrt1040_evk/Kconfig.defconfig rename to boards/nxp/mimxrt1040_evk/Kconfig.defconfig index 683da9279ed691c..87cdb61799a5fa3 100644 --- a/boards/boards_legacy/arm/mimxrt1040_evk/Kconfig.defconfig +++ b/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 diff --git a/boards/boards_legacy/arm/mimxrt1040_evk/Kconfig.board b/boards/nxp/mimxrt1040_evk/Kconfig.mimxrt1040_evk similarity index 69% rename from boards/boards_legacy/arm/mimxrt1040_evk/Kconfig.board rename to boards/nxp/mimxrt1040_evk/Kconfig.mimxrt1040_evk index d8374b6bfadb07c..6cfd479dadc023e 100644 --- a/boards/boards_legacy/arm/mimxrt1040_evk/Kconfig.board +++ b/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 diff --git a/boards/boards_legacy/arm/mimxrt1040_evk/board.cmake b/boards/nxp/mimxrt1040_evk/board.cmake similarity index 100% rename from boards/boards_legacy/arm/mimxrt1040_evk/board.cmake rename to boards/nxp/mimxrt1040_evk/board.cmake diff --git a/boards/nxp/mimxrt1040_evk/board.yml b/boards/nxp/mimxrt1040_evk/board.yml new file mode 100644 index 000000000000000..ded85cfce4af756 --- /dev/null +++ b/boards/nxp/mimxrt1040_evk/board.yml @@ -0,0 +1,5 @@ +board: + name: mimxrt1040_evk + vendor: nxp + socs: + - name: mimxrt1042 diff --git a/boards/boards_legacy/arm/mimxrt1040_evk/doc/index.rst b/boards/nxp/mimxrt1040_evk/doc/index.rst similarity index 99% rename from boards/boards_legacy/arm/mimxrt1040_evk/doc/index.rst rename to boards/nxp/mimxrt1040_evk/doc/index.rst index 651a0aebff9a351..c2f1e1561ce992d 100644 --- a/boards/boards_legacy/arm/mimxrt1040_evk/doc/index.rst +++ b/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 diff --git a/boards/boards_legacy/arm/mimxrt1040_evk/doc/mimxrt1040_evk.jpg b/boards/nxp/mimxrt1040_evk/doc/mimxrt1040_evk.jpg similarity index 100% rename from boards/boards_legacy/arm/mimxrt1040_evk/doc/mimxrt1040_evk.jpg rename to boards/nxp/mimxrt1040_evk/doc/mimxrt1040_evk.jpg diff --git a/boards/boards_legacy/arm/mimxrt1040_evk/mimxrt1040_evk-pinctrl.dtsi b/boards/nxp/mimxrt1040_evk/mimxrt1040_evk-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/mimxrt1040_evk/mimxrt1040_evk-pinctrl.dtsi rename to boards/nxp/mimxrt1040_evk/mimxrt1040_evk-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/mimxrt1040_evk/mimxrt1040_evk.dts b/boards/nxp/mimxrt1040_evk/mimxrt1040_evk.dts similarity index 100% rename from boards/boards_legacy/arm/mimxrt1040_evk/mimxrt1040_evk.dts rename to boards/nxp/mimxrt1040_evk/mimxrt1040_evk.dts diff --git a/boards/boards_legacy/arm/mimxrt1040_evk/mimxrt1040_evk.yaml b/boards/nxp/mimxrt1040_evk/mimxrt1040_evk.yaml similarity index 100% rename from boards/boards_legacy/arm/mimxrt1040_evk/mimxrt1040_evk.yaml rename to boards/nxp/mimxrt1040_evk/mimxrt1040_evk.yaml diff --git a/boards/boards_legacy/arm/mimxrt1040_evk/mimxrt1040_evk_defconfig b/boards/nxp/mimxrt1040_evk/mimxrt1040_evk_defconfig similarity index 70% rename from boards/boards_legacy/arm/mimxrt1040_evk/mimxrt1040_evk_defconfig rename to boards/nxp/mimxrt1040_evk/mimxrt1040_evk_defconfig index 94b11471e04a388..5d1b150c729fa9f 100644 --- a/boards/boards_legacy/arm/mimxrt1040_evk/mimxrt1040_evk_defconfig +++ b/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 diff --git a/boards/boards_legacy/arm/mimxrt1050_evk/CMakeLists.txt b/boards/nxp/mimxrt1050_evk/CMakeLists.txt similarity index 93% rename from boards/boards_legacy/arm/mimxrt1050_evk/CMakeLists.txt rename to boards/nxp/mimxrt1050_evk/CMakeLists.txt index 9a136bb8d8242d0..597a64852cf0a8c 100644 --- a/boards/boards_legacy/arm/mimxrt1050_evk/CMakeLists.txt +++ b/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 " diff --git a/boards/boards_legacy/arm/mimxrt1050_evk/Kconfig.defconfig b/boards/nxp/mimxrt1050_evk/Kconfig.defconfig similarity index 51% rename from boards/boards_legacy/arm/mimxrt1050_evk/Kconfig.defconfig rename to boards/nxp/mimxrt1050_evk/Kconfig.defconfig index 79660c08e781c92..bfb4a84e341b0fa 100644 --- a/boards/boards_legacy/arm/mimxrt1050_evk/Kconfig.defconfig +++ b/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 diff --git a/boards/nxp/mimxrt1050_evk/Kconfig.mimxrt1050_evk b/boards/nxp/mimxrt1050_evk/Kconfig.mimxrt1050_evk new file mode 100644 index 000000000000000..f146c00267204bf --- /dev/null +++ b/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 diff --git a/boards/nxp/mimxrt1050_evk/board.cmake b/boards/nxp/mimxrt1050_evk/board.cmake new file mode 100644 index 000000000000000..3e42ddc78feaa53 --- /dev/null +++ b/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) diff --git a/boards/nxp/mimxrt1050_evk/board.yml b/boards/nxp/mimxrt1050_evk/board.yml new file mode 100644 index 000000000000000..c1276214baafc4a --- /dev/null +++ b/boards/nxp/mimxrt1050_evk/board.yml @@ -0,0 +1,11 @@ +board: + name: mimxrt1050_evk + vendor: nxp + socs: + - name: mimxrt1052 + revision: + format: "custom" + default: "hyperflash" + revisions: + - name: "hyperflash" + - name: "qspi" diff --git a/boards/boards_legacy/arm/mimxrt1050_evk/doc/index.rst b/boards/nxp/mimxrt1050_evk/doc/index.rst similarity index 99% rename from boards/boards_legacy/arm/mimxrt1050_evk/doc/index.rst rename to boards/nxp/mimxrt1050_evk/doc/index.rst index de225ae56f330c2..165f3491f2c72d6 100644 --- a/boards/boards_legacy/arm/mimxrt1050_evk/doc/index.rst +++ b/boards/nxp/mimxrt1050_evk/doc/index.rst @@ -421,7 +421,7 @@ Troubleshooting If the debug probe fails to connect with the following error, it's possible that the boot header in HyperFlash 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 diff --git a/boards/boards_legacy/arm/mimxrt1050_evk/doc/mimxrt1050_evk.jpg b/boards/nxp/mimxrt1050_evk/doc/mimxrt1050_evk.jpg similarity index 100% rename from boards/boards_legacy/arm/mimxrt1050_evk/doc/mimxrt1050_evk.jpg rename to boards/nxp/mimxrt1050_evk/doc/mimxrt1050_evk.jpg diff --git a/boards/boards_legacy/arm/mimxrt1050_evk/dts/nxp,enet-experimental.overlay b/boards/nxp/mimxrt1050_evk/dts/nxp,enet-experimental.overlay similarity index 100% rename from boards/boards_legacy/arm/mimxrt1050_evk/dts/nxp,enet-experimental.overlay rename to boards/nxp/mimxrt1050_evk/dts/nxp,enet-experimental.overlay diff --git a/boards/boards_legacy/arm/mimxrt1050_evk/mimxrt1050_evk-pinctrl.dtsi b/boards/nxp/mimxrt1050_evk/mimxrt1050_evk-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/mimxrt1050_evk/mimxrt1050_evk-pinctrl.dtsi rename to boards/nxp/mimxrt1050_evk/mimxrt1050_evk-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/mimxrt1050_evk/mimxrt1050_evk.dts b/boards/nxp/mimxrt1050_evk/mimxrt1050_evk.dts similarity index 77% rename from boards/boards_legacy/arm/mimxrt1050_evk/mimxrt1050_evk.dts rename to boards/nxp/mimxrt1050_evk/mimxrt1050_evk.dts index d1e8da5834b7958..e636fc207d580bd 100644 --- a/boards/boards_legacy/arm/mimxrt1050_evk/mimxrt1050_evk.dts +++ b/boards/nxp/mimxrt1050_evk/mimxrt1050_evk.dts @@ -30,9 +30,6 @@ zephyr,dtcm = &dtcm; zephyr,console = &lpuart1; zephyr,shell-uart = &lpuart1; - zephyr,flash-controller = &s26ks512s0; - zephyr,flash = &s26ks512s0; - zephyr,code-partition = &slot0_partition; zephyr,display = &lcdif; }; @@ -115,64 +112,6 @@ arduino_serial: &lpuart3 { pinctrl-names = "default"; }; -&flexspi { - status = "okay"; - ahb-prefetch; - ahb-read-addr-opt; - pinctrl-0 = <&pinmux_flexspi1>; - pinctrl-names = "default"; - ahb-bufferable; - ahb-cacheable; - sck-differential-clock; - combination-mode; - rx-clock-source = <3>; - reg = <0x402a8000 0x4000>, <0x60000000 DT_SIZE_M(64)>; - s26ks512s0: s26ks512s@0 { - compatible = "nxp,imx-flexspi-hyperflash"; - size = ; - reg = <0>; - spi-max-frequency = <166000000>; - word-addressable; - cs-interval-unit = <1>; - cs-interval = <2>; - cs-hold-time = <0>; - cs-setup-time = <3>; - data-valid-time = <1>; - column-space = <3>; - ahb-write-wait-unit = <2>; - ahb-write-wait-interval = <20>; - status = "okay"; - erase-block-size = <4096>; - write-block-size = <16>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - boot_partition: partition@0 { - label = "mcuboot"; - reg = <0x00000000 DT_SIZE_K(256)>; - }; - /* Note slot 0 has one additional sector, - * this is intended for use with the swap move algorithm - */ - slot0_partition: partition@40000 { - label = "image-0"; - reg = <0x00040000 (DT_SIZE_M(3) + DT_SIZE_K(4))>; - }; - slot1_partition: partition@341000 { - label = "image-1"; - reg = <0x00341000 DT_SIZE_M(3)>; - }; - storage_partition: partition@641000 { - label = "storage"; - reg = <0x00641000 (DT_SIZE_M(57) + DT_SIZE_K(764))>; - }; - }; - }; -}; - &lcdif { status = "okay"; width = <480>; diff --git a/boards/boards_legacy/arm/mimxrt1050_evk/mimxrt1050_evk_defconfig b/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_defconfig similarity index 71% rename from boards/boards_legacy/arm/mimxrt1050_evk/mimxrt1050_evk_defconfig rename to boards/nxp/mimxrt1050_evk/mimxrt1050_evk_defconfig index 0c3fd3485d8bec9..e4f0cbedcc26153 100644 --- a/boards/boards_legacy/arm/mimxrt1050_evk/mimxrt1050_evk_defconfig +++ b/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1052=y -CONFIG_SOC_SERIES_IMX_RT=y -CONFIG_BOARD_MIMXRT1050_EVK=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_hyperflash.overlay b/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_hyperflash.overlay new file mode 100644 index 000000000000000..ccce00a56287b0c --- /dev/null +++ b/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_hyperflash.overlay @@ -0,0 +1,71 @@ +/* + * Copyright 2024 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + chosen { + zephyr,flash-controller = &s26ks512s0; + zephyr,flash = &s26ks512s0; + zephyr,code-partition = &slot0_partition; + }; +}; + +&flexspi { + status = "okay"; + ahb-prefetch; + ahb-read-addr-opt; + pinctrl-0 = <&pinmux_flexspi1>; + pinctrl-names = "default"; + ahb-bufferable; + ahb-cacheable; + sck-differential-clock; + combination-mode; + rx-clock-source = <3>; + reg = <0x402a8000 0x4000>, <0x60000000 DT_SIZE_M(64)>; + s26ks512s0: s26ks512s@0 { + compatible = "nxp,imx-flexspi-hyperflash"; + size = ; + reg = <0>; + spi-max-frequency = <166000000>; + word-addressable; + cs-interval-unit = <1>; + cs-interval = <2>; + cs-hold-time = <0>; + cs-setup-time = <3>; + data-valid-time = <1>; + column-space = <3>; + ahb-write-wait-unit = <2>; + ahb-write-wait-interval = <20>; + status = "okay"; + erase-block-size = <4096>; + write-block-size = <16>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + boot_partition: partition@0 { + label = "mcuboot"; + reg = <0x00000000 DT_SIZE_K(256)>; + }; + /* Note slot 0 has one additional sector, + * this is intended for use with the swap move algorithm + */ + slot0_partition: partition@40000 { + label = "image-0"; + reg = <0x00040000 (DT_SIZE_M(3) + DT_SIZE_K(4))>; + }; + slot1_partition: partition@341000 { + label = "image-1"; + reg = <0x00341000 DT_SIZE_M(3)>; + }; + storage_partition: partition@641000 { + label = "storage"; + reg = <0x00641000 (DT_SIZE_M(57) + DT_SIZE_K(764))>; + }; + }; + }; +}; diff --git a/boards/boards_legacy/arm/mimxrt1050_evk/mimxrt1050_evk.yaml b/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_hyperflash.yaml similarity index 100% rename from boards/boards_legacy/arm/mimxrt1050_evk/mimxrt1050_evk.yaml rename to boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_hyperflash.yaml diff --git a/boards/boards_legacy/arm/mimxrt1050_evk/mimxrt1050_evk_qspi.dts b/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_qspi.overlay similarity index 95% rename from boards/boards_legacy/arm/mimxrt1050_evk/mimxrt1050_evk_qspi.dts rename to boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_qspi.overlay index 27542b88bfd0d80..1fd770ec6558a02 100644 --- a/boards/boards_legacy/arm/mimxrt1050_evk/mimxrt1050_evk_qspi.dts +++ b/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_qspi.overlay @@ -4,10 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include "mimxrt1050_evk.dts" - -/delete-node/ &s26ks512s0; - / { chosen { zephyr,flash-controller = &is25wp064; diff --git a/boards/boards_legacy/arm/mimxrt1050_evk/mimxrt1050_evk_qspi.yaml b/boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_qspi.yaml similarity index 91% rename from boards/boards_legacy/arm/mimxrt1050_evk/mimxrt1050_evk_qspi.yaml rename to boards/nxp/mimxrt1050_evk/mimxrt1050_evk_mimxrt1052_qspi.yaml index baadda8c061b92a..6476d666984ff2a 100644 --- a/boards/boards_legacy/arm/mimxrt1050_evk/mimxrt1050_evk_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@qspi name: NXP MIMXRT1050-EVK-QSPI type: mcu arch: arm diff --git a/boards/nxp/mimxrt1050_evk/revision.cmake b/boards/nxp/mimxrt1050_evk/revision.cmake new file mode 100644 index 000000000000000..3e6f006a735b5b4 --- /dev/null +++ b/boards/nxp/mimxrt1050_evk/revision.cmake @@ -0,0 +1,7 @@ +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/boards/boards_legacy/arm/mimxrt1060_evk/CMakeLists.txt b/boards/nxp/mimxrt1060_evk/CMakeLists.txt similarity index 93% rename from boards/boards_legacy/arm/mimxrt1060_evk/CMakeLists.txt rename to boards/nxp/mimxrt1060_evk/CMakeLists.txt index 84e3812e9a0f9e1..29c2d6f9068a623 100644 --- a/boards/boards_legacy/arm/mimxrt1060_evk/CMakeLists.txt +++ b/boards/nxp/mimxrt1060_evk/CMakeLists.txt @@ -10,20 +10,20 @@ 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_MIMXRT1060_EVK) + if(CONFIG_BOARD_MIMXRT1060_EVKB) + set(FLASH_CONF evkbmimxrt1060_flexspi_nor_config.c) + set(BOARD_NAME evkbmimxrt1060) + elseif(CONFIG_DT_HAS_NXP_IMX_FLEXSPI_NOR_ENABLED) set(FLASH_CONF evkmimxrt1060_flexspi_nor_config.c) set(BOARD_NAME evkmimxrt1060) - elseif(CONFIG_BOARD_MIMXRT1060_EVK_HYPERFLASH) + elseif(CONFIG_DT_HAS_NXP_IMX_FLEXSPI_HYPERFLASH_ENABLED) # No flash configuration block exists for the RT1060 with HyperFlash in # the SDK, but we can reuse the block for the RT1050 as both boards use # the same HyperFlash chip set(FLASH_CONF evkbimxrt1050_flexspi_nor_config.c) set(BOARD_NAME evkbimxrt1050) - elseif(CONFIG_BOARD_MIMXRT1060_EVKB) - set(FLASH_CONF evkbmimxrt1060_flexspi_nor_config.c) - set(BOARD_NAME evkbmimxrt1060) else() message(WARNING "It appears you are using the board definition for " "the MIMXRT1060-EVK, but targeting a custom board. You may need to " diff --git a/boards/boards_legacy/arm/mimxrt1060_evk/Kconfig.defconfig b/boards/nxp/mimxrt1060_evk/Kconfig.defconfig similarity index 59% rename from boards/boards_legacy/arm/mimxrt1060_evk/Kconfig.defconfig rename to boards/nxp/mimxrt1060_evk/Kconfig.defconfig index b3b325805fa6eab..37dc90279ddee6a 100644 --- a/boards/boards_legacy/arm/mimxrt1060_evk/Kconfig.defconfig +++ b/boards/nxp/mimxrt1060_evk/Kconfig.defconfig @@ -3,16 +3,7 @@ # Copyright 2018,2023 NXP # SPDX-License-Identifier: Apache-2.0 -if BOARD_MIMXRT1060_EVK || BOARD_MIMXRT1060_EVK_HYPERFLASH || BOARD_MIMXRT1060_EVKB - -config BOARD - default "mimxrt1060_evk" if BOARD_MIMXRT1060_EVK - default "mimxrt1060_evk_hyperflash" if BOARD_MIMXRT1060_EVK_HYPERFLASH - default "mimxrt1060_evkb" if BOARD_MIMXRT1060_EVKB - -choice CODE_LOCATION - default CODE_FLEXSPI -endchoice +if BOARD_MIMXRT1060_EVK || BOARD_MIMXRT1060_EVKB config DEVICE_CONFIGURATION_DATA default y @@ -20,20 +11,6 @@ config DEVICE_CONFIGURATION_DATA config NXP_IMX_EXTERNAL_SDRAM default y -if FLASH - -config FLASH_MCUX_FLEXSPI_NOR - default y if BOARD_MIMXRT1060_EVK - default y if BOARD_MIMXRT1060_EVKB - default n if BOARD_MIMXRT1060_EVK_HYPERFLASH - -config FLASH_MCUX_FLEXSPI_HYPERFLASH - default y if BOARD_MIMXRT1060_EVK_HYPERFLASH - default n if BOARD_MIMXRT1060_EVK - default n if BOARD_MIMXRT1060_EVKB - -endif #FLASH - config INPUT default y if LVGL @@ -93,4 +70,4 @@ endchoice endif # LVGL -endif # BOARD_MIMXRT1060_EVK || BOARD_MIMXRT1060_EVK_HYPERFLASH || BOARD_MIMXRT1060_EVKB +endif # BOARD_MIMXRT1060_EVK || BOARD_MIMXRT1060_EVKB diff --git a/boards/nxp/mimxrt1060_evk/Kconfig.mimxrt1060_evk b/boards/nxp/mimxrt1060_evk/Kconfig.mimxrt1060_evk new file mode 100644 index 000000000000000..a636a49b2510063 --- /dev/null +++ b/boards/nxp/mimxrt1060_evk/Kconfig.mimxrt1060_evk @@ -0,0 +1,5 @@ +# Copyright (c) 2018, NXP +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMXRT1060_EVK + select SOC_PART_NUMBER_MIMXRT1062DVL6A diff --git a/boards/nxp/mimxrt1060_evk/Kconfig.mimxrt1060_evkb b/boards/nxp/mimxrt1060_evk/Kconfig.mimxrt1060_evkb new file mode 100644 index 000000000000000..d2f59c8c9cfa906 --- /dev/null +++ b/boards/nxp/mimxrt1060_evk/Kconfig.mimxrt1060_evkb @@ -0,0 +1,5 @@ +# Copyright 2024 NXP +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMXRT1060_EVKB + select SOC_PART_NUMBER_MIMXRT1062DVL6A diff --git a/boards/boards_legacy/arm/mimxrt1060_evk/board.cmake b/boards/nxp/mimxrt1060_evk/board.cmake similarity index 60% rename from boards/boards_legacy/arm/mimxrt1060_evk/board.cmake rename to boards/nxp/mimxrt1060_evk/board.cmake index d3031f1542e3a7c..722afd541f71209 100644 --- a/boards/boards_legacy/arm/mimxrt1060_evk/board.cmake +++ b/boards/nxp/mimxrt1060_evk/board.cmake @@ -8,10 +8,10 @@ board_runner_args(pyocd "--target=mimxrt1060") board_runner_args(jlink "--device=MIMXRT1062xxx6A") board_runner_args(linkserver "--device=MIMXRT1062xxxxA:EVK-MIMXRT1060") -if ((${CONFIG_BOARD_MIMXRT1060_EVK}) OR (${CONFIG_BOARD_MIMXRT1060_EVKB})) - board_runner_args(jlink "--loader=BankAddr=0x60000000&Loader=QSPI") -elseif (${CONFIG_BOARD_MIMXRT1060_EVK_HYPERFLASH}) - board_runner_args(jlink "--loader=BankAddr=0x60000000&Loader=HyperFlash") +if (("${BOARD_REVISION}" STREQUAL "qspi") OR CONFIG_BOARD_MIMXRT1060_EVKB) + board_runner_args(jlink "--loader=BankAddr=0x60000000&Loader=QSPI") +elseif ("${BOARD_REVISION}" STREQUAL "hyperflash") + board_runner_args(jlink "--loader=BankAddr=0x60000000&Loader=HyperFlash") endif() include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake) diff --git a/boards/nxp/mimxrt1060_evk/board.yml b/boards/nxp/mimxrt1060_evk/board.yml new file mode 100644 index 000000000000000..6682fbd72283c48 --- /dev/null +++ b/boards/nxp/mimxrt1060_evk/board.yml @@ -0,0 +1,11 @@ +boards: + - name: mimxrt1060_evk + vendor: nxp + socs: + - name: mimxrt1062 + revision: + format: "custom" + - name: mimxrt1060_evkb + vendor: nxp + socs: + - name: mimxrt1062 diff --git a/boards/boards_legacy/arm/mimxrt1060_evk/doc/index.rst b/boards/nxp/mimxrt1060_evk/doc/index.rst similarity index 99% rename from boards/boards_legacy/arm/mimxrt1060_evk/doc/index.rst rename to boards/nxp/mimxrt1060_evk/doc/index.rst index cfd546e5b37c692..de0943ce83ca5ef 100644 --- a/boards/boards_legacy/arm/mimxrt1060_evk/doc/index.rst +++ b/boards/nxp/mimxrt1060_evk/doc/index.rst @@ -416,7 +416,7 @@ Troubleshooting If the debug probe fails to connect with the following error, it's possible that the boot header in QSPI flash 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 diff --git a/boards/boards_legacy/arm/mimxrt1060_evk/doc/mimxrt1060_evk.jpg b/boards/nxp/mimxrt1060_evk/doc/mimxrt1060_evk.jpg similarity index 100% rename from boards/boards_legacy/arm/mimxrt1060_evk/doc/mimxrt1060_evk.jpg rename to boards/nxp/mimxrt1060_evk/doc/mimxrt1060_evk.jpg diff --git a/boards/boards_legacy/arm/mimxrt1060_evk/dts/nxp,enet-experimental.overlay b/boards/nxp/mimxrt1060_evk/dts/nxp,enet-experimental.overlay similarity index 100% rename from boards/boards_legacy/arm/mimxrt1060_evk/dts/nxp,enet-experimental.overlay rename to boards/nxp/mimxrt1060_evk/dts/nxp,enet-experimental.overlay diff --git a/boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evk-pinctrl.dtsi b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evk-pinctrl.dtsi rename to boards/nxp/mimxrt1060_evk/mimxrt1060_evk-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evk.dts b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk.dts similarity index 82% rename from boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evk.dts rename to boards/nxp/mimxrt1060_evk/mimxrt1060_evk.dts index 42782b4045401f2..6e90b87871729a9 100644 --- a/boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evk.dts +++ b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk.dts @@ -24,9 +24,6 @@ }; chosen { - zephyr,flash-controller = &is25wp064; - zephyr,flash = &is25wp064; - zephyr,code-partition = &slot0_partition; zephyr,sram = &sdram0; zephyr,itcm = &itcm; zephyr,dtcm = &dtcm; @@ -116,52 +113,6 @@ arduino_serial: &lpuart3 { pinctrl-names = "default", "sleep"; }; -&flexspi { - status = "okay"; - pinctrl-0 = <&pinmux_flexspi1>; - pinctrl-names = "default"; - ahb-prefetch; - ahb-read-addr-opt; - rx-clock-source = <1>; - reg = <0x402a8000 0x4000>, <0x60000000 DT_SIZE_M(8)>; - is25wp064: is25wp064@0 { - compatible = "nxp,imx-flexspi-nor"; - size = <67108864>; - reg = <0>; - spi-max-frequency = <133000000>; - status = "okay"; - jedec-id = [9d 70 17]; - erase-block-size = <4096>; - write-block-size = <1>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - boot_partition: partition@0 { - label = "mcuboot"; - reg = <0x00000000 DT_SIZE_K(64)>; - }; - /* Note slot 0 has one additional sector, - * this is intended for use with the swap move algorithm - */ - slot0_partition: partition@10000 { - label = "image-0"; - reg = <0x00010000 (DT_SIZE_M(3) + DT_SIZE_K(4))>; - }; - slot1_partition: partition@311000 { - label = "image-1"; - reg = <0x00311000 DT_SIZE_M(3)>; - }; - storage_partition: partition@611000 { - label = "storage"; - reg = <0x00611000 DT_SIZE_K(1980)>; - }; - }; - }; -}; - &lcdif { status = "okay"; width = <480>; diff --git a/boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evk_defconfig b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_defconfig similarity index 71% rename from boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evk_defconfig rename to boards/nxp/mimxrt1060_evk/mimxrt1060_evk_defconfig index 40d615261b37a32..8af2d46280907d4 100644 --- a/boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evk_defconfig +++ b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1062=y -CONFIG_SOC_SERIES_IMX_RT=y -CONFIG_BOARD_MIMXRT1060_EVK=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evk_hyperflash.dts b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_hyperflash.overlay similarity index 96% rename from boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evk_hyperflash.dts rename to boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_hyperflash.overlay index efdf5e2ff229dbd..4d94e82f6113f98 100644 --- a/boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evk_hyperflash.dts +++ b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_hyperflash.overlay @@ -4,10 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include "mimxrt1060_evk.dts" - -/delete-node/ &is25wp064; - / { chosen { zephyr,flash-controller = &s26ks512s0; diff --git a/boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evk_hyperflash.yaml b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_hyperflash.yaml similarity index 91% rename from boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evk_hyperflash.yaml rename to boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_hyperflash.yaml index fa29bdfaa14429a..93a7915e6fd9c2e 100644 --- a/boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evk_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@hyperflash name: NXP MIMXRT1060-EVK-HYPERFLASH type: mcu arch: arm diff --git a/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi.overlay b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi.overlay new file mode 100644 index 000000000000000..9fddaea0c62935d --- /dev/null +++ b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi.overlay @@ -0,0 +1,59 @@ +/* + * Copyright 2024 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + chosen { + zephyr,flash-controller = &is25wp064; + zephyr,flash = &is25wp064; + zephyr,code-partition = &slot0_partition; + }; +}; + +&flexspi { + status = "okay"; + pinctrl-0 = <&pinmux_flexspi1>; + pinctrl-names = "default"; + ahb-prefetch; + ahb-read-addr-opt; + rx-clock-source = <1>; + reg = <0x402a8000 0x4000>, <0x60000000 DT_SIZE_M(8)>; + is25wp064: is25wp064@0 { + compatible = "nxp,imx-flexspi-nor"; + size = <67108864>; + reg = <0>; + spi-max-frequency = <133000000>; + status = "okay"; + jedec-id = [9d 70 17]; + erase-block-size = <4096>; + write-block-size = <1>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + boot_partition: partition@0 { + label = "mcuboot"; + reg = <0x00000000 DT_SIZE_K(64)>; + }; + /* Note slot 0 has one additional sector, + * this is intended for use with the swap move algorithm + */ + slot0_partition: partition@10000 { + label = "image-0"; + reg = <0x00010000 (DT_SIZE_M(3) + DT_SIZE_K(4))>; + }; + slot1_partition: partition@311000 { + label = "image-1"; + reg = <0x00311000 DT_SIZE_M(3)>; + }; + storage_partition: partition@611000 { + label = "storage"; + reg = <0x00611000 DT_SIZE_K(1980)>; + }; + }; + }; +}; diff --git a/boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evk.yaml b/boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi.yaml similarity index 100% rename from boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evk.yaml rename to boards/nxp/mimxrt1060_evk/mimxrt1060_evk_mimxrt1062_qspi.yaml diff --git a/boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evkb.dts b/boards/nxp/mimxrt1060_evk/mimxrt1060_evkb.dts similarity index 84% rename from boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evkb.dts rename to boards/nxp/mimxrt1060_evk/mimxrt1060_evkb.dts index 56104fe94322665..506f0d0d7a795b9 100644 --- a/boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evkb.dts +++ b/boards/nxp/mimxrt1060_evk/mimxrt1060_evkb.dts @@ -5,6 +5,7 @@ */ #include "mimxrt1060_evk.dts" +#include "mimxrt1060_evk_mimxrt1062_qspi.overlay" /* FLEXPWM not routed to LED on this EVK */ &flexpwm2_pwm3 { diff --git a/boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evkb.yaml b/boards/nxp/mimxrt1060_evk/mimxrt1060_evkb.yaml similarity index 100% rename from boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evkb.yaml rename to boards/nxp/mimxrt1060_evk/mimxrt1060_evkb.yaml diff --git a/boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evkb_defconfig b/boards/nxp/mimxrt1060_evk/mimxrt1060_evkb_defconfig similarity index 71% rename from boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evkb_defconfig rename to boards/nxp/mimxrt1060_evk/mimxrt1060_evkb_defconfig index bb1a6edb6687662..365bcc53c40dd5f 100644 --- a/boards/boards_legacy/arm/mimxrt1060_evk/mimxrt1060_evkb_defconfig +++ b/boards/nxp/mimxrt1060_evk/mimxrt1060_evkb_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1062=y -CONFIG_SOC_SERIES_IMX_RT=y -CONFIG_BOARD_MIMXRT1060_EVKB=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/nxp/mimxrt1060_evk/revision.cmake b/boards/nxp/mimxrt1060_evk/revision.cmake new file mode 100644 index 000000000000000..97a3da96ea4905e --- /dev/null +++ b/boards/nxp/mimxrt1060_evk/revision.cmake @@ -0,0 +1,9 @@ +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/boards/boards_legacy/arm/mimxrt1062_fmurt6/CMakeLists.txt b/boards/nxp/mimxrt1062_fmurt6/CMakeLists.txt similarity index 97% rename from boards/boards_legacy/arm/mimxrt1062_fmurt6/CMakeLists.txt rename to boards/nxp/mimxrt1062_fmurt6/CMakeLists.txt index 29f92cc83c6e06b..70f8df6e741ada6 100644 --- a/boards/boards_legacy/arm/mimxrt1062_fmurt6/CMakeLists.txt +++ b/boards/nxp/mimxrt1062_fmurt6/CMakeLists.txt @@ -4,7 +4,7 @@ # Copyright 2023 NXP # -if(CONFIG_NXP_IMX_RT_BOOT_HEADER) +if(CONFIG_NXP_IMXRT_BOOT_HEADER) zephyr_library() if(CONFIG_BOARD_MIMXRT1062_FMURT6) # No flash configuration block exists for the RT1060 with HyperFlash in diff --git a/boards/boards_legacy/arm/mimxrt1062_fmurt6/Kconfig.defconfig b/boards/nxp/mimxrt1062_fmurt6/Kconfig.defconfig similarity index 71% rename from boards/boards_legacy/arm/mimxrt1062_fmurt6/Kconfig.defconfig rename to boards/nxp/mimxrt1062_fmurt6/Kconfig.defconfig index 8e349eb07ed09e0..073cd680ec07abf 100644 --- a/boards/boards_legacy/arm/mimxrt1062_fmurt6/Kconfig.defconfig +++ b/boards/nxp/mimxrt1062_fmurt6/Kconfig.defconfig @@ -5,13 +5,6 @@ if BOARD_MIMXRT1062_FMURT6 -config BOARD - default "mimxrt1062_fmurt6" if BOARD_MIMXRT1062_FMURT6 - -choice CODE_LOCATION - default CODE_FLEXSPI -endchoice - config DEVICE_CONFIGURATION_DATA default y diff --git a/boards/boards_legacy/arm/mimxrt1062_fmurt6/Kconfig.board b/boards/nxp/mimxrt1062_fmurt6/Kconfig.mimxrt1062_fmurt6 similarity index 68% rename from boards/boards_legacy/arm/mimxrt1062_fmurt6/Kconfig.board rename to boards/nxp/mimxrt1062_fmurt6/Kconfig.mimxrt1062_fmurt6 index 97c653e75f2a833..852363cbbd0efa1 100644 --- a/boards/boards_legacy/arm/mimxrt1062_fmurt6/Kconfig.board +++ b/boards/nxp/mimxrt1062_fmurt6/Kconfig.mimxrt1062_fmurt6 @@ -1,7 +1,5 @@ -# SPDX-License-Identifier: Apache-2.0 # Copyright 2023 NXP +# SPDX-License-Identifier: Apache-2.0 config BOARD_MIMXRT1062_FMURT6 - bool "NXP MIMXRT1062-FMURT6" - depends on SOC_SERIES_IMX_RT select SOC_PART_NUMBER_MIMXRT1062DVL6A diff --git a/boards/boards_legacy/arm/mimxrt1062_fmurt6/board.cmake b/boards/nxp/mimxrt1062_fmurt6/board.cmake similarity index 100% rename from boards/boards_legacy/arm/mimxrt1062_fmurt6/board.cmake rename to boards/nxp/mimxrt1062_fmurt6/board.cmake diff --git a/boards/nxp/mimxrt1062_fmurt6/board.yml b/boards/nxp/mimxrt1062_fmurt6/board.yml new file mode 100644 index 000000000000000..bebcb6c79541d35 --- /dev/null +++ b/boards/nxp/mimxrt1062_fmurt6/board.yml @@ -0,0 +1,5 @@ +board: + name: mimxrt1062_fmurt6 + vendor: nxp + socs: + - name: mimxrt1062 diff --git a/boards/boards_legacy/arm/mimxrt1062_fmurt6/doc/index.rst b/boards/nxp/mimxrt1062_fmurt6/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/mimxrt1062_fmurt6/doc/index.rst rename to boards/nxp/mimxrt1062_fmurt6/doc/index.rst diff --git a/boards/boards_legacy/arm/mimxrt1062_fmurt6/doc/mimxrt1062_fmurt6.jpg b/boards/nxp/mimxrt1062_fmurt6/doc/mimxrt1062_fmurt6.jpg similarity index 100% rename from boards/boards_legacy/arm/mimxrt1062_fmurt6/doc/mimxrt1062_fmurt6.jpg rename to boards/nxp/mimxrt1062_fmurt6/doc/mimxrt1062_fmurt6.jpg diff --git a/boards/boards_legacy/arm/mimxrt1062_fmurt6/mimxrt1062_fmurt6-pinctrl.dtsi b/boards/nxp/mimxrt1062_fmurt6/mimxrt1062_fmurt6-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/mimxrt1062_fmurt6/mimxrt1062_fmurt6-pinctrl.dtsi rename to boards/nxp/mimxrt1062_fmurt6/mimxrt1062_fmurt6-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/mimxrt1062_fmurt6/mimxrt1062_fmurt6.dts b/boards/nxp/mimxrt1062_fmurt6/mimxrt1062_fmurt6.dts similarity index 100% rename from boards/boards_legacy/arm/mimxrt1062_fmurt6/mimxrt1062_fmurt6.dts rename to boards/nxp/mimxrt1062_fmurt6/mimxrt1062_fmurt6.dts diff --git a/boards/boards_legacy/arm/mimxrt1062_fmurt6/mimxrt1062_fmurt6.yaml b/boards/nxp/mimxrt1062_fmurt6/mimxrt1062_fmurt6.yaml similarity index 100% rename from boards/boards_legacy/arm/mimxrt1062_fmurt6/mimxrt1062_fmurt6.yaml rename to boards/nxp/mimxrt1062_fmurt6/mimxrt1062_fmurt6.yaml diff --git a/boards/boards_legacy/arm/mimxrt1062_fmurt6/mimxrt1062_fmurt6_defconfig b/boards/nxp/mimxrt1062_fmurt6/mimxrt1062_fmurt6_defconfig similarity index 76% rename from boards/boards_legacy/arm/mimxrt1062_fmurt6/mimxrt1062_fmurt6_defconfig rename to boards/nxp/mimxrt1062_fmurt6/mimxrt1062_fmurt6_defconfig index 4efad5e51cb3a16..3db75b19e6d7b27 100644 --- a/boards/boards_legacy/arm/mimxrt1062_fmurt6/mimxrt1062_fmurt6_defconfig +++ b/boards/nxp/mimxrt1062_fmurt6/mimxrt1062_fmurt6_defconfig @@ -4,9 +4,6 @@ # Copyright 2023 NXP # -CONFIG_SOC_MIMXRT1062=y -CONFIG_SOC_SERIES_IMX_RT=y -CONFIG_BOARD_MIMXRT1062_FMURT6=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/boards_legacy/arm/mimxrt1064_evk/CMakeLists.txt b/boards/nxp/mimxrt1064_evk/CMakeLists.txt similarity index 98% rename from boards/boards_legacy/arm/mimxrt1064_evk/CMakeLists.txt rename to boards/nxp/mimxrt1064_evk/CMakeLists.txt index 630fac7d67d07dd..7d2f7effa107915 100644 --- a/boards/boards_legacy/arm/mimxrt1064_evk/CMakeLists.txt +++ b/boards/nxp/mimxrt1064_evk/CMakeLists.txt @@ -10,7 +10,7 @@ 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(NOT DEFINED CONFIG_BOARD_MIMXRT1064_EVK) message(WARNING "It appears you are using the board definition for " diff --git a/boards/boards_legacy/arm/mimxrt1064_evk/Kconfig.defconfig b/boards/nxp/mimxrt1064_evk/Kconfig.defconfig similarity index 86% rename from boards/boards_legacy/arm/mimxrt1064_evk/Kconfig.defconfig rename to boards/nxp/mimxrt1064_evk/Kconfig.defconfig index e0604d396210127..4ec3c9ebe2f906c 100644 --- a/boards/boards_legacy/arm/mimxrt1064_evk/Kconfig.defconfig +++ b/boards/nxp/mimxrt1064_evk/Kconfig.defconfig @@ -5,13 +5,6 @@ if BOARD_MIMXRT1064_EVK -config BOARD - default "mimxrt1064_evk" - -choice CODE_LOCATION - default CODE_FLEXSPI2 -endchoice - config DEVICE_CONFIGURATION_DATA default y diff --git a/boards/boards_legacy/arm/mimxrt1064_evk/Kconfig.board b/boards/nxp/mimxrt1064_evk/Kconfig.mimxrt1064_evk similarity index 70% rename from boards/boards_legacy/arm/mimxrt1064_evk/Kconfig.board rename to boards/nxp/mimxrt1064_evk/Kconfig.mimxrt1064_evk index 0ce09d06fd4414f..719b542874001ee 100644 --- a/boards/boards_legacy/arm/mimxrt1064_evk/Kconfig.board +++ b/boards/nxp/mimxrt1064_evk/Kconfig.mimxrt1064_evk @@ -2,6 +2,4 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_MIMXRT1064_EVK - bool "NXP MIMXRT1064-EVK" - depends on SOC_SERIES_IMX_RT select SOC_PART_NUMBER_MIMXRT1064DVL6A diff --git a/boards/boards_legacy/arm/mimxrt1064_evk/board.cmake b/boards/nxp/mimxrt1064_evk/board.cmake similarity index 100% rename from boards/boards_legacy/arm/mimxrt1064_evk/board.cmake rename to boards/nxp/mimxrt1064_evk/board.cmake diff --git a/boards/nxp/mimxrt1064_evk/board.yml b/boards/nxp/mimxrt1064_evk/board.yml new file mode 100644 index 000000000000000..b3116560663b44f --- /dev/null +++ b/boards/nxp/mimxrt1064_evk/board.yml @@ -0,0 +1,5 @@ +board: + name: mimxrt1064_evk + vendor: nxp + socs: + - name: mimxrt1064 diff --git a/boards/boards_legacy/arm/mimxrt1064_evk/doc/index.rst b/boards/nxp/mimxrt1064_evk/doc/index.rst similarity index 99% rename from boards/boards_legacy/arm/mimxrt1064_evk/doc/index.rst rename to boards/nxp/mimxrt1064_evk/doc/index.rst index 24abf5ca76f57b7..38d284f1c479916 100644 --- a/boards/boards_legacy/arm/mimxrt1064_evk/doc/index.rst +++ b/boards/nxp/mimxrt1064_evk/doc/index.rst @@ -418,7 +418,7 @@ Troubleshooting If the debug probe fails to connect with the following error, it's possible that the boot header in QSPI flash 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 diff --git a/boards/boards_legacy/arm/mimxrt1064_evk/doc/mimxrt1064_evk.jpg b/boards/nxp/mimxrt1064_evk/doc/mimxrt1064_evk.jpg similarity index 100% rename from boards/boards_legacy/arm/mimxrt1064_evk/doc/mimxrt1064_evk.jpg rename to boards/nxp/mimxrt1064_evk/doc/mimxrt1064_evk.jpg diff --git a/boards/boards_legacy/arm/mimxrt1064_evk/dts/nxp,enet-experimental.overlay b/boards/nxp/mimxrt1064_evk/dts/nxp,enet-experimental.overlay similarity index 100% rename from boards/boards_legacy/arm/mimxrt1064_evk/dts/nxp,enet-experimental.overlay rename to boards/nxp/mimxrt1064_evk/dts/nxp,enet-experimental.overlay diff --git a/boards/boards_legacy/arm/mimxrt1064_evk/mimxrt1064_evk-pinctrl.dtsi b/boards/nxp/mimxrt1064_evk/mimxrt1064_evk-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/mimxrt1064_evk/mimxrt1064_evk-pinctrl.dtsi rename to boards/nxp/mimxrt1064_evk/mimxrt1064_evk-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/mimxrt1064_evk/mimxrt1064_evk.dts b/boards/nxp/mimxrt1064_evk/mimxrt1064_evk.dts similarity index 100% rename from boards/boards_legacy/arm/mimxrt1064_evk/mimxrt1064_evk.dts rename to boards/nxp/mimxrt1064_evk/mimxrt1064_evk.dts diff --git a/boards/boards_legacy/arm/mimxrt1064_evk/mimxrt1064_evk.yaml b/boards/nxp/mimxrt1064_evk/mimxrt1064_evk.yaml similarity index 100% rename from boards/boards_legacy/arm/mimxrt1064_evk/mimxrt1064_evk.yaml rename to boards/nxp/mimxrt1064_evk/mimxrt1064_evk.yaml diff --git a/boards/boards_legacy/arm/mimxrt1064_evk/mimxrt1064_evk_defconfig b/boards/nxp/mimxrt1064_evk/mimxrt1064_evk_defconfig similarity index 79% rename from boards/boards_legacy/arm/mimxrt1064_evk/mimxrt1064_evk_defconfig rename to boards/nxp/mimxrt1064_evk/mimxrt1064_evk_defconfig index 22911d8b782b9bd..8af2d46280907d4 100644 --- a/boards/boards_legacy/arm/mimxrt1064_evk/mimxrt1064_evk_defconfig +++ b/boards/nxp/mimxrt1064_evk/mimxrt1064_evk_defconfig @@ -4,8 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1064=y -CONFIG_SOC_SERIES_IMX_RT=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/boards_legacy/arm/mimxrt1160_evk/CMakeLists.txt b/boards/nxp/mimxrt1160_evk/CMakeLists.txt similarity index 91% rename from boards/boards_legacy/arm/mimxrt1160_evk/CMakeLists.txt rename to boards/nxp/mimxrt1160_evk/CMakeLists.txt index 62d5ed6a61cec94..928a9693df79bc8 100644 --- a/boards/boards_legacy/arm/mimxrt1160_evk/CMakeLists.txt +++ b/boards/nxp/mimxrt1160_evk/CMakeLists.txt @@ -4,10 +4,10 @@ # SPDX-License-Identifier: Apache-2.0 # -if(CONFIG_NXP_IMX_RT_BOOT_HEADER) +if(CONFIG_NXP_IMXRT_BOOT_HEADER) zephyr_library() - if(NOT (DEFINED CONFIG_BOARD_MIMXRT1160_EVK_CM7) - OR (DEFINED CONFIG_BOARD_MIMXRT1160_EVK_CM4)) + if(NOT ((DEFINED CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM7) + OR (DEFINED CONFIG_BOARD_MIMXRT1160_EVK_MIMXRT1166_CM4))) message(WARNING "It appears you are using the board definition for " "the MIMXRT1160-EVK, but targeting a custom board. You may need to " "update your flash configuration or device configuration data blocks") diff --git a/boards/boards_legacy/arm/mimxrt1160_evk/Kconfig.defconfig b/boards/nxp/mimxrt1160_evk/Kconfig.defconfig similarity index 60% rename from boards/boards_legacy/arm/mimxrt1160_evk/Kconfig.defconfig rename to boards/nxp/mimxrt1160_evk/Kconfig.defconfig index 9f7f09e84c2ee54..3aa0f2e95ce852b 100644 --- a/boards/boards_legacy/arm/mimxrt1160_evk/Kconfig.defconfig +++ b/boards/nxp/mimxrt1160_evk/Kconfig.defconfig @@ -1,19 +1,9 @@ # MIMXRT1160-EVK board -# Copyright 2021,2023 NXP +# Copyright 2021,2023-2024 NXP # SPDX-License-Identifier: Apache-2.0 -if BOARD_MIMXRT1160_EVK_CM7 || BOARD_MIMXRT1160_EVK_CM4 - -config BOARD - default "mimxrt1160_evk_cm7" if BOARD_MIMXRT1160_EVK_CM7 - default "mimxrt1160_evk_cm4" if BOARD_MIMXRT1160_EVK_CM4 - -choice CODE_LOCATION - default CODE_FLEXSPI if BOARD_MIMXRT1160_EVK_CM7 - default CODE_OCRAM if BOARD_MIMXRT1160_EVK_CM4 && SECOND_CORE_MCUX - default CODE_SRAM0 if BOARD_MIMXRT1160_EVK_CM4 -endchoice +if BOARD_MIMXRT1160_EVK # Only use DCD when booting primary core (M7) config DEVICE_CONFIGURATION_DATA @@ -22,7 +12,7 @@ config DEVICE_CONFIGURATION_DATA config NXP_IMX_EXTERNAL_SDRAM default y if CPU_CORTEX_M7 -if SECOND_CORE_MCUX && BOARD_MIMXRT1160_EVK_CM4 +if SECOND_CORE_MCUX && BOARD_MIMXRT1160_EVK_MIMXRT1166_CM4 config BUILD_OUTPUT_INFO_HEADER default y @@ -38,8 +28,8 @@ config BUILD_OUTPUT_ADJUST_LMA endif config SYS_CLOCK_HW_CYCLES_PER_SEC - default 240000000 if BOARD_MIMXRT1160_EVK_CM4 && CORTEX_M_SYSTICK - default 600000000 if BOARD_MIMXRT1160_EVK_CM7 && CORTEX_M_SYSTICK + default 240000000 if BOARD_MIMXRT1160_EVK_MIMXRT1166_CM4 && CORTEX_M_SYSTICK + default 600000000 if BOARD_MIMXRT1160_EVK_MIMXRT1166_CM7 && CORTEX_M_SYSTICK if FLASH @@ -60,4 +50,4 @@ config ETH_MCUX_PHY_RESET endif # NETWORKING -endif # BOARD_MIMXRT1160_EVK_CM7 || BOARD_MIMXRT1160_EVK_CM4 +endif # BOARD_MIMXRT1160_EVK diff --git a/boards/nxp/mimxrt1160_evk/Kconfig.mimxrt1160_evk b/boards/nxp/mimxrt1160_evk/Kconfig.mimxrt1160_evk new file mode 100644 index 000000000000000..7a58b49cbbc8bbb --- /dev/null +++ b/boards/nxp/mimxrt1160_evk/Kconfig.mimxrt1160_evk @@ -0,0 +1,10 @@ +# +# Copyright 2024 NXP +# +# SPDX-License-Identifier: Apache-2.0 +# + +config BOARD_MIMXRT1160_EVK + select SOC_PART_NUMBER_MIMXRT1166DVM6A + select SOC_MIMXRT1166_CM7 if BOARD_MIMXRT1160_EVK_MIMXRT1166_CM7 + select SOC_MIMXRT1166_CM4 if BOARD_MIMXRT1160_EVK_MIMXRT1166_CM4 diff --git a/boards/boards_legacy/arm/mimxrt1160_evk/board.cmake b/boards/nxp/mimxrt1160_evk/board.cmake similarity index 100% rename from boards/boards_legacy/arm/mimxrt1160_evk/board.cmake rename to boards/nxp/mimxrt1160_evk/board.cmake diff --git a/boards/nxp/mimxrt1160_evk/board.yml b/boards/nxp/mimxrt1160_evk/board.yml new file mode 100644 index 000000000000000..4fe56f8d256ebdc --- /dev/null +++ b/boards/nxp/mimxrt1160_evk/board.yml @@ -0,0 +1,5 @@ +board: + name: mimxrt1160_evk + vendor: nxp + socs: + - name: mimxrt1166 diff --git a/boards/boards_legacy/arm/mimxrt1160_evk/doc/index.rst b/boards/nxp/mimxrt1160_evk/doc/index.rst similarity index 97% rename from boards/boards_legacy/arm/mimxrt1160_evk/doc/index.rst rename to boards/nxp/mimxrt1160_evk/doc/index.rst index 2449429a891e883..501182df322cb2a 100644 --- a/boards/boards_legacy/arm/mimxrt1160_evk/doc/index.rst +++ b/boards/nxp/mimxrt1160_evk/doc/index.rst @@ -145,7 +145,7 @@ already supported, which can also be re-used on this mimxrt1160_evk board: +-----------+------------+-------------------------------------+ The default configuration can be found in the defconfig file: -``boards/arm/mimxrt1160_evk/mimxrt1160_evk_cm7_defconfig`` +:zephyr_file:`boards/nxp/mimxrt1160_evk/mimxrt1160_evk_mimxrt1166_cm7_defconfig` Other hardware features are not currently supported by the port. @@ -252,7 +252,7 @@ written to flash. Then, the M7 image must be flashed. The openamp sysbuild sample will do this automatically by setting the image order. The secondary core can be debugged normally in single core builds -(where the target is ``mimxrt1160_evk_cm4``). For dual core builds, the +(where the target is ``mimxrt1160_evk/mimxrt1166/cm4``). For dual core builds, the secondary core should be placed into a loop, then a debugger can be attached (see `AN13264`_, section 4.2.3 for more information) @@ -304,7 +304,7 @@ Before power on the board, make sure SW1 is set to 0001b .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: mimxrt1160_evk_cm7 + :board: mimxrt1160_evk/mimxrt1166/cm7 :goals: flash Power off the board, and change SW1 to 0010b. Then power on the board and @@ -314,7 +314,7 @@ see the following message in the terminal: .. code-block:: console ***** Booting Zephyr OS v2.6.0-xxxx-xxxxxxxxxxxxx ***** - Hello World! mimxrt1160_evk_cm7 + Hello World! mimxrt1160_evk Debugging ========= @@ -323,7 +323,7 @@ Here is an example for the :ref:`hello_world` application. .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: mimxrt1160_evk_cm7 + :board: mimxrt1160_evk/mimxrt1166/cm7 :goals: debug Open a serial terminal, step through the application in your debugger, and you @@ -332,7 +332,7 @@ should see the following message in the terminal: .. code-block:: console ***** Booting Zephyr OS v2.4.0-xxxx-xxxxxxxxxxxxx ***** - Hello World! mimxrt1160_evk_cm7 + Hello World! mimxrt1160_evk .. _MIMXRT1160-EVK Website: https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/i-mx-rt1160-evaluation-kit:MIMXRT1160-EVK diff --git a/boards/boards_legacy/arm/mimxrt1160_evk/doc/mimxrt1160_evk.jpg b/boards/nxp/mimxrt1160_evk/doc/mimxrt1160_evk.jpg similarity index 100% rename from boards/boards_legacy/arm/mimxrt1160_evk/doc/mimxrt1160_evk.jpg rename to boards/nxp/mimxrt1160_evk/doc/mimxrt1160_evk.jpg diff --git a/boards/boards_legacy/arm/mimxrt1160_evk/dts/nxp,enet-experimental.overlay b/boards/nxp/mimxrt1160_evk/dts/nxp,enet-experimental.overlay similarity index 100% rename from boards/boards_legacy/arm/mimxrt1160_evk/dts/nxp,enet-experimental.overlay rename to boards/nxp/mimxrt1160_evk/dts/nxp,enet-experimental.overlay diff --git a/boards/boards_legacy/arm/mimxrt1160_evk/mimxrt1160_evk-pinctrl.dtsi b/boards/nxp/mimxrt1160_evk/mimxrt1160_evk-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/mimxrt1160_evk/mimxrt1160_evk-pinctrl.dtsi rename to boards/nxp/mimxrt1160_evk/mimxrt1160_evk-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/mimxrt1160_evk/mimxrt1160_evk.dtsi b/boards/nxp/mimxrt1160_evk/mimxrt1160_evk.dtsi similarity index 100% rename from boards/boards_legacy/arm/mimxrt1160_evk/mimxrt1160_evk.dtsi rename to boards/nxp/mimxrt1160_evk/mimxrt1160_evk.dtsi diff --git a/boards/boards_legacy/arm/mimxrt1160_evk/mimxrt1160_evk_cm4.dts b/boards/nxp/mimxrt1160_evk/mimxrt1160_evk_mimxrt1166_cm4.dts similarity index 100% rename from boards/boards_legacy/arm/mimxrt1160_evk/mimxrt1160_evk_cm4.dts rename to boards/nxp/mimxrt1160_evk/mimxrt1160_evk_mimxrt1166_cm4.dts diff --git a/boards/boards_legacy/arm/mimxrt1160_evk/mimxrt1160_evk_cm4.yaml b/boards/nxp/mimxrt1160_evk/mimxrt1160_evk_mimxrt1166_cm4.yaml similarity index 76% rename from boards/boards_legacy/arm/mimxrt1160_evk/mimxrt1160_evk_cm4.yaml rename to boards/nxp/mimxrt1160_evk/mimxrt1160_evk_mimxrt1166_cm4.yaml index 8d0d041c14fbf48..400e501406f2b29 100644 --- a/boards/boards_legacy/arm/mimxrt1160_evk/mimxrt1160_evk_cm4.yaml +++ b/boards/nxp/mimxrt1160_evk/mimxrt1160_evk_mimxrt1166_cm4.yaml @@ -1,10 +1,10 @@ # -# Copyright (c) 2021, NXP +# Copyright 2021,2024 NXP # # SPDX-License-Identifier: Apache-2.0 # -identifier: mimxrt1160_evk_cm4 +identifier: mimxrt1160_evk/mimxrt1166/cm4 name: NXP MIMXRT1160-EVK CM4 type: mcu arch: arm diff --git a/boards/boards_legacy/arm/mimxrt1160_evk/mimxrt1160_evk_cm4_defconfig b/boards/nxp/mimxrt1160_evk/mimxrt1160_evk_mimxrt1166_cm4_defconfig similarity index 68% rename from boards/boards_legacy/arm/mimxrt1160_evk/mimxrt1160_evk_cm4_defconfig rename to boards/nxp/mimxrt1160_evk/mimxrt1160_evk_mimxrt1166_cm4_defconfig index ac3f4bf5b930d1c..5139427b850b5b5 100644 --- a/boards/boards_legacy/arm/mimxrt1160_evk/mimxrt1160_evk_cm4_defconfig +++ b/boards/nxp/mimxrt1160_evk/mimxrt1160_evk_mimxrt1166_cm4_defconfig @@ -1,11 +1,9 @@ # -# Copyright (c) 2021, NXP +# Copyright 2021,2024 NXP # # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1166_CM4=y -CONFIG_SOC_SERIES_IMX_RT=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/boards_legacy/arm/mimxrt1160_evk/mimxrt1160_evk_cm7.dts b/boards/nxp/mimxrt1160_evk/mimxrt1160_evk_mimxrt1166_cm7.dts similarity index 100% rename from boards/boards_legacy/arm/mimxrt1160_evk/mimxrt1160_evk_cm7.dts rename to boards/nxp/mimxrt1160_evk/mimxrt1160_evk_mimxrt1166_cm7.dts diff --git a/boards/boards_legacy/arm/mimxrt1160_evk/mimxrt1160_evk_cm7.yaml b/boards/nxp/mimxrt1160_evk/mimxrt1160_evk_mimxrt1166_cm7.yaml similarity index 81% rename from boards/boards_legacy/arm/mimxrt1160_evk/mimxrt1160_evk_cm7.yaml rename to boards/nxp/mimxrt1160_evk/mimxrt1160_evk_mimxrt1166_cm7.yaml index 48e4f372355bab4..9ff9b57258d2e48 100644 --- a/boards/boards_legacy/arm/mimxrt1160_evk/mimxrt1160_evk_cm7.yaml +++ b/boards/nxp/mimxrt1160_evk/mimxrt1160_evk_mimxrt1166_cm7.yaml @@ -1,10 +1,10 @@ # -# Copyright (c) 2021, NXP +# Copyright 2021,2024 NXP # # SPDX-License-Identifier: Apache-2.0 # -identifier: mimxrt1160_evk_cm7 +identifier: mimxrt1160_evk/mimxrt1166/cm7 name: NXP MIMXRT1160-EVK CM7 type: mcu arch: arm diff --git a/boards/boards_legacy/arm/mimxrt1160_evk/mimxrt1160_evk_cm7_defconfig b/boards/nxp/mimxrt1160_evk/mimxrt1160_evk_mimxrt1166_cm7_defconfig similarity index 72% rename from boards/boards_legacy/arm/mimxrt1160_evk/mimxrt1160_evk_cm7_defconfig rename to boards/nxp/mimxrt1160_evk/mimxrt1160_evk_mimxrt1166_cm7_defconfig index 7cdde24c5a0abdf..78f5191a1545b07 100644 --- a/boards/boards_legacy/arm/mimxrt1160_evk/mimxrt1160_evk_cm7_defconfig +++ b/boards/nxp/mimxrt1160_evk/mimxrt1160_evk_mimxrt1166_cm7_defconfig @@ -1,11 +1,9 @@ # -# Copyright (c) 2021, NXP +# Copyright 2021,2024 NXP # # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1166_CM7=y -CONFIG_SOC_SERIES_IMX_RT=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/boards_legacy/arm/mimxrt1170_evk/CMakeLists.txt b/boards/nxp/mimxrt1170_evk/CMakeLists.txt similarity index 80% rename from boards/boards_legacy/arm/mimxrt1170_evk/CMakeLists.txt rename to boards/nxp/mimxrt1170_evk/CMakeLists.txt index 48cec3f9786822c..c564e77e49273ca 100644 --- a/boards/boards_legacy/arm/mimxrt1170_evk/CMakeLists.txt +++ b/boards/nxp/mimxrt1170_evk/CMakeLists.txt @@ -4,21 +4,17 @@ # SPDX-License-Identifier: Apache-2.0 # -if(CONFIG_NXP_IMX_RT_BOOT_HEADER) +if(CONFIG_NXP_IMXRT_BOOT_HEADER) zephyr_library() - if(NOT ((DEFINED CONFIG_BOARD_MIMXRT1170_EVK_CM7) - OR (DEFINED CONFIG_BOARD_MIMXRT1170_EVK_CM4) - OR (DEFINED CONFIG_BOARD_MIMXRT1170_EVKB_CM7) - OR (DEFINED CONFIG_BOARD_MIMXRT1170_EVKB_CM4))) + if(NOT ((DEFINED CONFIG_BOARD_MIMXRT1170_EVK_MIMXRT1176_CM7) + OR (DEFINED CONFIG_BOARD_MIMXRT1170_EVK_MIMXRT1176_CM4))) message(WARNING "It appears you are using the board definition for " "the MIMXRT1170-EVK, but targeting a custom board. You may need to " "update your flash configuration or device configuration data blocks") endif() - if ((DEFINED CONFIG_BOARD_MIMXRT1170_EVK_CM7) - OR (DEFINED CONFIG_BOARD_MIMXRT1170_EVK_CM4)) + if (${BOARD_REVISION} STREQUAL "A") set(RT1170_BOARD_NAME "evkmimxrt1170") - elseif((DEFINED CONFIG_BOARD_MIMXRT1170_EVKB_CM7) - OR (DEFINED CONFIG_BOARD_MIMXRT1170_EVKB_CM4)) + elseif (${BOARD_REVISION} STREQUAL "B") set(RT1170_BOARD_NAME "evkbmimxrt1170") endif() set(RT1170_BOARD_DIR diff --git a/boards/boards_legacy/arm/mimxrt1170_evk/Kconfig.defconfig b/boards/nxp/mimxrt1170_evk/Kconfig.defconfig similarity index 67% rename from boards/boards_legacy/arm/mimxrt1170_evk/Kconfig.defconfig rename to boards/nxp/mimxrt1170_evk/Kconfig.defconfig index 867999f701c8d2d..f4461aa97f9eb53 100644 --- a/boards/boards_legacy/arm/mimxrt1170_evk/Kconfig.defconfig +++ b/boards/nxp/mimxrt1170_evk/Kconfig.defconfig @@ -3,20 +3,7 @@ # Copyright 2021,2023 NXP # SPDX-License-Identifier: Apache-2.0 -if BOARD_MIMXRT1170_EVK_CM7 || BOARD_MIMXRT1170_EVK_CM4 || \ - BOARD_MIMXRT1170_EVKB_CM7 || BOARD_MIMXRT1170_EVKB_CM4 - -config BOARD - default "mimxrt1170_evk_cm7" if BOARD_MIMXRT1170_EVK_CM7 - default "mimxrt1170_evk_cm4" if BOARD_MIMXRT1170_EVK_CM4 - default "mimxrt1170_evkb_cm7" if BOARD_MIMXRT1170_EVKB_CM7 - default "mimxrt1170_evkb_cm4" if BOARD_MIMXRT1170_EVKB_CM4 - -choice CODE_LOCATION - default CODE_FLEXSPI if CPU_CORTEX_M7 - default CODE_OCRAM if CPU_CORTEX_M4 && SECOND_CORE_MCUX - default CODE_SRAM0 if CPU_CORTEX_M4 -endchoice +if BOARD_MIMXRT1170_EVK # Only use DCD when booting primary core (M7) config DEVICE_CONFIGURATION_DATA diff --git a/boards/nxp/mimxrt1170_evk/Kconfig.mimxrt1170_evk b/boards/nxp/mimxrt1170_evk/Kconfig.mimxrt1170_evk new file mode 100644 index 000000000000000..c17775510766e79 --- /dev/null +++ b/boards/nxp/mimxrt1170_evk/Kconfig.mimxrt1170_evk @@ -0,0 +1,9 @@ +# +# Copyright 2024 NXP +# +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMXRT1170_EVK + select SOC_PART_NUMBER_MIMXRT1176DVMAA + select SOC_MIMXRT1176_CM7 if BOARD_MIMXRT1170_EVK_MIMXRT1176_CM7 + select SOC_MIMXRT1176_CM4 if BOARD_MIMXRT1170_EVK_MIMXRT1176_CM4 diff --git a/boards/boards_legacy/arm/mimxrt1170_evk/board.cmake b/boards/nxp/mimxrt1170_evk/board.cmake similarity index 87% rename from boards/boards_legacy/arm/mimxrt1170_evk/board.cmake rename to boards/nxp/mimxrt1170_evk/board.cmake index d543dce8821d8b3..d1438e4a7b174ad 100644 --- a/boards/boards_legacy/arm/mimxrt1170_evk/board.cmake +++ b/boards/nxp/mimxrt1170_evk/board.cmake @@ -8,9 +8,9 @@ if(CONFIG_SOC_MIMXRT1176_CM7 OR CONFIG_SECOND_CORE_MCUX) board_runner_args(pyocd "--target=mimxrt1170_cm7") board_runner_args(jlink "--device=MIMXRT1176xxxA_M7" "--reset-after-load") - if(CONFIG_BOARD_MIMXRT1170_EVK_CM7) + if(${BOARD_REVISION} STREQUAL "A") board_runner_args(linkserver "--device=MIMXRT1176xxxxx:MIMXRT1170-EVK") - elseif(CONFIG_BOARD_MIMXRT1170_EVKB_CM7) + elseif(${BOARD_REVISION} STREQUAL "B") board_runner_args(linkserver "--device=MIMXRT1176xxxxx:MIMXRT1170-EVKB") endif() @@ -19,9 +19,9 @@ elseif(CONFIG_SOC_MIMXRT1176_CM4) board_runner_args(pyocd "--target=mimxrt1170_cm4") # Note: Please use JLINK above V7.50 (Only support run cm4 image when debugging due to default boot core on board is cm7 core) board_runner_args(jlink "--device=MIMXRT1176xxxA_M4") - if(CONFIG_BOARD_MIMXRT1170_EVK_CM4) + if(${BOARD_REVISION} STREQUAL "A") board_runner_args(linkserver "--device=MIMXRT1176xxxxx:MIMXRT1170-EVK") - elseif(CONFIG_BOARD_MIMXRT1170_EVKB_CM4) + elseif(${BOARD_REVISION} STREQUAL "B") board_runner_args(linkserver "--device=MIMXRT1176xxxxx:MIMXRT1170-EVKB") endif() board_runner_args(linkserver "--core=cm4") diff --git a/boards/nxp/mimxrt1170_evk/board.yml b/boards/nxp/mimxrt1170_evk/board.yml new file mode 100644 index 000000000000000..0b8e2b058e014a9 --- /dev/null +++ b/boards/nxp/mimxrt1170_evk/board.yml @@ -0,0 +1,11 @@ +board: + name: mimxrt1170_evk + vendor: nxp + socs: + - name: mimxrt1176 + revision: + format: "letter" + default: "A" + revisions: + - name: "A" + - name: "B" diff --git a/boards/boards_legacy/arm/mimxrt1170_evk/doc/index.rst b/boards/nxp/mimxrt1170_evk/doc/index.rst similarity index 97% rename from boards/boards_legacy/arm/mimxrt1170_evk/doc/index.rst rename to boards/nxp/mimxrt1170_evk/doc/index.rst index faff1975ca81e4d..40dffaba765e653 100644 --- a/boards/boards_legacy/arm/mimxrt1170_evk/doc/index.rst +++ b/boards/nxp/mimxrt1170_evk/doc/index.rst @@ -110,8 +110,8 @@ NXP considers the MIMXRT1170-EVK as the superset board for the i.MX RT11xx family of MCUs. This board is a focus for NXP's Full Platform Support for Zephyr, to better enable the entire RT11xx family. NXP prioritizes enabling this board with new support for Zephyr features. Note that this table -covers two boards: the RT1170 EVK (`mimxrt1170_evk_cm7/cm4`), and -RT1170 EVKB (`mimxrt1170_evkb_cm7/cm4`) +covers two boards: the RT1170 EVK (`mimxrt1170_evk//cm7/cm4`), and +RT1170 EVKB (`mimxrt1170_evk@B//cm7/cm4`) +-----------+------------+-------------------------------------+-----------------+-----------------+ | Interface | Controller | Driver/Component | RT1170 EVK | RT1170 EVKB | @@ -168,8 +168,8 @@ RT1170 EVKB (`mimxrt1170_evkb_cm7/cm4`) +-----------+------------+-------------------------------------+-----------------+-----------------+ The default configuration can be found in the defconfig files: -``boards/arm/mimxrt1170_evk/mimxrt1170_evk_cm7_defconfig`` -``boards/arm/mimxrt1170_evk/mimxrt1170_evkb_cm7_defconfig`` +:zephyr_file:`boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm7_defconfig` +:zephyr_file:`boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm4_defconfig` Connections and I/Os ==================== @@ -304,7 +304,7 @@ written to flash. Then, the M7 image must be flashed. The openamp sysbuild sample will do this automatically by setting the image order. The secondary core can be debugged normally in single core builds -(where the target is ``mimxrt1170_evk_cm4``). For dual core builds, the +(where the target is ``mimxrt1170_evk/mimxrt1176/cm4``). For dual core builds, the secondary core should be placed into a loop, then a debugger can be attached (see `AN13264`_, section 4.2.3 for more information) @@ -386,7 +386,7 @@ Before powering the board, make sure SW1 is set to 0001b .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: mimxrt1170_evk_cm7 + :board: mimxrt1170_evk/mimxrt1176/cm7 :goals: flash Power off the board, and change SW1 to 0010b. Then power on the board and @@ -396,7 +396,7 @@ see the following message in the terminal: .. code-block:: console ***** Booting Zephyr OS v3.4.0-xxxx-xxxxxxxxxxxxx ***** - Hello World! mimxrt1170_evk_cm7 + Hello World! mimxrt1170_evk Debugging ========= @@ -405,7 +405,7 @@ Here is an example for the :ref:`hello_world` application. .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: mimxrt1170_evk_cm7 + :board: mimxrt1170_evk/mimxrt1176/cm7 :goals: debug Open a serial terminal, step through the application in your debugger, and you @@ -414,7 +414,7 @@ should see the following message in the terminal: .. code-block:: console ***** Booting Zephyr OS v3.4.0-xxxx-xxxxxxxxxxxxx ***** - Hello World! mimxrt1170_evk_cm7 + Hello World! mimxrt1170_evk .. _MIMXRT1170-EVK Website: https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/i-mx-rt1170-evaluation-kit:MIMXRT1170-EVK diff --git a/boards/boards_legacy/arm/mimxrt1170_evk/doc/mimxrt1170_evk.jpg b/boards/nxp/mimxrt1170_evk/doc/mimxrt1170_evk.jpg similarity index 100% rename from boards/boards_legacy/arm/mimxrt1170_evk/doc/mimxrt1170_evk.jpg rename to boards/nxp/mimxrt1170_evk/doc/mimxrt1170_evk.jpg diff --git a/boards/boards_legacy/arm/mimxrt1170_evk/dts/nxp,enet-experimental.overlay b/boards/nxp/mimxrt1170_evk/dts/nxp,enet-experimental.overlay similarity index 100% rename from boards/boards_legacy/arm/mimxrt1170_evk/dts/nxp,enet-experimental.overlay rename to boards/nxp/mimxrt1170_evk/dts/nxp,enet-experimental.overlay diff --git a/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evk-pinctrl.dtsi b/boards/nxp/mimxrt1170_evk/mimxrt1170_evk-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evk-pinctrl.dtsi rename to boards/nxp/mimxrt1170_evk/mimxrt1170_evk-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evk.dtsi b/boards/nxp/mimxrt1170_evk/mimxrt1170_evk.dtsi similarity index 100% rename from boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evk.dtsi rename to boards/nxp/mimxrt1170_evk/mimxrt1170_evk.dtsi diff --git a/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evk_cm4.dts b/boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm4.dts similarity index 100% rename from boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evk_cm4.dts rename to boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm4.dts diff --git a/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evk_cm4.yaml b/boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm4.yaml similarity index 85% rename from boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evk_cm4.yaml rename to boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm4.yaml index 69232196b62ec1d..87788b3a0153dcc 100644 --- a/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evk_cm4.yaml +++ b/boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm4.yaml @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -identifier: mimxrt1170_evk_cm4 +identifier: mimxrt1170_evk/mimxrt1176/cm4 name: NXP MIMXRT1170-EVK CM4 type: mcu arch: arm diff --git a/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evkb_cm4.dts b/boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm4_B.overlay similarity index 98% rename from boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evkb_cm4.dts rename to boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm4_B.overlay index 79725d1ac352295..c92d197f548dee3 100644 --- a/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evkb_cm4.dts +++ b/boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm4_B.overlay @@ -4,8 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include "mimxrt1170_evk_cm4.dts" - / { chosen { /delete-property/ zephyr,flash-controller; diff --git a/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evkb_cm4.yaml b/boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm4_B.yaml similarity index 84% rename from boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evkb_cm4.yaml rename to boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm4_B.yaml index 77a684f23edd415..da1f36a162c29ca 100644 --- a/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evkb_cm4.yaml +++ b/boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm4_B.yaml @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -identifier: mimxrt1170_evkb_cm4 +identifier: mimxrt1170_evk@B/mimxrt1176/cm4 name: NXP MIMXRT1170-EVKB CM4 type: mcu arch: arm diff --git a/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evk_cm4_defconfig b/boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm4_defconfig similarity index 69% rename from boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evk_cm4_defconfig rename to boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm4_defconfig index dacbbf3e1d2a8c5..822498def23bbfe 100644 --- a/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evk_cm4_defconfig +++ b/boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm4_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_BOARD_MIMXRT1170_EVK_CM4=y -CONFIG_SOC_MIMXRT1176_CM4=y -CONFIG_SOC_SERIES_IMX_RT=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evk_cm7.dts b/boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm7.dts similarity index 100% rename from boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evk_cm7.dts rename to boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm7.dts diff --git a/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evk_cm7.yaml b/boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm7.yaml similarity index 89% rename from boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evk_cm7.yaml rename to boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm7.yaml index ba3ae1b201b5b11..c7e846adf6ab308 100644 --- a/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evk_cm7.yaml +++ b/boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm7.yaml @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -identifier: mimxrt1170_evk_cm7 +identifier: mimxrt1170_evk/mimxrt1176/cm7 name: NXP MIMXRT1170-EVK CM7 type: mcu arch: arm diff --git a/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evkb_cm7.dts b/boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm7_B.overlay similarity index 97% rename from boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evkb_cm7.dts rename to boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm7_B.overlay index feceb9eaa30dfbe..4073b78a83e3e30 100644 --- a/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evkb_cm7.dts +++ b/boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm7_B.overlay @@ -4,8 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include "mimxrt1170_evk_cm7.dts" - / { chosen { zephyr,flash = &w25q512nw; diff --git a/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evkb_cm7.yaml b/boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm7_B.yaml similarity index 88% rename from boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evkb_cm7.yaml rename to boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm7_B.yaml index 03376fd15c3b491..5cdfdf97c875717 100644 --- a/boards/boards_legacy/arm/mimxrt1170_evk/mimxrt1170_evkb_cm7.yaml +++ b/boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm7_B.yaml @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -identifier: mimxrt1170_evkb_cm7 +identifier: mimxrt1170_evk@B/mimxrt1176/cm7 name: NXP MIMXRT1170-EVKB CM7 type: mcu arch: arm diff --git a/boards/weact/weact_stm32g431_core/weact_stm32g431_core_defconfig b/boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm7_defconfig similarity index 65% rename from boards/weact/weact_stm32g431_core/weact_stm32g431_core_defconfig rename to boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm7_defconfig index 19919b198ca2b8f..822498def23bbfe 100644 --- a/boards/weact/weact_stm32g431_core/weact_stm32g431_core_defconfig +++ b/boards/nxp/mimxrt1170_evk/mimxrt1170_evk_mimxrt1176_cm7_defconfig @@ -1,18 +1,13 @@ # -# Copyright (c) 2023 Andreas Sandberg +# Copyright 2021,2023 NXP # # SPDX-License-Identifier: Apache-2.0 # -CONFIG_CLOCK_CONTROL=y -CONFIG_PINCTRL=y - -CONFIG_ARM_MPU=y -CONFIG_HW_STACK_PROTECTION=y - -CONFIG_GPIO=y - -CONFIG_SERIAL=y -CONFIG_UART_INTERRUPT_DRIVEN=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 diff --git a/boards/boards_legacy/arm/mimxrt685_evk/CMakeLists.txt b/boards/nxp/mimxrt685_evk/CMakeLists.txt similarity index 96% rename from boards/boards_legacy/arm/mimxrt685_evk/CMakeLists.txt rename to boards/nxp/mimxrt685_evk/CMakeLists.txt index 35c6f881ff72348..39c978f14cc6959 100644 --- a/boards/boards_legacy/arm/mimxrt685_evk/CMakeLists.txt +++ b/boards/nxp/mimxrt685_evk/CMakeLists.txt @@ -7,7 +7,7 @@ zephyr_library() zephyr_library_sources(init.c) -if(CONFIG_NXP_IMX_RT6XX_BOOT_HEADER) +if(CONFIG_NXP_IMXRT_BOOT_HEADER) if(NOT DEFINED CONFIG_BOARD_MIMXRT685_EVK) message(WARNING "It appears you are using the board definition for " "the MIMXRT685-EVK, but targeting a custom board. You may need to " diff --git a/boards/boards_legacy/arm/mimxrt685_evk/Kconfig b/boards/nxp/mimxrt685_evk/Kconfig similarity index 100% rename from boards/boards_legacy/arm/mimxrt685_evk/Kconfig rename to boards/nxp/mimxrt685_evk/Kconfig diff --git a/boards/boards_legacy/arm/mimxrt685_evk/Kconfig.defconfig b/boards/nxp/mimxrt685_evk/Kconfig.defconfig similarity index 83% rename from boards/boards_legacy/arm/mimxrt685_evk/Kconfig.defconfig rename to boards/nxp/mimxrt685_evk/Kconfig.defconfig index db2679a3d4d1700..8fbc681e0528b2f 100644 --- a/boards/boards_legacy/arm/mimxrt685_evk/Kconfig.defconfig +++ b/boards/nxp/mimxrt685_evk/Kconfig.defconfig @@ -1,12 +1,12 @@ # MIMXRT685-EVK board -# Copyright (c) 2020, NXP +# Copyright 2020, 2024 NXP # SPDX-License-Identifier: Apache-2.0 if BOARD_MIMXRT685_EVK -config BOARD - default "mimxrt685_evk_cm33" +config NXP_IMXRT_BOOT_HEADER + default y if !BOOTLOADER_MCUBOOT config XTAL_SYS_CLK_HZ default 24000000 diff --git a/boards/nxp/mimxrt685_evk/Kconfig.mimxrt685_evk b/boards/nxp/mimxrt685_evk/Kconfig.mimxrt685_evk new file mode 100644 index 000000000000000..d87399aebd7f83b --- /dev/null +++ b/boards/nxp/mimxrt685_evk/Kconfig.mimxrt685_evk @@ -0,0 +1,5 @@ +# Copyright 2020, 2024 NXP +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_MIMXRT685_EVK + select SOC_PART_NUMBER_MIMXRT685SFVKB diff --git a/boards/boards_legacy/arm/mimxrt685_evk/board.cmake b/boards/nxp/mimxrt685_evk/board.cmake similarity index 100% rename from boards/boards_legacy/arm/mimxrt685_evk/board.cmake rename to boards/nxp/mimxrt685_evk/board.cmake diff --git a/boards/nxp/mimxrt685_evk/board.yml b/boards/nxp/mimxrt685_evk/board.yml new file mode 100644 index 000000000000000..41956acbb3146de --- /dev/null +++ b/boards/nxp/mimxrt685_evk/board.yml @@ -0,0 +1,5 @@ +board: + name: mimxrt685_evk + vendor: nxp + socs: + - name: mimxrt685s diff --git a/boards/boards_legacy/arm/mimxrt685_evk/doc/index.rst b/boards/nxp/mimxrt685_evk/doc/index.rst similarity index 98% rename from boards/boards_legacy/arm/mimxrt685_evk/doc/index.rst rename to boards/nxp/mimxrt685_evk/doc/index.rst index 579cd1e4087d112..3b0357ffb02180f 100644 --- a/boards/boards_legacy/arm/mimxrt685_evk/doc/index.rst +++ b/boards/nxp/mimxrt685_evk/doc/index.rst @@ -111,7 +111,7 @@ already supported, which can also be re-used on this mimxrt685_evk board: The default configuration can be found in the defconfig file: - ``boards/arm/mimxrt685_evk/mimxrt685_evk_cm33_defconfig`` + ``boards/arm/mimxrt685_evk/mimxrt685_evk_defconfig`` Other hardware features are not currently supported by the port. @@ -291,7 +291,7 @@ Here is an example for the :ref:`hello_world` application. This example uses the .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: mimxrt685_evk_cm33 + :board: mimxrt685_evk :goals: flash Open a serial terminal, reset the board (press the RESET button), and you should @@ -300,7 +300,7 @@ see the following message in the terminal: .. code-block:: console ***** Booting Zephyr OS v1.14.0 ***** - Hello World! mimxrt685_evk_cm33 + Hello World! mimxrt685_evk Debugging ========= @@ -310,7 +310,7 @@ Here is an example for the :ref:`hello_world` application. This example uses the .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: mimxrt685_evk_cm33 + :board: mimxrt685_evk :goals: debug Open a serial terminal, step through the application in your debugger, and you @@ -319,7 +319,7 @@ should see the following message in the terminal: .. code-block:: console ***** Booting Zephyr OS zephyr-v2.3.0 ***** - Hello World! mimxrt685_evk_cm33 + Hello World! mimxrt685_evk Troubleshooting =============== diff --git a/boards/boards_legacy/arm/mimxrt685_evk/doc/mimxrt685_evk.jpg b/boards/nxp/mimxrt685_evk/doc/mimxrt685_evk.jpg similarity index 100% rename from boards/boards_legacy/arm/mimxrt685_evk/doc/mimxrt685_evk.jpg rename to boards/nxp/mimxrt685_evk/doc/mimxrt685_evk.jpg diff --git a/boards/boards_legacy/arm/mimxrt685_evk/init.c b/boards/nxp/mimxrt685_evk/init.c similarity index 100% rename from boards/boards_legacy/arm/mimxrt685_evk/init.c rename to boards/nxp/mimxrt685_evk/init.c diff --git a/boards/boards_legacy/arm/mimxrt685_evk/mimxrt685_evk_cm33-pinctrl.dtsi b/boards/nxp/mimxrt685_evk/mimxrt685_evk-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/mimxrt685_evk/mimxrt685_evk_cm33-pinctrl.dtsi rename to boards/nxp/mimxrt685_evk/mimxrt685_evk-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/mimxrt685_evk/mimxrt685_evk_cm33.dts b/boards/nxp/mimxrt685_evk/mimxrt685_evk.dts similarity index 99% rename from boards/boards_legacy/arm/mimxrt685_evk/mimxrt685_evk_cm33.dts rename to boards/nxp/mimxrt685_evk/mimxrt685_evk.dts index 245e9833c3ef669..a7df8a693efdd7e 100644 --- a/boards/boards_legacy/arm/mimxrt685_evk/mimxrt685_evk_cm33.dts +++ b/boards/nxp/mimxrt685_evk/mimxrt685_evk.dts @@ -10,7 +10,7 @@ #include #include -#include "mimxrt685_evk_cm33-pinctrl.dtsi" +#include "mimxrt685_evk-pinctrl.dtsi" / { model = "NXP MIMXRT685-EVK board"; diff --git a/boards/boards_legacy/arm/mimxrt685_evk/mimxrt685_evk_cm33.yaml b/boards/nxp/mimxrt685_evk/mimxrt685_evk.yaml similarity index 92% rename from boards/boards_legacy/arm/mimxrt685_evk/mimxrt685_evk_cm33.yaml rename to boards/nxp/mimxrt685_evk/mimxrt685_evk.yaml index d940cbe35f8b4d7..53f260fc60e2242 100644 --- a/boards/boards_legacy/arm/mimxrt685_evk/mimxrt685_evk_cm33.yaml +++ b/boards/nxp/mimxrt685_evk/mimxrt685_evk.yaml @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -identifier: mimxrt685_evk_cm33 +identifier: mimxrt685_evk name: NXP MIMXRT685-EVK type: mcu arch: arm diff --git a/boards/boards_legacy/arm/mimxrt685_evk/mimxrt685_evk_cm33_defconfig b/boards/nxp/mimxrt685_evk/mimxrt685_evk_defconfig similarity index 76% rename from boards/boards_legacy/arm/mimxrt685_evk/mimxrt685_evk_cm33_defconfig rename to boards/nxp/mimxrt685_evk/mimxrt685_evk_defconfig index 05673abdd6b7b0b..47128760e08edc9 100644 --- a/boards/boards_legacy/arm/mimxrt685_evk/mimxrt685_evk_cm33_defconfig +++ b/boards/nxp/mimxrt685_evk/mimxrt685_evk_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT685S_CM33=y -CONFIG_SOC_SERIES_IMX_RT6XX=y -CONFIG_BOARD_MIMXRT685_EVK=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/boards_legacy/arm/mimxrt685_evk/pre_dt_board.cmake b/boards/nxp/mimxrt685_evk/pre_dt_board.cmake similarity index 100% rename from boards/boards_legacy/arm/mimxrt685_evk/pre_dt_board.cmake rename to boards/nxp/mimxrt685_evk/pre_dt_board.cmake diff --git a/boards/boards_legacy/arm/vmu_rt1170/CMakeLists.txt b/boards/nxp/vmu_rt1170/CMakeLists.txt similarity index 96% rename from boards/boards_legacy/arm/vmu_rt1170/CMakeLists.txt rename to boards/nxp/vmu_rt1170/CMakeLists.txt index 9e03e6cb024725f..2a12ecb36113613 100644 --- a/boards/boards_legacy/arm/vmu_rt1170/CMakeLists.txt +++ b/boards/nxp/vmu_rt1170/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_library() set(RT1170_BOARD_DIR "${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/boards/evkmimxrt1170") diff --git a/boards/boards_legacy/arm/vmu_rt1170/Kconfig.defconfig b/boards/nxp/vmu_rt1170/Kconfig.defconfig similarity index 82% rename from boards/boards_legacy/arm/vmu_rt1170/Kconfig.defconfig rename to boards/nxp/vmu_rt1170/Kconfig.defconfig index 1c27b74b23e5696..e8536998aa20cf1 100644 --- a/boards/boards_legacy/arm/vmu_rt1170/Kconfig.defconfig +++ b/boards/nxp/vmu_rt1170/Kconfig.defconfig @@ -5,13 +5,6 @@ if BOARD_VMU_RT1170 -config BOARD - default "vmu_rt1170" if BOARD_VMU_RT1170 - -choice CODE_LOCATION - default CODE_FLEXSPI if BOARD_VMU_RT1170 -endchoice - if DISK_DRIVERS config IMX_USDHC_DAT3_PWR_TOGGLE diff --git a/boards/boards_legacy/arm/vmu_rt1170/Kconfig.board b/boards/nxp/vmu_rt1170/Kconfig.vmu_rt1170 similarity index 56% rename from boards/boards_legacy/arm/vmu_rt1170/Kconfig.board rename to boards/nxp/vmu_rt1170/Kconfig.vmu_rt1170 index 53aa20f680077cf..cfd9ba449db94da 100644 --- a/boards/boards_legacy/arm/vmu_rt1170/Kconfig.board +++ b/boards/nxp/vmu_rt1170/Kconfig.vmu_rt1170 @@ -1,7 +1,6 @@ # Copyright 2023 NXP # SPDX-License-Identifier: Apache-2.0 -config BOARD_VMU_RT1170 - bool "NXP VMU_RT1170" - depends on SOC_MIMXRT1176_CM7 +config BOARD_VMU_RT1170_MIMXRT1176_CM7 + select SOC_MIMXRT1176_CM7 select SOC_PART_NUMBER_MIMXRT1176DVMAA diff --git a/boards/boards_legacy/arm/vmu_rt1170/board.cmake b/boards/nxp/vmu_rt1170/board.cmake similarity index 100% rename from boards/boards_legacy/arm/vmu_rt1170/board.cmake rename to boards/nxp/vmu_rt1170/board.cmake diff --git a/boards/nxp/vmu_rt1170/board.yml b/boards/nxp/vmu_rt1170/board.yml new file mode 100644 index 000000000000000..91d9d2e83b2dec2 --- /dev/null +++ b/boards/nxp/vmu_rt1170/board.yml @@ -0,0 +1,5 @@ +board: + name: vmu_rt1170 + vendor: nxp + socs: + - name: mimxrt1176 diff --git a/boards/boards_legacy/arm/vmu_rt1170/doc/index.rst b/boards/nxp/vmu_rt1170/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/vmu_rt1170/doc/index.rst rename to boards/nxp/vmu_rt1170/doc/index.rst diff --git a/boards/boards_legacy/arm/vmu_rt1170/doc/vmu_rt1170.jpg b/boards/nxp/vmu_rt1170/doc/vmu_rt1170.jpg similarity index 100% rename from boards/boards_legacy/arm/vmu_rt1170/doc/vmu_rt1170.jpg rename to boards/nxp/vmu_rt1170/doc/vmu_rt1170.jpg diff --git a/boards/boards_legacy/arm/vmu_rt1170/flexspi_nor_config.c b/boards/nxp/vmu_rt1170/flexspi_nor_config.c similarity index 98% rename from boards/boards_legacy/arm/vmu_rt1170/flexspi_nor_config.c rename to boards/nxp/vmu_rt1170/flexspi_nor_config.c index 21523fc29d0d220..85ad476cf84c051 100644 --- a/boards/boards_legacy/arm/vmu_rt1170/flexspi_nor_config.c +++ b/boards/nxp/vmu_rt1170/flexspi_nor_config.c @@ -34,7 +34,7 @@ status_t ROM_FLEXSPI_NorFlash_Init(uint32_t instance, struct flexspi_nor_config_ -#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__) @@ -68,7 +68,7 @@ const struct flexspi_nor_config_t Qspiflash_config = { .blockSize = 64u * 1024u, .isUniformBlockSize = false, }; -#endif /* CONFIG_NXP_IMX_RT_BOOT_HEADER */ +#endif /* CONFIG_NXP_IMXRT_BOOT_HEADER */ /* Config used for code execution */ const struct flexspi_nor_config_t g_flash_fast_config = { diff --git a/boards/boards_legacy/arm/vmu_rt1170/vmu_rt1170-pinctrl.dtsi b/boards/nxp/vmu_rt1170/vmu_rt1170-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/vmu_rt1170/vmu_rt1170-pinctrl.dtsi rename to boards/nxp/vmu_rt1170/vmu_rt1170-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/vmu_rt1170/vmu_rt1170.dts b/boards/nxp/vmu_rt1170/vmu_rt1170.dts similarity index 100% rename from boards/boards_legacy/arm/vmu_rt1170/vmu_rt1170.dts rename to boards/nxp/vmu_rt1170/vmu_rt1170.dts diff --git a/boards/boards_legacy/arm/vmu_rt1170/vmu_rt1170.dtsi b/boards/nxp/vmu_rt1170/vmu_rt1170.dtsi similarity index 100% rename from boards/boards_legacy/arm/vmu_rt1170/vmu_rt1170.dtsi rename to boards/nxp/vmu_rt1170/vmu_rt1170.dtsi diff --git a/boards/boards_legacy/arm/vmu_rt1170/vmu_rt1170.yaml b/boards/nxp/vmu_rt1170/vmu_rt1170.yaml similarity index 89% rename from boards/boards_legacy/arm/vmu_rt1170/vmu_rt1170.yaml rename to boards/nxp/vmu_rt1170/vmu_rt1170.yaml index 2eb4ce0e5889e2c..9446ece2d955a5d 100644 --- a/boards/boards_legacy/arm/vmu_rt1170/vmu_rt1170.yaml +++ b/boards/nxp/vmu_rt1170/vmu_rt1170.yaml @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -identifier: vmu_rt1170 +identifier: vmu_rt1170/mimxrt1176/cm7 name: NXP VMU RT1170 type: mcu arch: arm diff --git a/boards/boards_legacy/arm/vmu_rt1170/vmu_rt1170_defconfig b/boards/nxp/vmu_rt1170/vmu_rt1170_defconfig similarity index 86% rename from boards/boards_legacy/arm/vmu_rt1170/vmu_rt1170_defconfig rename to boards/nxp/vmu_rt1170/vmu_rt1170_defconfig index 875d84e7b644348..e6d72e55f463bcb 100644 --- a/boards/boards_legacy/arm/vmu_rt1170/vmu_rt1170_defconfig +++ b/boards/nxp/vmu_rt1170/vmu_rt1170_defconfig @@ -4,8 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1176_CM7=y -CONFIG_SOC_SERIES_IMX_RT=y CONFIG_CONSOLE=y CONFIG_SHELL=y CONFIG_UART_CONSOLE=y diff --git a/boards/pjrc/index.rst b/boards/pjrc/index.rst new file mode 100644 index 000000000000000..9a8e66fea3f4740 --- /dev/null +++ b/boards/pjrc/index.rst @@ -0,0 +1,10 @@ +.. _boards-pjrc: + +PJRC +#### + +.. toctree:: + :maxdepth: 1 + :glob: + + **/* diff --git a/boards/boards_legacy/arm/teensy4/CMakeLists.txt b/boards/pjrc/teensy4/CMakeLists.txt similarity index 92% rename from boards/boards_legacy/arm/teensy4/CMakeLists.txt rename to boards/pjrc/teensy4/CMakeLists.txt index 56f5eb005ab3f0e..7b0c243fbbb5a85 100644 --- a/boards/boards_legacy/arm/teensy4/CMakeLists.txt +++ b/boards/pjrc/teensy4/CMakeLists.txt @@ -5,7 +5,7 @@ # zephyr_library() -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) diff --git a/boards/boards_legacy/arm/teensy4/Kconfig.defconfig b/boards/pjrc/teensy4/Kconfig.defconfig similarity index 64% rename from boards/boards_legacy/arm/teensy4/Kconfig.defconfig rename to boards/pjrc/teensy4/Kconfig.defconfig index 5e8eac0d0f0f78b..4bdd626e94a62d4 100644 --- a/boards/boards_legacy/arm/teensy4/Kconfig.defconfig +++ b/boards/pjrc/teensy4/Kconfig.defconfig @@ -10,14 +10,6 @@ config BUILD_OUTPUT_HEX bool default y -config BOARD - default "teensy40" if BOARD_TEENSY40 - default "teensy41" if BOARD_TEENSY41 - -choice CODE_LOCATION - default CODE_FLEXSPI -endchoice - config DISK_DRIVER_SDMMC default y if DISK_DRIVERS diff --git a/boards/pjrc/teensy4/Kconfig.teensy40 b/boards/pjrc/teensy4/Kconfig.teensy40 new file mode 100644 index 000000000000000..bcc62d6bb4238fc --- /dev/null +++ b/boards/pjrc/teensy4/Kconfig.teensy40 @@ -0,0 +1,9 @@ +# +# Copyright (c) 2020, Bernhard Kraemer +# Copyright 2024 NXP +# +# SPDX-License-Identifier: Apache-2.0 +# + +config BOARD_TEENSY40 + select SOC_PART_NUMBER_MIMXRT1062DVJ6A diff --git a/boards/pjrc/teensy4/Kconfig.teensy41 b/boards/pjrc/teensy4/Kconfig.teensy41 new file mode 100644 index 000000000000000..d66c5f979a0f26a --- /dev/null +++ b/boards/pjrc/teensy4/Kconfig.teensy41 @@ -0,0 +1,9 @@ +# +# Copyright (c) 2020, Bernhard Kraemer +# Copyright 2024 NXP +# +# SPDX-License-Identifier: Apache-2.0 +# + +config BOARD_TEENSY41 + select SOC_PART_NUMBER_MIMXRT1062DVL6A diff --git a/boards/pjrc/teensy4/board.yml b/boards/pjrc/teensy4/board.yml new file mode 100644 index 000000000000000..7906ae3b8236efa --- /dev/null +++ b/boards/pjrc/teensy4/board.yml @@ -0,0 +1,9 @@ +boards: + - name: teensy40 + vendor: pjrc + socs: + - name: mimxrt1062 + - name: teensy41 + vendor: pjrc + socs: + - name: mimxrt1062 diff --git a/boards/boards_legacy/arm/teensy4/doc/index.rst b/boards/pjrc/teensy4/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/teensy4/doc/index.rst rename to boards/pjrc/teensy4/doc/index.rst diff --git a/boards/boards_legacy/arm/teensy4/doc/teensy40.jpg b/boards/pjrc/teensy4/doc/teensy40.jpg similarity index 100% rename from boards/boards_legacy/arm/teensy4/doc/teensy40.jpg rename to boards/pjrc/teensy4/doc/teensy40.jpg diff --git a/boards/boards_legacy/arm/teensy4/doc/teensy41.jpg b/boards/pjrc/teensy4/doc/teensy41.jpg similarity index 100% rename from boards/boards_legacy/arm/teensy4/doc/teensy41.jpg rename to boards/pjrc/teensy4/doc/teensy41.jpg diff --git a/boards/boards_legacy/arm/teensy4/flexspi_nor_config.c b/boards/pjrc/teensy4/flexspi_nor_config.c similarity index 93% rename from boards/boards_legacy/arm/teensy4/flexspi_nor_config.c rename to boards/pjrc/teensy4/flexspi_nor_config.c index 6420e446bd9f740..020bf6abd57b267 100644 --- a/boards/boards_legacy/arm/teensy4/flexspi_nor_config.c +++ b/boards/pjrc/teensy4/flexspi_nor_config.c @@ -9,7 +9,7 @@ #include -#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__) @@ -41,4 +41,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 */ diff --git a/boards/boards_legacy/arm/teensy4/teensy4-pinctrl.dtsi b/boards/pjrc/teensy4/teensy4-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/teensy4/teensy4-pinctrl.dtsi rename to boards/pjrc/teensy4/teensy4-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/teensy4/teensy40.dts b/boards/pjrc/teensy4/teensy40.dts similarity index 100% rename from boards/boards_legacy/arm/teensy4/teensy40.dts rename to boards/pjrc/teensy4/teensy40.dts diff --git a/boards/boards_legacy/arm/teensy4/teensy40.yaml b/boards/pjrc/teensy4/teensy40.yaml similarity index 100% rename from boards/boards_legacy/arm/teensy4/teensy40.yaml rename to boards/pjrc/teensy4/teensy40.yaml diff --git a/boards/boards_legacy/arm/teensy4/teensy40_defconfig b/boards/pjrc/teensy4/teensy40_defconfig similarity index 79% rename from boards/boards_legacy/arm/teensy4/teensy40_defconfig rename to boards/pjrc/teensy4/teensy40_defconfig index 89b2890fbe2f84b..1d186d986c48ade 100644 --- a/boards/boards_legacy/arm/teensy4/teensy40_defconfig +++ b/boards/pjrc/teensy4/teensy40_defconfig @@ -4,10 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1062=y -CONFIG_SOC_SERIES_IMX_RT=y CONFIG_DEVICE_CONFIGURATION_DATA=n -CONFIG_BOARD_TEENSY40=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/boards_legacy/arm/teensy4/teensy41.dts b/boards/pjrc/teensy4/teensy41.dts similarity index 100% rename from boards/boards_legacy/arm/teensy4/teensy41.dts rename to boards/pjrc/teensy4/teensy41.dts diff --git a/boards/boards_legacy/arm/teensy4/teensy41.yaml b/boards/pjrc/teensy4/teensy41.yaml similarity index 100% rename from boards/boards_legacy/arm/teensy4/teensy41.yaml rename to boards/pjrc/teensy4/teensy41.yaml diff --git a/boards/boards_legacy/arm/teensy4/teensy41_defconfig b/boards/pjrc/teensy4/teensy41_defconfig similarity index 79% rename from boards/boards_legacy/arm/teensy4/teensy41_defconfig rename to boards/pjrc/teensy4/teensy41_defconfig index 018d31d009ebc89..1d186d986c48ade 100644 --- a/boards/boards_legacy/arm/teensy4/teensy41_defconfig +++ b/boards/pjrc/teensy4/teensy41_defconfig @@ -4,10 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MIMXRT1062=y -CONFIG_SOC_SERIES_IMX_RT=y CONFIG_DEVICE_CONFIGURATION_DATA=n -CONFIG_BOARD_TEENSY41=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/boards/shields/g1120b0mipi/boards/mimxrt1170_evk_cm7.overlay b/boards/shields/g1120b0mipi/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay similarity index 100% rename from boards/shields/g1120b0mipi/boards/mimxrt1170_evk_cm7.overlay rename to boards/shields/g1120b0mipi/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay diff --git a/boards/shields/g1120b0mipi/boards/mimxrt1170_evkb_cm7.overlay b/boards/shields/g1120b0mipi/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay similarity index 100% rename from boards/shields/g1120b0mipi/boards/mimxrt1170_evkb_cm7.overlay rename to boards/shields/g1120b0mipi/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay diff --git a/samples/basic/blinky_pwm/boards/mimxrt685_evk_cm33.overlay b/samples/basic/blinky_pwm/boards/mimxrt685_evk.overlay similarity index 100% rename from samples/basic/blinky_pwm/boards/mimxrt685_evk_cm33.overlay rename to samples/basic/blinky_pwm/boards/mimxrt685_evk.overlay diff --git a/samples/boards/mimxrt1170_evk_cm7/magic_addr/sample.yaml b/samples/boards/mimxrt1170_evk_cm7/magic_addr/sample.yaml index 10e876847f7310f..462a1d165e534bc 100644 --- a/samples/boards/mimxrt1170_evk_cm7/magic_addr/sample.yaml +++ b/samples/boards/mimxrt1170_evk_cm7/magic_addr/sample.yaml @@ -3,10 +3,10 @@ sample: name: magic addr common: integration_platforms: - - mimxrt1170_evk_cm7 - - mimxrt1160_evk_cm7 + - mimxrt1170_evk/mimxrt1176/cm7 + - mimxrt1160_evk/mimxrt1166/cm7 tests: sample.boards.mimxrt1170_evk.magic_addr: platform_allow: - - mimxrt1170_evk_cm7 - - mimxrt1160_evk_cm7 + - mimxrt1170_evk/mimxrt1176/cm7 + - mimxrt1160_evk/mimxrt1166/cm7 diff --git a/samples/boards/mimxrt1170_evk_cm7/magic_addr/src/main.c b/samples/boards/mimxrt1170_evk_cm7/magic_addr/src/main.c index 6856ca8f10f9d97..f44c3f23923ffde 100644 --- a/samples/boards/mimxrt1170_evk_cm7/magic_addr/src/main.c +++ b/samples/boards/mimxrt1170_evk_cm7/magic_addr/src/main.c @@ -27,7 +27,6 @@ void flexram_magic_addr_isr_cb(enum memc_flexram_interrupt_cause cause, } } - int main(void) { memc_flexram_register_callback(flexram_magic_addr_isr_cb, NULL); diff --git a/samples/drivers/adc/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay b/samples/drivers/adc/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay new file mode 100644 index 000000000000000..a27042020df4a2a --- /dev/null +++ b/samples/drivers/adc/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay @@ -0,0 +1,34 @@ +/* + * SPDX-License-Identifier: Apache-2.0 + * + * Copyright 2021,2023 NXP + */ + +#include + +/ { + zephyr,user { + /* adjust channel number according to pinmux in board.dts */ + io-channels = <&lpadc0 0>; + }; +}; + +&lpadc0 { + #address-cells = <1>; + #size-cells = <0>; + + /* + * To use this sample: + * - Connect LPADC0 CH0 signal to voltage between 0~1.8V (J9 pin 10) + */ + + channel@0 { + reg = <0>; + zephyr,gain = "ADC_GAIN_1"; + zephyr,reference = "ADC_REF_EXTERNAL0"; + zephyr,vref-mv = <1800>; + zephyr,acquisition-time = ; + zephyr,resolution = <12>; + zephyr,input-positive = ; + }; +}; diff --git a/samples/drivers/adc/boards/mimxrt1170_evk_cm7.overlay b/samples/drivers/adc/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay similarity index 100% rename from samples/drivers/adc/boards/mimxrt1170_evk_cm7.overlay rename to samples/drivers/adc/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay diff --git a/samples/drivers/adc/boards/mimxrt1170_evkb_cm7.overlay b/samples/drivers/adc/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay similarity index 100% rename from samples/drivers/adc/boards/mimxrt1170_evkb_cm7.overlay rename to samples/drivers/adc/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay diff --git a/samples/drivers/adc/boards/mimxrt685_evk_cm33.overlay b/samples/drivers/adc/boards/mimxrt685_evk.overlay similarity index 100% rename from samples/drivers/adc/boards/mimxrt685_evk_cm33.overlay rename to samples/drivers/adc/boards/mimxrt685_evk.overlay diff --git a/samples/drivers/display/boards/mimxrt1170_evk_cm7.conf b/samples/drivers/display/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf similarity index 100% rename from samples/drivers/display/boards/mimxrt1170_evk_cm7.conf rename to samples/drivers/display/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf diff --git a/samples/drivers/display/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf b/samples/drivers/display/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf new file mode 100644 index 000000000000000..072545354b964af --- /dev/null +++ b/samples/drivers/display/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf @@ -0,0 +1,7 @@ +# +# Copyright 2023, NXP +# +# SPDX-License-Identifier: Apache-2.0 +# + +CONFIG_HEAP_MEM_POOL_SIZE=4194304 diff --git a/samples/drivers/jesd216/sample.yaml b/samples/drivers/jesd216/sample.yaml index 1e0fed25d529a50..4ab18259153c73f 100644 --- a/samples/drivers/jesd216/sample.yaml +++ b/samples/drivers/jesd216/sample.yaml @@ -17,8 +17,8 @@ tests: - hifive1 - hifive_unleashed - hifive_unmatched - - mimxrt1170_evk_cm7 - - mimxrt1170_evk_cm4 + - mimxrt1170_evk/mimxrt1176/cm7 + - mimxrt1170_evk/mimxrt1176/cm4 filter: dt_compat_enabled("jedec,spi-nor") depends_on: spi sample.drivers.jesd216.nrf52840dk_spi: diff --git a/samples/drivers/led_ws2812/README.rst b/samples/drivers/led_ws2812/README.rst index 7f4b3f48f3b2fdf..bc9a79f7b53ced0 100644 --- a/samples/drivers/led_ws2812/README.rst +++ b/samples/drivers/led_ws2812/README.rst @@ -108,7 +108,6 @@ I2S driver: SPI driver: - mimxrt1050_evk -- mimxrt1050_evk_qspi - nrf52dk/nrf52832 - nucleo_f070rb - nucleo_g071rb diff --git a/samples/drivers/mbox/CMakeLists.txt b/samples/drivers/mbox/CMakeLists.txt index 4528c1ebc3756cc..e0d3be12d83c335 100644 --- a/samples/drivers/mbox/CMakeLists.txt +++ b/samples/drivers/mbox/CMakeLists.txt @@ -14,9 +14,9 @@ set(REMOTE_ZEPHYR_DIR ${CMAKE_CURRENT_BINARY_DIR}/../remote/zephyr) if(("${BOARD}" STREQUAL "nrf5340dk") OR ("${BOARD}" STREQUAL "nrf5340bsim_nrf5340_cpuapp") OR ("${BOARD}" STREQUAL "adp_xc7k") OR - ("${BOARD}" STREQUAL "mimxrt1170_evkb_cm7") OR - ("${BOARD}" STREQUAL "mimxrt1170_evk_cm7") OR - ("${BOARD}" STREQUAL "mimxrt1160_evk_cm7") OR + ("${BOARD}" STREQUAL "mimxrt1170_evkb") OR + ("${BOARD}" STREQUAL "mimxrt1170_evk") OR + ("${BOARD}" STREQUAL "mimxrt1160_evk") OR ("${BOARD}" STREQUAL "lpcxpresso55s69_cpu0")) message(STATUS "${BOARD} compile as Main in this sample") else() diff --git a/samples/drivers/mbox/Kconfig.sysbuild b/samples/drivers/mbox/Kconfig.sysbuild index 389b8875dd9dd76..bf13c9b68405fde 100644 --- a/samples/drivers/mbox/Kconfig.sysbuild +++ b/samples/drivers/mbox/Kconfig.sysbuild @@ -10,7 +10,7 @@ string default "nrf5340dk/nrf5340/cpunet" if $(BOARD) = "nrf5340dk" default "nrf5340bsim_nrf5340_cpunet" if $(BOARD) = "nrf5340bsim_nrf5340_cpuapp" default "adp_xc7k/ae350" if $(BOARD) = "adp_xc7k" - default "mimxrt1170_evkb_cm4" if $(BOARD) = "mimxrt1170_evkb_cm7" - default "mimxrt1170_evk_cm4" if $(BOARD) = "mimxrt1170_evk_cm7" - default "mimxrt1160_evk_cm4" if $(BOARD) = "mimxrt1160_evk_cm7" + default "mimxrt1170_evkb/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evkb" + default "mimxrt1170_evk/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evk" + default "mimxrt1160_evk/mimxrt1166/cm4" if $(BOARD) = "mimxrt1160_evk" default "lpcxpresso55s69_cpu1" if $(BOARD) = "lpcxpresso55s69_cpu0" diff --git a/samples/drivers/mbox/boards/mimxrt1170_evk_cm7.conf b/samples/drivers/mbox/boards/mimxrt1160_evk_mimxrt1166_cm7.conf similarity index 100% rename from samples/drivers/mbox/boards/mimxrt1170_evk_cm7.conf rename to samples/drivers/mbox/boards/mimxrt1160_evk_mimxrt1166_cm7.conf diff --git a/samples/drivers/mbox/boards/mimxrt1170_evk_cm7.overlay b/samples/drivers/mbox/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay similarity index 100% rename from samples/drivers/mbox/boards/mimxrt1170_evk_cm7.overlay rename to samples/drivers/mbox/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay diff --git a/samples/drivers/mbox_data/boards/mimxrt1170_evk_cm7.conf b/samples/drivers/mbox/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf similarity index 100% rename from samples/drivers/mbox_data/boards/mimxrt1170_evk_cm7.conf rename to samples/drivers/mbox/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf diff --git a/samples/drivers/mbox/boards/mimxrt1170_evkb_cm7.overlay b/samples/drivers/mbox/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay similarity index 100% rename from samples/drivers/mbox/boards/mimxrt1170_evkb_cm7.overlay rename to samples/drivers/mbox/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay diff --git a/samples/drivers/mbox/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf b/samples/drivers/mbox/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf new file mode 100644 index 000000000000000..0dfb100ed70476d --- /dev/null +++ b/samples/drivers/mbox/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf @@ -0,0 +1,3 @@ +CONFIG_MBOX_NXP_IMX_MU=y +CONFIG_SECOND_CORE_MCUX=y +CONFIG_INCLUDE_REMOTE_DIR=y diff --git a/samples/drivers/mbox/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay b/samples/drivers/mbox/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay new file mode 100644 index 000000000000000..942f67ba6a9d728 --- /dev/null +++ b/samples/drivers/mbox/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay @@ -0,0 +1,29 @@ +/* + * Copyright 2023 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + chosen { + /* Delete ipc chosen property where old IPM mailbox driver bellow is + * configured. + */ + /delete-property/ zephyr,ipc; + }; + + soc { + /* Delete IPM Driver node nxp,imx-mu */ + /delete-node/ mailbox@40c48000; + + /* Attach MBOX driver to MU Unit */ + mbox:mbox@40c48000 { + compatible = "nxp,mbox-imx-mu"; + reg = <0x40c48000 0x4000>; + interrupts = <118 0>; + rx-channels = <4>; + #mbox-cells = <1>; + status = "okay"; + }; + }; +}; diff --git a/samples/drivers/mbox/remote/CMakeLists.txt b/samples/drivers/mbox/remote/CMakeLists.txt index a01e3709cfcfd98..1bfaab23454add4 100644 --- a/samples/drivers/mbox/remote/CMakeLists.txt +++ b/samples/drivers/mbox/remote/CMakeLists.txt @@ -11,9 +11,9 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) if(("${BOARD}" STREQUAL "nrf5340dk") OR ("${BOARD}" STREQUAL "nrf5340bsim_nrf5340_cpunet") OR - ("${BOARD}" STREQUAL "mimxrt1170_evkb_cm4") OR - ("${BOARD}" STREQUAL "mimxrt1170_evk_cm4") OR - ("${BOARD}" STREQUAL "mimxrt1160_evk_cm4") OR + ("${BOARD}" STREQUAL "mimxrt1170_evkb") OR + ("${BOARD}" STREQUAL "mimxrt1170_evk") OR + ("${BOARD}" STREQUAL "mimxrt1160_evk") OR ("${BOARD}" STREQUAL "lpcxpresso55s69_cpu1") OR ("${BOARD}" STREQUAL "adp_xc7k")) message(STATUS "${BOARD} compile as remote in this sample") diff --git a/samples/drivers/mbox/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.conf b/samples/drivers/mbox/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.conf new file mode 100644 index 000000000000000..0d36a72aec6a916 --- /dev/null +++ b/samples/drivers/mbox/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.conf @@ -0,0 +1,4 @@ +CONFIG_MBOX_NXP_IMX_MU=y +CONFIG_BUILD_OUTPUT_INFO_HEADER=y +CONFIG_BUILD_OUTPUT_HEX=y +CONFIG_SECOND_CORE_MCUX=y diff --git a/samples/drivers/mbox/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay b/samples/drivers/mbox/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay new file mode 100644 index 000000000000000..cc05e9b96c1cbba --- /dev/null +++ b/samples/drivers/mbox/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay @@ -0,0 +1,48 @@ +/* + * Copyright 2023 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + chosen { + zephyr,flash = &ocram; + zephyr,console = &lpuart1; + zephyr,shell-uart = &lpuart1; + + /* Delete ipc chosen property where old IPM mailbox driver bellow is + * configured. + */ + /delete-property/ zephyr,ipc; + }; + + soc { + /delete-node/ gpt@400f0000; + + /* Replace GPT2 with another GPT kernel timer */ + gpt2_hw_timer:gpt@400f0000 { + compatible = "nxp,gpt-hw-timer"; + reg = <0x400f0000 0x4000>; + interrupts = <120 0>; + status = "okay"; + }; + + /* Delete IPM Driver node nxp,imx-mu */ + /delete-node/ mailbox@40c4c000; + + /* Attach MBOX driver to MU Unit */ + mbox:mbox@40c4c000 { + compatible = "nxp,mbox-imx-mu"; + reg = <0x40c4c000 0x4000>; + interrupts = <118 0>; + rx-channels = <4>; + #mbox-cells = <1>; + status = "okay"; + }; + }; +}; + +/* Disable primary GPT timer */ +&gpt_hw_timer { + status = "disabled"; +}; diff --git a/samples/drivers/mbox/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.conf b/samples/drivers/mbox/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.conf new file mode 100644 index 000000000000000..0d36a72aec6a916 --- /dev/null +++ b/samples/drivers/mbox/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.conf @@ -0,0 +1,4 @@ +CONFIG_MBOX_NXP_IMX_MU=y +CONFIG_BUILD_OUTPUT_INFO_HEADER=y +CONFIG_BUILD_OUTPUT_HEX=y +CONFIG_SECOND_CORE_MCUX=y diff --git a/samples/drivers/mbox/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay b/samples/drivers/mbox/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay new file mode 100644 index 000000000000000..cc05e9b96c1cbba --- /dev/null +++ b/samples/drivers/mbox/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay @@ -0,0 +1,48 @@ +/* + * Copyright 2023 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + chosen { + zephyr,flash = &ocram; + zephyr,console = &lpuart1; + zephyr,shell-uart = &lpuart1; + + /* Delete ipc chosen property where old IPM mailbox driver bellow is + * configured. + */ + /delete-property/ zephyr,ipc; + }; + + soc { + /delete-node/ gpt@400f0000; + + /* Replace GPT2 with another GPT kernel timer */ + gpt2_hw_timer:gpt@400f0000 { + compatible = "nxp,gpt-hw-timer"; + reg = <0x400f0000 0x4000>; + interrupts = <120 0>; + status = "okay"; + }; + + /* Delete IPM Driver node nxp,imx-mu */ + /delete-node/ mailbox@40c4c000; + + /* Attach MBOX driver to MU Unit */ + mbox:mbox@40c4c000 { + compatible = "nxp,mbox-imx-mu"; + reg = <0x40c4c000 0x4000>; + interrupts = <118 0>; + rx-channels = <4>; + #mbox-cells = <1>; + status = "okay"; + }; + }; +}; + +/* Disable primary GPT timer */ +&gpt_hw_timer { + status = "disabled"; +}; diff --git a/samples/drivers/mbox/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.conf b/samples/drivers/mbox/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.conf new file mode 100644 index 000000000000000..0d36a72aec6a916 --- /dev/null +++ b/samples/drivers/mbox/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.conf @@ -0,0 +1,4 @@ +CONFIG_MBOX_NXP_IMX_MU=y +CONFIG_BUILD_OUTPUT_INFO_HEADER=y +CONFIG_BUILD_OUTPUT_HEX=y +CONFIG_SECOND_CORE_MCUX=y diff --git a/samples/drivers/mbox/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay b/samples/drivers/mbox/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay new file mode 100644 index 000000000000000..392141712a9dec0 --- /dev/null +++ b/samples/drivers/mbox/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay @@ -0,0 +1,49 @@ +/* + * Copyright 2023 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + chosen { + zephyr,flash = &ocram; + zephyr,console = &lpuart1; + zephyr,shell-uart = &lpuart1; + + /* Delete ipc chosen property where old IPM mailbox driver bellow is + * configured. + */ + /delete-property/ zephyr,ipc; + }; + + soc { + /delete-node/ gpt@400f0000; + + /* Replace GPT2 with another GPT kernel timer */ + gpt2_hw_timer:gpt@400f0000 { + compatible = "nxp,gpt-hw-timer"; + reg = <0x400f0000 0x4000>; + interrupts = <120 0>; + status = "okay"; + }; + + /* Delete IPM Driver node nxp,imx-mu */ + /delete-node/ mailbox@40c4c000; + + /* Attach MBOX driver to MU Unit */ + mbox:mbox@40c4c000 { + compatible = "nxp,mbox-imx-mu"; + reg = <0x40c4c000 0x4000>; + interrupts = <118 0>; + rx-channels = <4>; + #mbox-cells = <1>; + status = "okay"; + }; + }; + +}; + +/* Disable primary GPT timer */ +&gpt_hw_timer { + status = "disabled"; +}; diff --git a/samples/drivers/mbox/sample.yaml b/samples/drivers/mbox/sample.yaml index 69b11af5d0a51e3..34890f279bbfc8e 100644 --- a/samples/drivers/mbox/sample.yaml +++ b/samples/drivers/mbox/sample.yaml @@ -8,9 +8,9 @@ tests: platform_allow: - nrf5340dk/nrf5340/cpuapp - adp_xc7k/ae350 - - mimxrt1170_evkb_cm7 - - mimxrt1170_evk_cm7 - - mimxrt1160_evk_cm7 + - mimxrt1170_evk@B/mimxrt1176/cm7 + - mimxrt1170_evk/mimxrt1176/cm7 + - mimxrt1160_evk/mimxrt1166/cm7 - lpcxpresso55s69_cpu0 integration_platforms: - nrf5340dk/nrf5340/cpuapp diff --git a/samples/drivers/mbox_data/CMakeLists.txt b/samples/drivers/mbox_data/CMakeLists.txt index a410ac3d214940a..6905cada0a2c9e6 100644 --- a/samples/drivers/mbox_data/CMakeLists.txt +++ b/samples/drivers/mbox_data/CMakeLists.txt @@ -9,9 +9,9 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) set(REMOTE_ZEPHYR_DIR ${CMAKE_CURRENT_BINARY_DIR}/../remote/zephyr) -if(("${BOARD}" STREQUAL "mimxrt1170_evkb_cm7") OR - ("${BOARD}" STREQUAL "mimxrt1170_evk_cm7") OR - ("${BOARD}" STREQUAL "mimxrt1160_evk_cm7") OR +if(("${BOARD}" STREQUAL "mimxrt1170_evkb") OR + ("${BOARD}" STREQUAL "mimxrt1170_evk") OR + ("${BOARD}" STREQUAL "mimxrt1160_evk") OR ("${BOARD}" STREQUAL "lpcxpresso55s69_cpu0")) message(STATUS "${BOARD} compile as Main in this sample") else() diff --git a/samples/drivers/mbox_data/Kconfig.sysbuild b/samples/drivers/mbox_data/Kconfig.sysbuild index 2ddab22817754b5..6d02e7a7a6573d5 100644 --- a/samples/drivers/mbox_data/Kconfig.sysbuild +++ b/samples/drivers/mbox_data/Kconfig.sysbuild @@ -6,7 +6,7 @@ source "share/sysbuild/Kconfig" config REMOTE_BOARD string - default "mimxrt1170_evkb_cm4" if $(BOARD) = "mimxrt1170_evkb_cm7" - default "mimxrt1170_evk_cm4" if $(BOARD) = "mimxrt1170_evk_cm7" - default "mimxrt1160_evk_cm4" if $(BOARD) = "mimxrt1160_evk_cm7" + default "mimxrt1170_evkb/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evkb" + default "mimxrt1170_evk/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evk" + default "mimxrt1160_evk/mimxrt1166/cm4" if $(BOARD) = "mimxrt1160_evk" default "lpcxpresso55s69_cpu1" if $(BOARD) = "lpcxpresso55s69_cpu0" diff --git a/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_cm7.conf b/samples/drivers/mbox_data/boards/mimxrt1160_evk_mimxrt1166_cm7.conf similarity index 100% rename from tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_cm7.conf rename to samples/drivers/mbox_data/boards/mimxrt1160_evk_mimxrt1166_cm7.conf diff --git a/samples/drivers/mbox_data/boards/mimxrt1170_evk_cm7.overlay b/samples/drivers/mbox_data/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay similarity index 100% rename from samples/drivers/mbox_data/boards/mimxrt1170_evk_cm7.overlay rename to samples/drivers/mbox_data/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay diff --git a/samples/drivers/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf b/samples/drivers/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf new file mode 100644 index 000000000000000..583b495036082b1 --- /dev/null +++ b/samples/drivers/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf @@ -0,0 +1,3 @@ +CONFIG_MBOX_NXP_IMX_MU=y +CONFIG_INCLUDE_REMOTE_DIR=y +CONFIG_SECOND_CORE_MCUX=y diff --git a/samples/drivers/mbox_data/boards/mimxrt1170_evkb_cm7.overlay b/samples/drivers/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay similarity index 100% rename from samples/drivers/mbox_data/boards/mimxrt1170_evkb_cm7.overlay rename to samples/drivers/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay diff --git a/samples/drivers/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf b/samples/drivers/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf new file mode 100644 index 000000000000000..0dfb100ed70476d --- /dev/null +++ b/samples/drivers/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf @@ -0,0 +1,3 @@ +CONFIG_MBOX_NXP_IMX_MU=y +CONFIG_SECOND_CORE_MCUX=y +CONFIG_INCLUDE_REMOTE_DIR=y diff --git a/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_cm7.overlay b/samples/drivers/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay similarity index 100% rename from tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_cm7.overlay rename to samples/drivers/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay diff --git a/samples/drivers/mbox_data/remote/CMakeLists.txt b/samples/drivers/mbox_data/remote/CMakeLists.txt index 47e1cae86284fdf..2ab94102d088fa9 100644 --- a/samples/drivers/mbox_data/remote/CMakeLists.txt +++ b/samples/drivers/mbox_data/remote/CMakeLists.txt @@ -7,9 +7,9 @@ cmake_minimum_required(VERSION 3.20.0) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) -if(("${BOARD}" STREQUAL "mimxrt1170_evkb_cm4") OR - ("${BOARD}" STREQUAL "mimxrt1170_evk_cm4") OR - ("${BOARD}" STREQUAL "mimxrt1160_evk_cm4") OR +if(("${BOARD}" STREQUAL "mimxrt1170_evkb") OR + ("${BOARD}" STREQUAL "mimxrt1170_evk") OR + ("${BOARD}" STREQUAL "mimxrt1160_evk") OR ("${BOARD}" STREQUAL "lpcxpresso55s69_cpu1")) message(STATUS "${BOARD} compile as remote in this sample") else() diff --git a/samples/drivers/mbox_data/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.conf b/samples/drivers/mbox_data/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.conf new file mode 100644 index 000000000000000..0d36a72aec6a916 --- /dev/null +++ b/samples/drivers/mbox_data/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.conf @@ -0,0 +1,4 @@ +CONFIG_MBOX_NXP_IMX_MU=y +CONFIG_BUILD_OUTPUT_INFO_HEADER=y +CONFIG_BUILD_OUTPUT_HEX=y +CONFIG_SECOND_CORE_MCUX=y diff --git a/samples/drivers/mbox_data/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay b/samples/drivers/mbox_data/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay new file mode 100644 index 000000000000000..3f6115b9c583b7d --- /dev/null +++ b/samples/drivers/mbox_data/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay @@ -0,0 +1,54 @@ +/* + * Copyright 2024 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + chosen { + zephyr,flash = &ocram; + zephyr,console = &lpuart2; + zephyr,shell-uart = &lpuart2; + + /* Delete ipc chosen property where old IPM mailbox driver bellow is + * configured. + */ + /delete-property/ zephyr,ipc; + }; + + soc { + /delete-node/ gpt@400f0000; + + /* Replace GPT2 with another GPT kernel timer */ + gpt2_hw_timer:gpt@400f0000 { + compatible = "nxp,gpt-hw-timer"; + reg = <0x400f0000 0x4000>; + interrupts = <120 0>; + status = "okay"; + }; + + /* Delete IPM Driver node nxp,imx-mu */ + /delete-node/ mailbox@40c4c000; + + /* Attach MBOX driver to MU Unit */ + mbox:mbox@40c4c000 { + compatible = "nxp,mbox-imx-mu"; + reg = <0x40c4c000 0x4000>; + interrupts = <118 0>; + rx-channels = <4>; + #mbox-cells = <1>; + status = "okay"; + }; + }; +}; + +/* Enable secondary LPUART */ +&lpuart2 { + status = "okay"; + current-speed = <115200>; +}; + +/* Disable primary GPT timer */ +&gpt_hw_timer { + status = "disabled"; +}; diff --git a/samples/drivers/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.conf b/samples/drivers/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.conf new file mode 100644 index 000000000000000..0d36a72aec6a916 --- /dev/null +++ b/samples/drivers/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.conf @@ -0,0 +1,4 @@ +CONFIG_MBOX_NXP_IMX_MU=y +CONFIG_BUILD_OUTPUT_INFO_HEADER=y +CONFIG_BUILD_OUTPUT_HEX=y +CONFIG_SECOND_CORE_MCUX=y diff --git a/samples/drivers/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay b/samples/drivers/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay new file mode 100644 index 000000000000000..3f6115b9c583b7d --- /dev/null +++ b/samples/drivers/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay @@ -0,0 +1,54 @@ +/* + * Copyright 2024 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + chosen { + zephyr,flash = &ocram; + zephyr,console = &lpuart2; + zephyr,shell-uart = &lpuart2; + + /* Delete ipc chosen property where old IPM mailbox driver bellow is + * configured. + */ + /delete-property/ zephyr,ipc; + }; + + soc { + /delete-node/ gpt@400f0000; + + /* Replace GPT2 with another GPT kernel timer */ + gpt2_hw_timer:gpt@400f0000 { + compatible = "nxp,gpt-hw-timer"; + reg = <0x400f0000 0x4000>; + interrupts = <120 0>; + status = "okay"; + }; + + /* Delete IPM Driver node nxp,imx-mu */ + /delete-node/ mailbox@40c4c000; + + /* Attach MBOX driver to MU Unit */ + mbox:mbox@40c4c000 { + compatible = "nxp,mbox-imx-mu"; + reg = <0x40c4c000 0x4000>; + interrupts = <118 0>; + rx-channels = <4>; + #mbox-cells = <1>; + status = "okay"; + }; + }; +}; + +/* Enable secondary LPUART */ +&lpuart2 { + status = "okay"; + current-speed = <115200>; +}; + +/* Disable primary GPT timer */ +&gpt_hw_timer { + status = "disabled"; +}; diff --git a/samples/drivers/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.conf b/samples/drivers/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.conf new file mode 100644 index 000000000000000..0d36a72aec6a916 --- /dev/null +++ b/samples/drivers/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.conf @@ -0,0 +1,4 @@ +CONFIG_MBOX_NXP_IMX_MU=y +CONFIG_BUILD_OUTPUT_INFO_HEADER=y +CONFIG_BUILD_OUTPUT_HEX=y +CONFIG_SECOND_CORE_MCUX=y diff --git a/samples/drivers/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay b/samples/drivers/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay new file mode 100644 index 000000000000000..e35768267025544 --- /dev/null +++ b/samples/drivers/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay @@ -0,0 +1,55 @@ +/* + * Copyright 2024 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + chosen { + zephyr,flash = &ocram; + zephyr,console = &lpuart2; + zephyr,shell-uart = &lpuart2; + + /* Delete ipc chosen property where old IPM mailbox driver bellow is + * configured. + */ + /delete-property/ zephyr,ipc; + }; + + soc { + /delete-node/ gpt@400f0000; + + /* Replace GPT2 with another GPT kernel timer */ + gpt2_hw_timer:gpt@400f0000 { + compatible = "nxp,gpt-hw-timer"; + reg = <0x400f0000 0x4000>; + interrupts = <120 0>; + status = "okay"; + }; + + /* Delete IPM Driver node nxp,imx-mu */ + /delete-node/ mailbox@40c4c000; + + /* Attach MBOX driver to MU Unit */ + mbox:mbox@40c4c000 { + compatible = "nxp,mbox-imx-mu"; + reg = <0x40c4c000 0x4000>; + interrupts = <118 0>; + rx-channels = <4>; + #mbox-cells = <1>; + status = "okay"; + }; + }; + +}; + +/* Enable secondary LPUART */ +&lpuart2 { + status = "okay"; + current-speed = <115200>; +}; + +/* Disable primary GPT timer */ +&gpt_hw_timer { + status = "disabled"; +}; diff --git a/samples/drivers/mbox_data/sample.yaml b/samples/drivers/mbox_data/sample.yaml index b4a1e23a9bcee85..277b201f1898a71 100644 --- a/samples/drivers/mbox_data/sample.yaml +++ b/samples/drivers/mbox_data/sample.yaml @@ -6,12 +6,12 @@ common: tests: sample.drivers.mbox_data.real_hw: platform_allow: - - mimxrt1170_evkb_cm7 - - mimxrt1170_evk_cm7 - - mimxrt1160_evk_cm7 + - mimxrt1170_evk@B/mimxrt1176/cm7 + - mimxrt1170_evk/mimxrt1176/cm7 + - mimxrt1160_evk/mimxrt1166/cm7 - lpcxpresso55s69_cpu0 integration_platforms: - - mimxrt1160_evk_cm7 + - mimxrt1160_evk/mimxrt1166/cm7 - lpcxpresso55s69_cpu0 harness: console harness_config: diff --git a/samples/modules/lvgl/demos/boards/mimxrt1170_evk_cm7.conf b/samples/modules/lvgl/demos/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf similarity index 100% rename from samples/modules/lvgl/demos/boards/mimxrt1170_evk_cm7.conf rename to samples/modules/lvgl/demos/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf diff --git a/samples/net/zperf/boards/mimxrt1170_evk_cm7.conf b/samples/net/zperf/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf similarity index 100% rename from samples/net/zperf/boards/mimxrt1170_evk_cm7.conf rename to samples/net/zperf/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf diff --git a/samples/net/zperf/sample.yaml b/samples/net/zperf/sample.yaml index 14adbe46c316d38..b3aa90f569f37c3 100644 --- a/samples/net/zperf/sample.yaml +++ b/samples/net/zperf/sample.yaml @@ -91,5 +91,5 @@ tests: - mimxrt1064_evk - mimxrt1024_evk - frdm_k64f - - mimxrt1170_evk_cm7 - - mimxrt1160_evk_cm7 + - mimxrt1170_evk/mimxrt1176/cm7 + - mimxrt1160_evk/mimxrt1166/cm7 diff --git a/samples/sensor/fxos8700/README.rst b/samples/sensor/fxos8700/README.rst index 1de942d80dfad9e..4d270865c1b4304 100644 --- a/samples/sensor/fxos8700/README.rst +++ b/samples/sensor/fxos8700/README.rst @@ -117,7 +117,7 @@ Sample can be built and executed for the MIMXRT685-EVK as follows: .. zephyr-app-commands:: :zephyr-app: samples/sensor/fxos8700 - :board: mimxrt685_evk_cm33 + :board: mimxrt685_evk :goals: build flash :compact: diff --git a/samples/sensor/fxos8700/boards/mimxrt1170_evk_cm7.conf b/samples/sensor/fxos8700/boards/mimxrt1160_evk_mimxrt1166_cm4.conf similarity index 100% rename from samples/sensor/fxos8700/boards/mimxrt1170_evk_cm7.conf rename to samples/sensor/fxos8700/boards/mimxrt1160_evk_mimxrt1166_cm4.conf diff --git a/samples/sensor/fxos8700/boards/mimxrt1160_evk_mimxrt1166_cm7.conf b/samples/sensor/fxos8700/boards/mimxrt1160_evk_mimxrt1166_cm7.conf new file mode 100644 index 000000000000000..16c619082c684c7 --- /dev/null +++ b/samples/sensor/fxos8700/boards/mimxrt1160_evk_mimxrt1166_cm7.conf @@ -0,0 +1,2 @@ +CONFIG_FXOS8700_TRIGGER_OWN_THREAD=n +CONFIG_FXOS8700_TRIGGER_NONE=y diff --git a/samples/sensor/fxos8700/boards/mimxrt1170_evk_mimxrt1176_cm4.conf b/samples/sensor/fxos8700/boards/mimxrt1170_evk_mimxrt1176_cm4.conf new file mode 100644 index 000000000000000..16c619082c684c7 --- /dev/null +++ b/samples/sensor/fxos8700/boards/mimxrt1170_evk_mimxrt1176_cm4.conf @@ -0,0 +1,2 @@ +CONFIG_FXOS8700_TRIGGER_OWN_THREAD=n +CONFIG_FXOS8700_TRIGGER_NONE=y diff --git a/samples/sensor/fxos8700/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf b/samples/sensor/fxos8700/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf new file mode 100644 index 000000000000000..16c619082c684c7 --- /dev/null +++ b/samples/sensor/fxos8700/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf @@ -0,0 +1,2 @@ +CONFIG_FXOS8700_TRIGGER_OWN_THREAD=n +CONFIG_FXOS8700_TRIGGER_NONE=y diff --git a/samples/sensor/fxos8700/sample.yaml b/samples/sensor/fxos8700/sample.yaml index d34b32a7d53d422..983a44e80c1e058 100644 --- a/samples/sensor/fxos8700/sample.yaml +++ b/samples/sensor/fxos8700/sample.yaml @@ -16,7 +16,7 @@ tests: - rv32m1_vega/openisa_rv32m1/ri5cy - twr_ke18f - lpcxpresso55s16 - - mimxrt685_evk_cm33 + - mimxrt685_evk - frdm_k22f - mimxrt1024_evk - mimxrt595_evk_cm33 @@ -34,7 +34,7 @@ tests: - bbc_microbit - lpcxpresso55s69_cpu0 - reel_board - - mimxrt685_evk_cm33 + - mimxrt685_evk - mimxrt595_evk_cm33 integration_platforms: - bbc_microbit diff --git a/samples/sensor/lps22hh_i3c/README.rst b/samples/sensor/lps22hh_i3c/README.rst index 1f4ff486241496a..5e8b1d4dff573b0 100644 --- a/samples/sensor/lps22hh_i3c/README.rst +++ b/samples/sensor/lps22hh_i3c/README.rst @@ -37,20 +37,20 @@ sensor (for example, the one on evaluation board STEVALMKI192-V1). resulting in the sample not being able to communicate with the sensor. -Building on mimxrt685_evk_cm33 board +Building on mimxrt685_evk board ==================================== .. zephyr-app-commands:: :zephyr-app: samples/sensor/lps22hh_i3c :host-os: unix - :board: mimxrt685_evk_cm33 + :board: mimxrt685_evk :goals: build :compact: Board Preparations ================== -mimxrt685_evk_cm33 +mimxrt685_evk ------------------ On the board :ref:`mimxrt685_evk`, the I3C pins are exposed on the J18 diff --git a/samples/sensor/lps22hh_i3c/boards/mimxrt685_evk_cm33.overlay b/samples/sensor/lps22hh_i3c/boards/mimxrt685_evk.overlay similarity index 100% rename from samples/sensor/lps22hh_i3c/boards/mimxrt685_evk_cm33.overlay rename to samples/sensor/lps22hh_i3c/boards/mimxrt685_evk.overlay diff --git a/samples/sensor/lsm6dso_i2c_on_i3c/README.rst b/samples/sensor/lsm6dso_i2c_on_i3c/README.rst index a4e42306d581fba..872d244364baf52 100644 --- a/samples/sensor/lsm6dso_i2c_on_i3c/README.rst +++ b/samples/sensor/lsm6dso_i2c_on_i3c/README.rst @@ -28,20 +28,20 @@ Building and Running This project outputs sensor data to the console. It requires an LSM6DSO sensor (for example, the one on evaluation board STEVAL-MKI196V1). -Building on mimxrt685_evk_cm33 board +Building on mimxrt685_evk board ==================================== .. zephyr-app-commands:: :zephyr-app: samples/sensor/lsm6dso_i2c_on_i3c :host-os: unix - :board: mimxrt685_evk_cm33 + :board: mimxrt685_evk :goals: build :compact: Board Preparations ================== -mimxrt685_evk_cm33 +mimxrt685_evk ------------------ On the board :ref:`mimxrt685_evk`, the I3C pins are exposed on the J18 diff --git a/samples/sensor/lsm6dso_i2c_on_i3c/boards/mimxrt685_evk_cm33.overlay b/samples/sensor/lsm6dso_i2c_on_i3c/boards/mimxrt685_evk.overlay similarity index 100% rename from samples/sensor/lsm6dso_i2c_on_i3c/boards/mimxrt685_evk_cm33.overlay rename to samples/sensor/lsm6dso_i2c_on_i3c/boards/mimxrt685_evk.overlay diff --git a/samples/sensor/mcux_acmp/boards/mimxrt1170_evk_cm7.overlay b/samples/sensor/mcux_acmp/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay similarity index 100% rename from samples/sensor/mcux_acmp/boards/mimxrt1170_evk_cm7.overlay rename to samples/sensor/mcux_acmp/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay diff --git a/samples/sensor/mcux_acmp/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay b/samples/sensor/mcux_acmp/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay new file mode 100644 index 000000000000000..b7aa1131ec7cd27 --- /dev/null +++ b/samples/sensor/mcux_acmp/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay @@ -0,0 +1,22 @@ +/* + * Copyright 2022 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +&pinctrl { + acmp1_default: acmp1_default { + group0 { + pinmux = <&iomuxc_gpio_ad_01_acmp1_in2>; + drive-strength = "high"; + bias-pull-up; + slew-rate = "fast"; + }; + }; +}; + +&acmp1 { + status = "okay"; + pinctrl-0 = <&acmp1_default>; + pinctrl-names = "default"; +}; diff --git a/samples/sensor/mcux_acmp/sample.yaml b/samples/sensor/mcux_acmp/sample.yaml index 3f47cfcd1b51c20..6c4e0bb314f1528 100644 --- a/samples/sensor/mcux_acmp/sample.yaml +++ b/samples/sensor/mcux_acmp/sample.yaml @@ -4,8 +4,8 @@ sample: common: platform_allow: - twr_ke18f - - mimxrt1170_evk_cm7 - - mimxrt1170_evk_cm4 + - mimxrt1170_evk/mimxrt1176/cm7 + - mimxrt1170_evk/mimxrt1176/cm4 integration_platforms: - twr_ke18f tags: diff --git a/samples/sensor/mcux_acmp/src/main.c b/samples/sensor/mcux_acmp/src/main.c index f6960168b8f4e69..a1475d145c0aa7a 100644 --- a/samples/sensor/mcux_acmp/src/main.c +++ b/samples/sensor/mcux_acmp/src/main.c @@ -16,7 +16,7 @@ #define ACMP_POSITIVE 5 #define ACMP_NEGATIVE 5 #define ACMP_DAC_VREF 0 -#elif (defined(CONFIG_BOARD_MIMXRT1170_EVK_CM7) || defined(CONFIG_BOARD_MIMXRT1170_EVK_CM4)) +#elif defined(CONFIG_BOARD_MIMXRT1170_EVK) #define ACMP_NODE DT_NODELABEL(acmp1) #define ACMP_POSITIVE 2 #define ACMP_NEGATIVE 7 diff --git a/samples/subsys/display/lvgl/boards/mimxrt1170_evk_cm7.conf b/samples/subsys/display/lvgl/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf similarity index 100% rename from samples/subsys/display/lvgl/boards/mimxrt1170_evk_cm7.conf rename to samples/subsys/display/lvgl/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf diff --git a/samples/subsys/display/lvgl/sample.yaml b/samples/subsys/display/lvgl/sample.yaml index 4fe2f4ac31242ef..21a8dc2b0534e06 100644 --- a/samples/subsys/display/lvgl/sample.yaml +++ b/samples/subsys/display/lvgl/sample.yaml @@ -36,10 +36,10 @@ tests: - lvgl extra_args: SHIELD="rk055hdmipi4m" platform_allow: - - mimxrt1170_evk_cm7 + - mimxrt1170_evk/mimxrt1176/cm7 - mimxrt595_evk_cm33 integration_platforms: - - mimxrt1170_evk_cm7 + - mimxrt1170_evk/mimxrt1176/cm7 sample.subsys.display.lvgl.st_b_lcd40_dsi1_mb1166: platform_allow: stm32h747i_disco/stm32h747xx/m7 extra_args: SHIELD=st_b_lcd40_dsi1_mb1166 diff --git a/samples/subsys/fs/littlefs/sample.yaml b/samples/subsys/fs/littlefs/sample.yaml index 3150fa5ee65877a..cfef9d490e3d053 100644 --- a/samples/subsys/fs/littlefs/sample.yaml +++ b/samples/subsys/fs/littlefs/sample.yaml @@ -11,13 +11,13 @@ tests: - nrf52840dk/nrf52840 - particle_xenon - disco_l475_iot1 - - mimxrt685_evk_cm33 + - mimxrt685_evk - mimxrt1060_evk - mimxrt1064_evk - qemu_x86 - native_posix - native_sim - - mimxrt1160_evk_cm7 + - mimxrt1160_evk/mimxrt1166/cm7 - lpcxpresso55s69_cpu0 - mr_canhubk3 integration_platforms: diff --git a/samples/subsys/ipc/openamp/Kconfig.sysbuild b/samples/subsys/ipc/openamp/Kconfig.sysbuild index 34934d87d6e2883..18a14b740535111 100644 --- a/samples/subsys/ipc/openamp/Kconfig.sysbuild +++ b/samples/subsys/ipc/openamp/Kconfig.sysbuild @@ -10,6 +10,6 @@ string default "lpcxpresso55s69_cpu1" if $(BOARD) = "lpcxpresso55s69_cpu0" default "mps2/an521/cpu1" if $(BOARD) = "mps2" default "v2m_musca_b1/musca_b1/ns" if $(BOARD) = "v2m_musca_b1" - default "mimxrt1170_evk_cm4" if $(BOARD) = "mimxrt1170_evk_cm7" - default "mimxrt1160_evk_cm4" if $(BOARD) = "mimxrt1160_evk_cm7" - default "mimxrt1170_evkb_cm4" if $(BOARD) = "mimxrt1170_evkb_cm7" + default "mimxrt1170_evk/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evk" + default "mimxrt1160_evk/mimxrt1166/cm4" if $(BOARD) = "mimxrt1160_evk" + default "mimxrt1170_evkb/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evkb" diff --git a/samples/subsys/ipc/openamp/boards/mimxrt1170_evk_cm7.conf b/samples/subsys/ipc/openamp/boards/mimxrt1160_evk_mimxrt1166_cm7.conf similarity index 100% rename from samples/subsys/ipc/openamp/boards/mimxrt1170_evk_cm7.conf rename to samples/subsys/ipc/openamp/boards/mimxrt1160_evk_mimxrt1166_cm7.conf diff --git a/samples/subsys/ipc/openamp/boards/mimxrt1170_evk_cm7.overlay b/samples/subsys/ipc/openamp/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay similarity index 100% rename from samples/subsys/ipc/openamp/boards/mimxrt1170_evk_cm7.overlay rename to samples/subsys/ipc/openamp/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay diff --git a/samples/subsys/ipc/openamp/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf b/samples/subsys/ipc/openamp/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf new file mode 100644 index 000000000000000..630a1933d62bd42 --- /dev/null +++ b/samples/subsys/ipc/openamp/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf @@ -0,0 +1,2 @@ +CONFIG_INCLUDE_REMOTE_DIR=y +CONFIG_SECOND_CORE_MCUX=y diff --git a/samples/subsys/ipc/openamp/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay b/samples/subsys/ipc/openamp/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay new file mode 100644 index 000000000000000..7facea692cbeac8 --- /dev/null +++ b/samples/subsys/ipc/openamp/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2022 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include + +/ { + chosen { + zephyr,ipc_shm = &ocram2_overlay; + }; + + /* OpenAMP fails with full 512K OCRAM2 memory region as shared memory. + * Define a subset of the OCRAM2 region for demo to use + * Note that shared memory must have specific MPU attributes set. + */ + ocram2_overlay: memory@202c0000{ + compatible = "zephyr,memory-region", "mmio-sram"; + reg = <0x202c0000 DT_SIZE_K(16)>; + zephyr,memory-region="OCRAM2_OVERLAY"; + zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_IO) )>; + }; +}; diff --git a/samples/subsys/ipc/openamp/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf b/samples/subsys/ipc/openamp/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf new file mode 100644 index 000000000000000..ae8dba8cc217f15 --- /dev/null +++ b/samples/subsys/ipc/openamp/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf @@ -0,0 +1,7 @@ +# +# Copyright 2023, NXP +# +# SPDX-License-Identifier: Apache-2.0 +# +CONFIG_INCLUDE_REMOTE_DIR=y +CONFIG_SECOND_CORE_MCUX=y diff --git a/samples/subsys/ipc/openamp/boards/mimxrt1170_evkb_cm7.overlay b/samples/subsys/ipc/openamp/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay similarity index 100% rename from samples/subsys/ipc/openamp/boards/mimxrt1170_evkb_cm7.overlay rename to samples/subsys/ipc/openamp/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay diff --git a/samples/subsys/ipc/openamp/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.conf b/samples/subsys/ipc/openamp/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.conf new file mode 100644 index 000000000000000..4dfc4a60b76ac74 --- /dev/null +++ b/samples/subsys/ipc/openamp/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.conf @@ -0,0 +1,3 @@ +CONFIG_BUILD_OUTPUT_INFO_HEADER=y +CONFIG_BUILD_OUTPUT_HEX=y +CONFIG_SECOND_CORE_MCUX=y diff --git a/samples/subsys/ipc/openamp/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay b/samples/subsys/ipc/openamp/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay new file mode 100644 index 000000000000000..87159192cf249ee --- /dev/null +++ b/samples/subsys/ipc/openamp/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay @@ -0,0 +1,51 @@ +/* + * Copyright 2022-2023 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include + +/ { + /* Switch to lpuart2, since primary core uses lpuart1 */ + chosen { + zephyr,flash = &ocram; + zephyr,console = &lpuart2; + zephyr,shell-uart = &lpuart2; + zephyr,ipc_shm = &ocram2_overlay; + }; + + soc { + /delete-node/ gpt@400f0000; + + /* Replace GPT2 with another GPT kernel timer */ + gpt2_hw_timer:gpt@400f0000 { + compatible = "nxp,gpt-hw-timer"; + reg = <0x400f0000 0x4000>; + interrupts = <120 0>; + status = "okay"; + }; + }; + + /* OpenAMP fails with full 512K OCRAM2 memory region as shared memory. + * Define a subset of the OCRAM2 region for demo to use + * Note that shared memory must have specific MPU attributes set + */ + ocram2_overlay: memory@202c0000 { + compatible = "zephyr,memory-region", "mmio-sram"; + reg = <0x202c0000 DT_SIZE_K(16)>; + zephyr,memory-region="OCRAM2_OVERLAY"; + zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_IO) )>; + }; +}; + +/* Enable secondary LPUART */ +&lpuart2 { + status = "okay"; + current-speed = <115200>; +}; + +/* Disable primary GPT timer */ +&gpt_hw_timer { + status = "disabled"; +}; diff --git a/samples/subsys/ipc/openamp/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.conf b/samples/subsys/ipc/openamp/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.conf new file mode 100644 index 000000000000000..4dfc4a60b76ac74 --- /dev/null +++ b/samples/subsys/ipc/openamp/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.conf @@ -0,0 +1,3 @@ +CONFIG_BUILD_OUTPUT_INFO_HEADER=y +CONFIG_BUILD_OUTPUT_HEX=y +CONFIG_SECOND_CORE_MCUX=y diff --git a/samples/subsys/ipc/openamp/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay b/samples/subsys/ipc/openamp/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay new file mode 100644 index 000000000000000..87159192cf249ee --- /dev/null +++ b/samples/subsys/ipc/openamp/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay @@ -0,0 +1,51 @@ +/* + * Copyright 2022-2023 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include + +/ { + /* Switch to lpuart2, since primary core uses lpuart1 */ + chosen { + zephyr,flash = &ocram; + zephyr,console = &lpuart2; + zephyr,shell-uart = &lpuart2; + zephyr,ipc_shm = &ocram2_overlay; + }; + + soc { + /delete-node/ gpt@400f0000; + + /* Replace GPT2 with another GPT kernel timer */ + gpt2_hw_timer:gpt@400f0000 { + compatible = "nxp,gpt-hw-timer"; + reg = <0x400f0000 0x4000>; + interrupts = <120 0>; + status = "okay"; + }; + }; + + /* OpenAMP fails with full 512K OCRAM2 memory region as shared memory. + * Define a subset of the OCRAM2 region for demo to use + * Note that shared memory must have specific MPU attributes set + */ + ocram2_overlay: memory@202c0000 { + compatible = "zephyr,memory-region", "mmio-sram"; + reg = <0x202c0000 DT_SIZE_K(16)>; + zephyr,memory-region="OCRAM2_OVERLAY"; + zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_IO) )>; + }; +}; + +/* Enable secondary LPUART */ +&lpuart2 { + status = "okay"; + current-speed = <115200>; +}; + +/* Disable primary GPT timer */ +&gpt_hw_timer { + status = "disabled"; +}; diff --git a/samples/subsys/ipc/openamp/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.conf b/samples/subsys/ipc/openamp/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.conf new file mode 100644 index 000000000000000..7b43b448c72c279 --- /dev/null +++ b/samples/subsys/ipc/openamp/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.conf @@ -0,0 +1,8 @@ +# +# Copyright 2023, NXP +# +# SPDX-License-Identifier: Apache-2.0 +# +CONFIG_BUILD_OUTPUT_INFO_HEADER=y +CONFIG_BUILD_OUTPUT_HEX=y +CONFIG_SECOND_CORE_MCUX=y diff --git a/samples/subsys/ipc/openamp/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay b/samples/subsys/ipc/openamp/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay new file mode 100644 index 000000000000000..72510d261664a0c --- /dev/null +++ b/samples/subsys/ipc/openamp/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay @@ -0,0 +1,49 @@ +/* + * Copyright 2023 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + /* Switch to lpuart2, since primary core uses lpuart1 */ + chosen { + zephyr,flash = &ocram; + zephyr,console = &lpuart2; + zephyr,shell-uart = &lpuart2; + zephyr,ipc_shm = &ocram2_overlay; + }; + + soc { + /delete-node/ gpt@400f0000; + + /* Replace GPT2 with another GPT kernel timer */ + gpt2_hw_timer:gpt@400f0000 { + compatible = "nxp,gpt-hw-timer"; + reg = <0x400f0000 0x4000>; + interrupts = <120 0>; + status = "okay"; + }; + }; + + /* OpenAMP fails with full 512K OCRAM2 memory region as shared memory. + * Define a subset of the OCRAM2 region for demo to use + * Note that shared memory must have specific MPU attributes set + */ + ocram2_overlay: memory@202c0000 { + compatible = "zephyr,memory-region", "mmio-sram"; + reg = <0x202c0000 DT_SIZE_K(16)>; + zephyr,memory-region="OCRAM2_OVERLAY"; + zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_IO) )>; + }; +}; + +/* Enable secondary LPUART */ +&lpuart2 { + status = "okay"; + current-speed = <115200>; +}; + +/* Disable primary GPT timer */ +&gpt_hw_timer { + status = "disabled"; +}; diff --git a/samples/subsys/usb/dfu/sample.yaml b/samples/subsys/usb/dfu/sample.yaml index 6ecba5a5a953168..47f0f006d6800e8 100644 --- a/samples/subsys/usb/dfu/sample.yaml +++ b/samples/subsys/usb/dfu/sample.yaml @@ -6,13 +6,13 @@ common: arch_exclude: posix platform_exclude: - mimxrt1010_evk - - mimxrt1050_evk_qspi + - mimxrt1050_evk@qspi - mimxrt1020_evk - mimxrt1015_evk - mimxrt1060_evk - sam4l_ek - mimxrt1050_evk - - mimxrt1060_evk_hyperflash + - mimxrt1060_evk@hyperflash - nucleo_f207zg - teensy40 - teensy41 diff --git a/tests/arch/arm/arm_irq_vector_table/src/arm_irq_vector_table.c b/tests/arch/arm/arm_irq_vector_table/src/arm_irq_vector_table.c index 61679107103e4da..8a1ec89eebe1e4f 100644 --- a/tests/arch/arm/arm_irq_vector_table/src/arm_irq_vector_table.c +++ b/tests/arch/arm/arm_irq_vector_table/src/arm_irq_vector_table.c @@ -184,7 +184,7 @@ vth __irq_vector_table _irq_vector_table[] = { isr0, isr1, isr2, 0, rtc_isr }; -#elif defined(CONFIG_SOC_SERIES_IMX_RT6XX) || defined(CONFIG_SOC_SERIES_IMX_RT5XX) && \ +#elif defined(CONFIG_SOC_SERIES_IMXRT6XX) || defined(CONFIG_SOC_SERIES_IMX_RT5XX) && \ defined(CONFIG_MCUX_OS_TIMER) /* MXRT685 employs a OS Event timer to implement the Kernel system * timer, instead of the ARM Cortex-M SysTick. Therefore, a pointer to @@ -197,7 +197,8 @@ vth __irq_vector_table _irq_vector_table[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, mcux_lpc_ostick_isr }; -#elif defined(CONFIG_SOC_SERIES_IMX_RT) && defined(CONFIG_MCUX_GPT_TIMER) +#elif (defined(CONFIG_SOC_SERIES_IMXRT10XX) || defined(CONFIG_SOC_SERIES_IMXRT11XX)) && \ + defined(CONFIG_MCUX_GPT_TIMER) /** MXRT parts employ a GPT timer peripheral to implement the Kernel system * timer, instead of the ARM Cortex-M Systick. Thereforce, a pointer to the * timer ISR need to be added in the custom vector table to handle @@ -210,7 +211,7 @@ vth __irq_vector_table _irq_vector_table[] = { isr0, isr1, isr2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, mcux_imx_gpt_isr }; -#elif defined(CONFIG_SOC_SERIES_IMX_RT10XX) +#elif defined(CONFIG_SOC_SERIES_IMXRT10XX) /* RT10xx GPT timer interrupt is at offset 100 */ vth __irq_vector_table _irq_vector_table[] = { isr0, isr1, isr2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -219,7 +220,7 @@ vth __irq_vector_table _irq_vector_table[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, mcux_imx_gpt_isr }; -#elif defined(CONFIG_SOC_SERIES_IMX_RT11XX) +#elif defined(CONFIG_SOC_SERIES_IMXRT11XX) /* RT11xx GPT timer interrupt is at offset 119 */ vth __irq_vector_table _irq_vector_table[] = { isr0, isr1, isr2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, diff --git a/tests/boot/test_mcuboot/testcase.yaml b/tests/boot/test_mcuboot/testcase.yaml index 5aa303c947f9220..0cd72396bd018bf 100644 --- a/tests/boot/test_mcuboot/testcase.yaml +++ b/tests/boot/test_mcuboot/testcase.yaml @@ -29,10 +29,10 @@ tests: - mimxrt1050_evk - mimxrt1060_evk - mimxrt1064_evk - - mimxrt1160_evk_cm7 - - mimxrt1170_evk_cm7 + - mimxrt1160_evk/mimxrt1166/cm7 + - mimxrt1170_evk/mimxrt1176/cm7 - mimxrt595_evk_cm33 - - mimxrt685_evk_cm33 + - mimxrt685_evk - nrf52840dk/nrf52840 integration_platforms: - frdm_k64f diff --git a/tests/drivers/adc/adc_api/boards/mimxrt1170_evk_cm7.overlay b/tests/drivers/adc/adc_api/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay similarity index 100% rename from tests/drivers/adc/adc_api/boards/mimxrt1170_evk_cm7.overlay rename to tests/drivers/adc/adc_api/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay diff --git a/tests/drivers/adc/adc_api/boards/mimxrt1170_evkb_cm7.overlay b/tests/drivers/adc/adc_api/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay similarity index 100% rename from tests/drivers/adc/adc_api/boards/mimxrt1170_evkb_cm7.overlay rename to tests/drivers/adc/adc_api/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay diff --git a/tests/drivers/adc/adc_api/boards/mimxrt685_evk_cm33.overlay b/tests/drivers/adc/adc_api/boards/mimxrt685_evk.overlay similarity index 100% rename from tests/drivers/adc/adc_api/boards/mimxrt685_evk_cm33.overlay rename to tests/drivers/adc/adc_api/boards/mimxrt685_evk.overlay diff --git a/tests/drivers/build_all/pwm/testcase.yaml b/tests/drivers/build_all/pwm/testcase.yaml index af85504ce83d948..d49f6526fa25698 100644 --- a/tests/drivers/build_all/pwm/testcase.yaml +++ b/tests/drivers/build_all/pwm/testcase.yaml @@ -23,7 +23,7 @@ tests: drivers.pwm.mcux.build: platform_allow: mimxrt1064_evk drivers.pwm.mcux.sctimer.build: - platform_allow: mimxrt685_evk_cm33 + platform_allow: mimxrt685_evk drivers.pwm.rv32m1.tpm.build: platform_allow: rv32m1_vega/openisa_rv32m1/ri5cy drivers.pwm.sifive.build: diff --git a/tests/drivers/counter/counter_basic_api/boards/mimxrt685_evk_cm33_rtc_1khz.overlay b/tests/drivers/counter/counter_basic_api/boards/mimxrt685_evk_rtc_1khz.overlay similarity index 100% rename from tests/drivers/counter/counter_basic_api/boards/mimxrt685_evk_cm33_rtc_1khz.overlay rename to tests/drivers/counter/counter_basic_api/boards/mimxrt685_evk_rtc_1khz.overlay diff --git a/tests/drivers/counter/counter_basic_api/testcase.yaml b/tests/drivers/counter/counter_basic_api/testcase.yaml index fd976e04a21351a..f4f1120fdf9501e 100644 --- a/tests/drivers/counter/counter_basic_api/testcase.yaml +++ b/tests/drivers/counter/counter_basic_api/testcase.yaml @@ -32,7 +32,7 @@ tests: - drivers - counter depends_on: counter - platform_allow: mimxrt685_evk_cm33 + platform_allow: mimxrt685_evk timeout: 400 extra_args: - DTC_OVERLAY_FILE="boards/mimxrt685_evk_cm33_rtc_1khz.overlay" + DTC_OVERLAY_FILE="boards/mimxrt685_evk_rtc_1khz.overlay" diff --git a/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_mimxrt1166_cm4.conf b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_mimxrt1166_cm4.conf new file mode 100644 index 000000000000000..cdc6eb7c7f19b87 --- /dev/null +++ b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_mimxrt1166_cm4.conf @@ -0,0 +1,3 @@ +CONFIG_CODE_DATA_RELOCATION=y +CONFIG_MEM_ATTR_HEAP=y +CONFIG_DMA_LOOP_TRANSFER_RELOCATE_SECTION="SRAM1" diff --git a/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay new file mode 100644 index 000000000000000..5e8bafa1d9b1b0d --- /dev/null +++ b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2022 Kumar Gala + * Copyright (c) 2024 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include + +&sram1 { + zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE) )>; +}; + +tst_dma0: &edma_lpsr0 { }; diff --git a/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_cm7.conf b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_mimxrt1166_cm7.conf similarity index 100% rename from tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_cm7.conf rename to tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_mimxrt1166_cm7.conf diff --git a/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_cm7.overlay b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay similarity index 100% rename from tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_cm7.overlay rename to tests/drivers/dma/chan_blen_transfer/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay diff --git a/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4.conf b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4.conf new file mode 100644 index 000000000000000..f3ceb4ecbb8a9fe --- /dev/null +++ b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4.conf @@ -0,0 +1,4 @@ +CONFIG_CODE_DATA_RELOCATION=y +CONFIG_NOCACHE_MEMORY=y +CONFIG_MEM_ATTR_HEAP=y +CONFIG_DMA_LOOP_TRANSFER_RELOCATE_SECTION="SRAM1" diff --git a/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay new file mode 100644 index 000000000000000..5e8bafa1d9b1b0d --- /dev/null +++ b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2022 Kumar Gala + * Copyright (c) 2024 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include + +&sram1 { + zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE) )>; +}; + +tst_dma0: &edma_lpsr0 { }; diff --git a/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4_B.conf b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4_B.conf new file mode 100644 index 000000000000000..cdc6eb7c7f19b87 --- /dev/null +++ b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4_B.conf @@ -0,0 +1,3 @@ +CONFIG_CODE_DATA_RELOCATION=y +CONFIG_MEM_ATTR_HEAP=y +CONFIG_DMA_LOOP_TRANSFER_RELOCATE_SECTION="SRAM1" diff --git a/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay new file mode 100644 index 000000000000000..5e8bafa1d9b1b0d --- /dev/null +++ b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2022 Kumar Gala + * Copyright (c) 2024 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include + +&sram1 { + zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE) )>; +}; + +tst_dma0: &edma_lpsr0 { }; diff --git a/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf new file mode 100644 index 000000000000000..433a67585be5775 --- /dev/null +++ b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf @@ -0,0 +1,3 @@ +CONFIG_CODE_DATA_RELOCATION=y +CONFIG_MEM_ATTR_HEAP=y +CONFIG_DMA_LOOP_TRANSFER_RELOCATE_SECTION="DTCM" diff --git a/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay new file mode 100644 index 000000000000000..82f0bbe94e899ab --- /dev/null +++ b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2022 Kumar Gala + * Copyright (c) 2024 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include + +&dtcm { + zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE) )>; +}; + +tst_dma0: &edma0 { }; diff --git a/tests/drivers/dma/chan_blen_transfer/boards/mimxrt685_evk_cm33.overlay b/tests/drivers/dma/chan_blen_transfer/boards/mimxrt685_evk.overlay similarity index 100% rename from tests/drivers/dma/chan_blen_transfer/boards/mimxrt685_evk_cm33.overlay rename to tests/drivers/dma/chan_blen_transfer/boards/mimxrt685_evk.overlay diff --git a/tests/drivers/dma/chan_link_transfer/boards/mimxrt1170_evk_cm7.overlay b/tests/drivers/dma/chan_link_transfer/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay similarity index 100% rename from tests/drivers/dma/chan_link_transfer/boards/mimxrt1170_evk_cm7.overlay rename to tests/drivers/dma/chan_link_transfer/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay diff --git a/tests/drivers/dma/chan_link_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay b/tests/drivers/dma/chan_link_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay new file mode 100644 index 000000000000000..9d2f44e723160c9 --- /dev/null +++ b/tests/drivers/dma/chan_link_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay @@ -0,0 +1,7 @@ +/* + * Copyright (c) 2022 Kumar Gala + * + * SPDX-License-Identifier: Apache-2.0 + */ + +dma0: &edma0 { }; diff --git a/tests/drivers/dma/chan_link_transfer/testcase.yaml b/tests/drivers/dma/chan_link_transfer/testcase.yaml index 930ab1067ebca9b..75a359ac05dfd24 100644 --- a/tests/drivers/dma/chan_link_transfer/testcase.yaml +++ b/tests/drivers/dma/chan_link_transfer/testcase.yaml @@ -11,8 +11,8 @@ tests: - mimxrt1050_evk - mimxrt1060_evk - mimxrt1064_evk - - mimxrt1160_evk_cm7 - - mimxrt1170_evk_cm7 + - mimxrt1160_evk/mimxrt1166/cm7 + - mimxrt1170_evk/mimxrt1176/cm7 - mimxrt1024_evk - lpcxpresso55s69_cpu0 - lpcxpresso55s36 diff --git a/tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_mimxrt1166_cm4.conf b/tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_mimxrt1166_cm4.conf new file mode 100644 index 000000000000000..cdc6eb7c7f19b87 --- /dev/null +++ b/tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_mimxrt1166_cm4.conf @@ -0,0 +1,3 @@ +CONFIG_CODE_DATA_RELOCATION=y +CONFIG_MEM_ATTR_HEAP=y +CONFIG_DMA_LOOP_TRANSFER_RELOCATE_SECTION="SRAM1" diff --git a/tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay b/tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay new file mode 100644 index 000000000000000..5e8bafa1d9b1b0d --- /dev/null +++ b/tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2022 Kumar Gala + * Copyright (c) 2024 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include + +&sram1 { + zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE) )>; +}; + +tst_dma0: &edma_lpsr0 { }; diff --git a/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_cm7.conf b/tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_mimxrt1166_cm7.conf similarity index 100% rename from tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_cm7.conf rename to tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_mimxrt1166_cm7.conf diff --git a/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_cm7.overlay b/tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay similarity index 100% rename from tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_cm7.overlay rename to tests/drivers/dma/loop_transfer/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay diff --git a/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4.conf b/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4.conf new file mode 100644 index 000000000000000..cdc6eb7c7f19b87 --- /dev/null +++ b/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4.conf @@ -0,0 +1,3 @@ +CONFIG_CODE_DATA_RELOCATION=y +CONFIG_MEM_ATTR_HEAP=y +CONFIG_DMA_LOOP_TRANSFER_RELOCATE_SECTION="SRAM1" diff --git a/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay b/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay new file mode 100644 index 000000000000000..5e8bafa1d9b1b0d --- /dev/null +++ b/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2022 Kumar Gala + * Copyright (c) 2024 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include + +&sram1 { + zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE) )>; +}; + +tst_dma0: &edma_lpsr0 { }; diff --git a/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4_B.conf b/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4_B.conf new file mode 100644 index 000000000000000..cdc6eb7c7f19b87 --- /dev/null +++ b/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4_B.conf @@ -0,0 +1,3 @@ +CONFIG_CODE_DATA_RELOCATION=y +CONFIG_MEM_ATTR_HEAP=y +CONFIG_DMA_LOOP_TRANSFER_RELOCATE_SECTION="SRAM1" diff --git a/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay b/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay new file mode 100644 index 000000000000000..5e8bafa1d9b1b0d --- /dev/null +++ b/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2022 Kumar Gala + * Copyright (c) 2024 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include + +&sram1 { + zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE) )>; +}; + +tst_dma0: &edma_lpsr0 { }; diff --git a/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf b/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf new file mode 100644 index 000000000000000..8aa11602c69fda7 --- /dev/null +++ b/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf @@ -0,0 +1,3 @@ +CONFIG_CODE_DATA_RELOCATION=y +CONFIG_MEM_ATTR_HEAP=y +CONFIG_DMA_LOOP_TRANSFER_RELOCATE_SECTION="ITCM" diff --git a/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay b/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay new file mode 100644 index 000000000000000..43b7fc3782656a6 --- /dev/null +++ b/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2022 Kumar Gala + * Copyright (c) 2024 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include + +&itcm { + zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE) )>; +}; + +tst_dma0: &edma0 { }; diff --git a/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf b/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf new file mode 100644 index 000000000000000..8aa11602c69fda7 --- /dev/null +++ b/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf @@ -0,0 +1,3 @@ +CONFIG_CODE_DATA_RELOCATION=y +CONFIG_MEM_ATTR_HEAP=y +CONFIG_DMA_LOOP_TRANSFER_RELOCATE_SECTION="ITCM" diff --git a/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evkb_cm7.overlay b/tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay similarity index 100% rename from tests/drivers/dma/loop_transfer/boards/mimxrt1170_evkb_cm7.overlay rename to tests/drivers/dma/loop_transfer/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay diff --git a/tests/drivers/dma/loop_transfer/boards/mimxrt685_evk_cm33.overlay b/tests/drivers/dma/loop_transfer/boards/mimxrt685_evk.overlay similarity index 100% rename from tests/drivers/dma/loop_transfer/boards/mimxrt685_evk_cm33.overlay rename to tests/drivers/dma/loop_transfer/boards/mimxrt685_evk.overlay diff --git a/tests/drivers/dma/scatter_gather/boards/mimxrt685_evk_cm33.overlay b/tests/drivers/dma/scatter_gather/boards/mimxrt685_evk.overlay similarity index 100% rename from tests/drivers/dma/scatter_gather/boards/mimxrt685_evk_cm33.overlay rename to tests/drivers/dma/scatter_gather/boards/mimxrt685_evk.overlay diff --git a/tests/drivers/gpio/gpio_basic_api/boards/mimxrt685_evk_cm33.overlay b/tests/drivers/gpio/gpio_basic_api/boards/mimxrt685_evk.overlay similarity index 100% rename from tests/drivers/gpio/gpio_basic_api/boards/mimxrt685_evk_cm33.overlay rename to tests/drivers/gpio/gpio_basic_api/boards/mimxrt685_evk.overlay diff --git a/tests/drivers/i2c/i2c_target_api/boards/mimxrt1170_evkb_cm7.overlay b/tests/drivers/i2c/i2c_target_api/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay similarity index 100% rename from tests/drivers/i2c/i2c_target_api/boards/mimxrt1170_evkb_cm7.overlay rename to tests/drivers/i2c/i2c_target_api/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay diff --git a/tests/drivers/i2c/i2c_target_api/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay b/tests/drivers/i2c/i2c_target_api/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay new file mode 100644 index 000000000000000..4e17adc5dce5b86 --- /dev/null +++ b/tests/drivers/i2c/i2c_target_api/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay @@ -0,0 +1,25 @@ +/* + * Copyright 2023 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +/* To test this sample, connect J26.12 <-> J10.20 and J26.10 <-> J10.18 */ + +&lpi2c1 { + status = "okay"; + eeprom0: eeprom@54 { + compatible = "zephyr,i2c-target-eeprom"; + reg = <0x54>; + size = <1024>; + }; +}; + +&lpi2c5 { + status = "okay"; + eeprom1: eeprom@56 { + compatible = "zephyr,i2c-target-eeprom"; + reg = <0x56>; + size = <1024>; + }; +}; diff --git a/tests/drivers/i2s/i2s_api/boards/mimxrt1170_evk_cm7.overlay b/tests/drivers/i2s/i2s_api/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay similarity index 100% rename from tests/drivers/i2s/i2s_api/boards/mimxrt1170_evk_cm7.overlay rename to tests/drivers/i2s/i2s_api/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay diff --git a/tests/drivers/i2s/i2s_api/boards/mimxrt685_evk_cm33.overlay b/tests/drivers/i2s/i2s_api/boards/mimxrt685_evk.overlay similarity index 100% rename from tests/drivers/i2s/i2s_api/boards/mimxrt685_evk_cm33.overlay rename to tests/drivers/i2s/i2s_api/boards/mimxrt685_evk.overlay diff --git a/tests/drivers/i2s/i2s_api/testcase.yaml b/tests/drivers/i2s/i2s_api/testcase.yaml index 5d8b66e29ac7f3e..1fc62a059c9ca5a 100644 --- a/tests/drivers/i2s/i2s_api/testcase.yaml +++ b/tests/drivers/i2s/i2s_api/testcase.yaml @@ -7,7 +7,7 @@ tests: filter: not CONFIG_I2S_TEST_USE_GPIO_LOOPBACK platform_exclude: - mimxrt595_evk_cm33 - - mimxrt685_evk_cm33 + - mimxrt685_evk drivers.i2s.gpio_loopback: depends_on: - i2s @@ -18,7 +18,7 @@ tests: filter: CONFIG_I2S_TEST_USE_GPIO_LOOPBACK harness: ztest platform_exclude: - - mimxrt595_evk_cm33 - - mimxrt685_evk_cm33 + - mimxrt595_evk + - mimxrt685_evk harness_config: fixture: gpio_loopback diff --git a/tests/drivers/i2s/i2s_speed/boards/mimxrt1170_evk_cm7.conf b/tests/drivers/i2s/i2s_speed/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf similarity index 100% rename from tests/drivers/i2s/i2s_speed/boards/mimxrt1170_evk_cm7.conf rename to tests/drivers/i2s/i2s_speed/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf diff --git a/tests/drivers/i2s/i2s_speed/boards/mimxrt1170_evk_cm7.overlay b/tests/drivers/i2s/i2s_speed/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay similarity index 100% rename from tests/drivers/i2s/i2s_speed/boards/mimxrt1170_evk_cm7.overlay rename to tests/drivers/i2s/i2s_speed/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay diff --git a/tests/drivers/i2s/i2s_speed/boards/mimxrt1170_evk_rt1176_cm7.conf b/tests/drivers/i2s/i2s_speed/boards/mimxrt1170_evk_rt1176_cm7.conf new file mode 100644 index 000000000000000..9473f58b112c52c --- /dev/null +++ b/tests/drivers/i2s/i2s_speed/boards/mimxrt1170_evk_rt1176_cm7.conf @@ -0,0 +1,25 @@ +# +# Copyright (c) 2021, NXP +# +# SPDX-License-Identifier: Apache-2.0 +# + +# SAI peripheral does not have loopback mode. Use 2 SAI peripherals connected +# together externally. +CONFIG_I2S_TEST_SEPARATE_DEVICES=y + +# CONFIG_DMA_TCD_QUEUE_SIZE sets size of queue used to chain DMA blocks (TCDs) +# together, and should be sized as needed by the application. If not large +# enough, the DMA may starve. Symptoms of this issue include transmit blocks +# repeated, or RX blocks skipped. For I2S driver, queue size must be at least 3. +CONFIG_DMA_TCD_QUEUE_SIZE=4 + +# Repeat test continually to help find intermittent issues +CONFIG_ZTEST_RETEST_IF_PASSED=y + +# I2S and DMA logging can occur in interrupt context, and interfere with I2S +# stream timing. If using either logging, set logging to deferred +# CONFIG_LOG_MODE_DEFERRED=y + +CONFIG_DMA_LOG_LEVEL_OFF=y +CONFIG_I2S_LOG_LEVEL_OFF=y diff --git a/tests/drivers/i2s/i2s_speed/boards/mimxrt685_evk_cm33.overlay b/tests/drivers/i2s/i2s_speed/boards/mimxrt685_evk.overlay similarity index 100% rename from tests/drivers/i2s/i2s_speed/boards/mimxrt685_evk_cm33.overlay rename to tests/drivers/i2s/i2s_speed/boards/mimxrt685_evk.overlay diff --git a/tests/drivers/mbox/mbox_data/CMakeLists.txt b/tests/drivers/mbox/mbox_data/CMakeLists.txt index a410ac3d214940a..6905cada0a2c9e6 100644 --- a/tests/drivers/mbox/mbox_data/CMakeLists.txt +++ b/tests/drivers/mbox/mbox_data/CMakeLists.txt @@ -9,9 +9,9 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) set(REMOTE_ZEPHYR_DIR ${CMAKE_CURRENT_BINARY_DIR}/../remote/zephyr) -if(("${BOARD}" STREQUAL "mimxrt1170_evkb_cm7") OR - ("${BOARD}" STREQUAL "mimxrt1170_evk_cm7") OR - ("${BOARD}" STREQUAL "mimxrt1160_evk_cm7") OR +if(("${BOARD}" STREQUAL "mimxrt1170_evkb") OR + ("${BOARD}" STREQUAL "mimxrt1170_evk") OR + ("${BOARD}" STREQUAL "mimxrt1160_evk") OR ("${BOARD}" STREQUAL "lpcxpresso55s69_cpu0")) message(STATUS "${BOARD} compile as Main in this sample") else() diff --git a/tests/drivers/mbox/mbox_data/Kconfig.sysbuild b/tests/drivers/mbox/mbox_data/Kconfig.sysbuild index 2ddab22817754b5..6d02e7a7a6573d5 100644 --- a/tests/drivers/mbox/mbox_data/Kconfig.sysbuild +++ b/tests/drivers/mbox/mbox_data/Kconfig.sysbuild @@ -6,7 +6,7 @@ source "share/sysbuild/Kconfig" config REMOTE_BOARD string - default "mimxrt1170_evkb_cm4" if $(BOARD) = "mimxrt1170_evkb_cm7" - default "mimxrt1170_evk_cm4" if $(BOARD) = "mimxrt1170_evk_cm7" - default "mimxrt1160_evk_cm4" if $(BOARD) = "mimxrt1160_evk_cm7" + default "mimxrt1170_evkb/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evkb" + default "mimxrt1170_evk/mimxrt1176/cm4" if $(BOARD) = "mimxrt1170_evk" + default "mimxrt1160_evk/mimxrt1166/cm4" if $(BOARD) = "mimxrt1160_evk" default "lpcxpresso55s69_cpu1" if $(BOARD) = "lpcxpresso55s69_cpu0" diff --git a/tests/drivers/mbox/mbox_data/boards/mimxrt1160_evk_mimxrt1166_cm7.conf b/tests/drivers/mbox/mbox_data/boards/mimxrt1160_evk_mimxrt1166_cm7.conf new file mode 100644 index 000000000000000..583b495036082b1 --- /dev/null +++ b/tests/drivers/mbox/mbox_data/boards/mimxrt1160_evk_mimxrt1166_cm7.conf @@ -0,0 +1,3 @@ +CONFIG_MBOX_NXP_IMX_MU=y +CONFIG_INCLUDE_REMOTE_DIR=y +CONFIG_SECOND_CORE_MCUX=y diff --git a/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evkb_cm7.overlay b/tests/drivers/mbox/mbox_data/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay similarity index 100% rename from tests/drivers/mbox/mbox_data/boards/mimxrt1170_evkb_cm7.overlay rename to tests/drivers/mbox/mbox_data/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay diff --git a/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf b/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf new file mode 100644 index 000000000000000..583b495036082b1 --- /dev/null +++ b/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf @@ -0,0 +1,3 @@ +CONFIG_MBOX_NXP_IMX_MU=y +CONFIG_INCLUDE_REMOTE_DIR=y +CONFIG_SECOND_CORE_MCUX=y diff --git a/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay b/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay new file mode 100644 index 000000000000000..870b9928faf9e2d --- /dev/null +++ b/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay @@ -0,0 +1,29 @@ +/* + * Copyright 2024 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + chosen { + /* Delete ipc chosen property where old IPM mailbox driver bellow is + * configured. + */ + /delete-property/ zephyr,ipc; + }; + + soc { + /* Delete IPM Driver node nxp,imx-mu */ + /delete-node/ mailbox@40c48000; + + /* Attach MBOX driver to MU Unit */ + mbox:mbox@40c48000 { + compatible = "nxp,mbox-imx-mu"; + reg = <0x40c48000 0x4000>; + interrupts = <118 0>; + rx-channels = <4>; + #mbox-cells = <1>; + status = "okay"; + }; + }; +}; diff --git a/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf b/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf new file mode 100644 index 000000000000000..0dfb100ed70476d --- /dev/null +++ b/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf @@ -0,0 +1,3 @@ +CONFIG_MBOX_NXP_IMX_MU=y +CONFIG_SECOND_CORE_MCUX=y +CONFIG_INCLUDE_REMOTE_DIR=y diff --git a/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay b/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay new file mode 100644 index 000000000000000..870b9928faf9e2d --- /dev/null +++ b/tests/drivers/mbox/mbox_data/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay @@ -0,0 +1,29 @@ +/* + * Copyright 2024 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + chosen { + /* Delete ipc chosen property where old IPM mailbox driver bellow is + * configured. + */ + /delete-property/ zephyr,ipc; + }; + + soc { + /* Delete IPM Driver node nxp,imx-mu */ + /delete-node/ mailbox@40c48000; + + /* Attach MBOX driver to MU Unit */ + mbox:mbox@40c48000 { + compatible = "nxp,mbox-imx-mu"; + reg = <0x40c48000 0x4000>; + interrupts = <118 0>; + rx-channels = <4>; + #mbox-cells = <1>; + status = "okay"; + }; + }; +}; diff --git a/tests/drivers/mbox/mbox_data/remote/CMakeLists.txt b/tests/drivers/mbox/mbox_data/remote/CMakeLists.txt index 47e1cae86284fdf..2ab94102d088fa9 100644 --- a/tests/drivers/mbox/mbox_data/remote/CMakeLists.txt +++ b/tests/drivers/mbox/mbox_data/remote/CMakeLists.txt @@ -7,9 +7,9 @@ cmake_minimum_required(VERSION 3.20.0) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) -if(("${BOARD}" STREQUAL "mimxrt1170_evkb_cm4") OR - ("${BOARD}" STREQUAL "mimxrt1170_evk_cm4") OR - ("${BOARD}" STREQUAL "mimxrt1160_evk_cm4") OR +if(("${BOARD}" STREQUAL "mimxrt1170_evkb") OR + ("${BOARD}" STREQUAL "mimxrt1170_evk") OR + ("${BOARD}" STREQUAL "mimxrt1160_evk") OR ("${BOARD}" STREQUAL "lpcxpresso55s69_cpu1")) message(STATUS "${BOARD} compile as remote in this sample") else() diff --git a/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.conf b/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.conf new file mode 100644 index 000000000000000..0d36a72aec6a916 --- /dev/null +++ b/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.conf @@ -0,0 +1,4 @@ +CONFIG_MBOX_NXP_IMX_MU=y +CONFIG_BUILD_OUTPUT_INFO_HEADER=y +CONFIG_BUILD_OUTPUT_HEX=y +CONFIG_SECOND_CORE_MCUX=y diff --git a/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay b/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay new file mode 100644 index 000000000000000..3f6115b9c583b7d --- /dev/null +++ b/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay @@ -0,0 +1,54 @@ +/* + * Copyright 2024 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + chosen { + zephyr,flash = &ocram; + zephyr,console = &lpuart2; + zephyr,shell-uart = &lpuart2; + + /* Delete ipc chosen property where old IPM mailbox driver bellow is + * configured. + */ + /delete-property/ zephyr,ipc; + }; + + soc { + /delete-node/ gpt@400f0000; + + /* Replace GPT2 with another GPT kernel timer */ + gpt2_hw_timer:gpt@400f0000 { + compatible = "nxp,gpt-hw-timer"; + reg = <0x400f0000 0x4000>; + interrupts = <120 0>; + status = "okay"; + }; + + /* Delete IPM Driver node nxp,imx-mu */ + /delete-node/ mailbox@40c4c000; + + /* Attach MBOX driver to MU Unit */ + mbox:mbox@40c4c000 { + compatible = "nxp,mbox-imx-mu"; + reg = <0x40c4c000 0x4000>; + interrupts = <118 0>; + rx-channels = <4>; + #mbox-cells = <1>; + status = "okay"; + }; + }; +}; + +/* Enable secondary LPUART */ +&lpuart2 { + status = "okay"; + current-speed = <115200>; +}; + +/* Disable primary GPT timer */ +&gpt_hw_timer { + status = "disabled"; +}; diff --git a/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.conf b/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.conf new file mode 100644 index 000000000000000..0d36a72aec6a916 --- /dev/null +++ b/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.conf @@ -0,0 +1,4 @@ +CONFIG_MBOX_NXP_IMX_MU=y +CONFIG_BUILD_OUTPUT_INFO_HEADER=y +CONFIG_BUILD_OUTPUT_HEX=y +CONFIG_SECOND_CORE_MCUX=y diff --git a/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay b/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay new file mode 100644 index 000000000000000..3f6115b9c583b7d --- /dev/null +++ b/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay @@ -0,0 +1,54 @@ +/* + * Copyright 2024 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + chosen { + zephyr,flash = &ocram; + zephyr,console = &lpuart2; + zephyr,shell-uart = &lpuart2; + + /* Delete ipc chosen property where old IPM mailbox driver bellow is + * configured. + */ + /delete-property/ zephyr,ipc; + }; + + soc { + /delete-node/ gpt@400f0000; + + /* Replace GPT2 with another GPT kernel timer */ + gpt2_hw_timer:gpt@400f0000 { + compatible = "nxp,gpt-hw-timer"; + reg = <0x400f0000 0x4000>; + interrupts = <120 0>; + status = "okay"; + }; + + /* Delete IPM Driver node nxp,imx-mu */ + /delete-node/ mailbox@40c4c000; + + /* Attach MBOX driver to MU Unit */ + mbox:mbox@40c4c000 { + compatible = "nxp,mbox-imx-mu"; + reg = <0x40c4c000 0x4000>; + interrupts = <118 0>; + rx-channels = <4>; + #mbox-cells = <1>; + status = "okay"; + }; + }; +}; + +/* Enable secondary LPUART */ +&lpuart2 { + status = "okay"; + current-speed = <115200>; +}; + +/* Disable primary GPT timer */ +&gpt_hw_timer { + status = "disabled"; +}; diff --git a/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.conf b/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.conf new file mode 100644 index 000000000000000..0d36a72aec6a916 --- /dev/null +++ b/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.conf @@ -0,0 +1,4 @@ +CONFIG_MBOX_NXP_IMX_MU=y +CONFIG_BUILD_OUTPUT_INFO_HEADER=y +CONFIG_BUILD_OUTPUT_HEX=y +CONFIG_SECOND_CORE_MCUX=y diff --git a/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay b/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay new file mode 100644 index 000000000000000..e35768267025544 --- /dev/null +++ b/tests/drivers/mbox/mbox_data/remote/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay @@ -0,0 +1,55 @@ +/* + * Copyright 2024 NXP + * + * SPDX-License-Identifier: Apache-2.0 + */ + +/ { + chosen { + zephyr,flash = &ocram; + zephyr,console = &lpuart2; + zephyr,shell-uart = &lpuart2; + + /* Delete ipc chosen property where old IPM mailbox driver bellow is + * configured. + */ + /delete-property/ zephyr,ipc; + }; + + soc { + /delete-node/ gpt@400f0000; + + /* Replace GPT2 with another GPT kernel timer */ + gpt2_hw_timer:gpt@400f0000 { + compatible = "nxp,gpt-hw-timer"; + reg = <0x400f0000 0x4000>; + interrupts = <120 0>; + status = "okay"; + }; + + /* Delete IPM Driver node nxp,imx-mu */ + /delete-node/ mailbox@40c4c000; + + /* Attach MBOX driver to MU Unit */ + mbox:mbox@40c4c000 { + compatible = "nxp,mbox-imx-mu"; + reg = <0x40c4c000 0x4000>; + interrupts = <118 0>; + rx-channels = <4>; + #mbox-cells = <1>; + status = "okay"; + }; + }; + +}; + +/* Enable secondary LPUART */ +&lpuart2 { + status = "okay"; + current-speed = <115200>; +}; + +/* Disable primary GPT timer */ +&gpt_hw_timer { + status = "disabled"; +}; diff --git a/tests/drivers/mbox/mbox_data/sysbuild.cmake b/tests/drivers/mbox/mbox_data/sysbuild.cmake index 5c536a6229aaadf..91ee9bf4b6bbc6c 100644 --- a/tests/drivers/mbox/mbox_data/sysbuild.cmake +++ b/tests/drivers/mbox/mbox_data/sysbuild.cmake @@ -16,9 +16,9 @@ ExternalZephyrProject_Add( BOARD ${SB_CONFIG_REMOTE_BOARD} ) -if ("${BOARD}" STREQUAL "mimxrt1170_evkb_cm7" OR - "${BOARD}" STREQUAL "mimxrt1170_evk_cm7" OR - "${BOARD}" STREQUAL "mimxrt1160_evk_cm7" +if ("${BOARD}" STREQUAL "mimxrt1170_evkb" OR + "${BOARD}" STREQUAL "mimxrt1170_evk" OR + "${BOARD}" STREQUAL "mimxrt1160_evk" ) # For these NXP boards the main core application is dependent on # 'zephyr_image_info.h' generated by remote application. diff --git a/tests/drivers/mbox/mbox_data/testcase.yaml b/tests/drivers/mbox/mbox_data/testcase.yaml index 72aff63ac3ac085..667c35bb8fa8f56 100644 --- a/tests/drivers/mbox/mbox_data/testcase.yaml +++ b/tests/drivers/mbox/mbox_data/testcase.yaml @@ -5,10 +5,10 @@ tests: - mbox sysbuild: true platform_allow: - - mimxrt1170_evkb_cm7 - - mimxrt1170_evk_cm7 - - mimxrt1160_evk_cm7 + - mimxrt1170_evk@B/mimxrt1176/cm7 + - mimxrt1170_evk/mimxrt1176/cm7 + - mimxrt1160_evk/mimxrt1166/cm7 - lpcxpresso55s69_cpu0 integration_platforms: - - mimxrt1170_evkb_cm7 + - mimxrt1170_evk@B/mimxrt1176/cm7 - lpcxpresso55s69_cpu0 diff --git a/tests/drivers/regulator/voltage/boards/mimxrt685_evk_cm33.overlay b/tests/drivers/regulator/voltage/boards/mimxrt685_evk.overlay similarity index 100% rename from tests/drivers/regulator/voltage/boards/mimxrt685_evk_cm33.overlay rename to tests/drivers/regulator/voltage/boards/mimxrt685_evk.overlay diff --git a/tests/drivers/regulator/voltage/testcase.yaml b/tests/drivers/regulator/voltage/testcase.yaml index 58e51b8094ef5f4..19dac31742124ab 100644 --- a/tests/drivers/regulator/voltage/testcase.yaml +++ b/tests/drivers/regulator/voltage/testcase.yaml @@ -17,7 +17,7 @@ tests: fixture: npm6001_ek_to_adc drivers.regulator.voltage.nxp: platform_allow: - - mimxrt685_evk_cm33 + - mimxrt685_evk - lpcxpresso55s36 harness_config: fixture: gpio_loopback diff --git a/tests/drivers/spi/spi_loopback/boards/mimxrt1170_evkb_cm4.overlay b/tests/drivers/spi/spi_loopback/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay similarity index 100% rename from tests/drivers/spi/spi_loopback/boards/mimxrt1170_evkb_cm4.overlay rename to tests/drivers/spi/spi_loopback/boards/mimxrt1170_evk_mimxrt1176_cm4_B.overlay diff --git a/tests/drivers/spi/spi_loopback/boards/mimxrt1170_evk_cm7.conf b/tests/drivers/spi/spi_loopback/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf similarity index 100% rename from tests/drivers/spi/spi_loopback/boards/mimxrt1170_evk_cm7.conf rename to tests/drivers/spi/spi_loopback/boards/mimxrt1170_evk_mimxrt1176_cm7_A.conf diff --git a/tests/drivers/spi/spi_loopback/boards/mimxrt1170_evk_cm7.overlay b/tests/drivers/spi/spi_loopback/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay similarity index 100% rename from tests/drivers/spi/spi_loopback/boards/mimxrt1170_evk_cm7.overlay rename to tests/drivers/spi/spi_loopback/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay diff --git a/tests/drivers/spi/spi_loopback/boards/mimxrt1170_evkb_cm7.overlay b/tests/drivers/spi/spi_loopback/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay similarity index 100% rename from tests/drivers/spi/spi_loopback/boards/mimxrt1170_evkb_cm7.overlay rename to tests/drivers/spi/spi_loopback/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay diff --git a/tests/drivers/spi/spi_loopback/boards/mimxrt685_evk_cm33.overlay b/tests/drivers/spi/spi_loopback/boards/mimxrt685_evk.overlay similarity index 100% rename from tests/drivers/spi/spi_loopback/boards/mimxrt685_evk_cm33.overlay rename to tests/drivers/spi/spi_loopback/boards/mimxrt685_evk.overlay diff --git a/tests/drivers/spi/spi_loopback/testcase.yaml b/tests/drivers/spi/spi_loopback/testcase.yaml index f75033a37510253..bb2e69961f64dee 100644 --- a/tests/drivers/spi/spi_loopback/testcase.yaml +++ b/tests/drivers/spi/spi_loopback/testcase.yaml @@ -32,8 +32,8 @@ tests: - CONFIG_SPI_RTIO=y platform_allow: - robokit1 - - mimxrt1170_evk_cm7 - - vmu_rt1170 + - mimxrt1170_evk/mimxrt1176/cm7 + - vmu_rt1170/mimxrt1176/cm7 drivers.spi.mcux_dspi_dma.loopback: extra_args: - OVERLAY_CONFIG="overlay-mcux-dspi-dma.conf" diff --git a/tests/drivers/uart/uart_async_api/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay b/tests/drivers/uart/uart_async_api/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay new file mode 100644 index 000000000000000..4f031193d15229d --- /dev/null +++ b/tests/drivers/uart/uart_async_api/boards/mimxrt1160_evk_mimxrt1166_cm4.overlay @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: Apache-2.0 */ + +dut: &lpuart2 { + status = "okay"; + current-speed = <115200>; + nxp,loopback; +}; diff --git a/tests/drivers/uart/uart_async_api/boards/mimxrt1170_evk_cm7.overlay b/tests/drivers/uart/uart_async_api/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay similarity index 100% rename from tests/drivers/uart/uart_async_api/boards/mimxrt1170_evk_cm7.overlay rename to tests/drivers/uart/uart_async_api/boards/mimxrt1160_evk_mimxrt1166_cm7.overlay diff --git a/tests/drivers/uart/uart_async_api/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay b/tests/drivers/uart/uart_async_api/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay new file mode 100644 index 000000000000000..4f031193d15229d --- /dev/null +++ b/tests/drivers/uart/uart_async_api/boards/mimxrt1170_evk_mimxrt1176_cm4.overlay @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: Apache-2.0 */ + +dut: &lpuart2 { + status = "okay"; + current-speed = <115200>; + nxp,loopback; +}; diff --git a/tests/drivers/uart/uart_async_api/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay b/tests/drivers/uart/uart_async_api/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay new file mode 100644 index 000000000000000..37f2577dc2a0e2b --- /dev/null +++ b/tests/drivers/uart/uart_async_api/boards/mimxrt1170_evk_mimxrt1176_cm7_A.overlay @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: Apache-2.0 */ + +/ { + chosen { + zephyr,sram = &dtcm; + }; +}; + +dut: &lpuart2 { + status = "okay"; + current-speed = <115200>; + nxp,loopback; +}; diff --git a/tests/drivers/uart/uart_async_api/boards/mimxrt685_evk_cm33.overlay b/tests/drivers/uart/uart_async_api/boards/mimxrt685_evk.overlay similarity index 100% rename from tests/drivers/uart/uart_async_api/boards/mimxrt685_evk_cm33.overlay rename to tests/drivers/uart/uart_async_api/boards/mimxrt685_evk.overlay diff --git a/tests/drivers/watchdog/wdt_basic_api/testcase.yaml b/tests/drivers/watchdog/wdt_basic_api/testcase.yaml index ac2e6b257f4398d..de623c6e7b2e16c 100644 --- a/tests/drivers/watchdog/wdt_basic_api/testcase.yaml +++ b/tests/drivers/watchdog/wdt_basic_api/testcase.yaml @@ -8,7 +8,7 @@ tests: filter: > not (CONFIG_WDT_SAM or dt_compat_enabled("st,stm32-window-watchdog") or dt_compat_enabled("st,stm32-watchdog") or CONFIG_SOC_FAMILY_LPC or - CONFIG_SOC_SERIES_IMX_RT6XX or CONFIG_SOC_SERIES_IMX_RT5XX or + CONFIG_SOC_SERIES_IMXRT6XX or CONFIG_SOC_SERIES_IMX_RT5XX or CONFIG_SOC_FAMILY_GD_GD32 or SOC_SERIES_GD32VF103) platform_exclude: - mec15xxevb_assy6853 diff --git a/tests/kernel/mem_protect/userspace/boards/mimxrt685_evk_cm33.overlay b/tests/kernel/mem_protect/userspace/boards/mimxrt685_evk.overlay similarity index 100% rename from tests/kernel/mem_protect/userspace/boards/mimxrt685_evk_cm33.overlay rename to tests/kernel/mem_protect/userspace/boards/mimxrt685_evk.overlay diff --git a/tests/net/socket/socketpair/testcase.yaml b/tests/net/socket/socketpair/testcase.yaml index 5410f9383765ac2..bb906c29d0c4222 100644 --- a/tests/net/socket/socketpair/testcase.yaml +++ b/tests/net/socket/socketpair/testcase.yaml @@ -7,17 +7,17 @@ common: min_ram: 21 tests: net.socket.socketpair: - platform_exclude: vmu_rt1170 mimxrt1160_evk_cm7 # See #61246 + platform_exclude: vmu_rt1170/mimxrt1176/cm7 mimxrt1160_evk/mimxrt1166/cm7 # See #61246 net.socket.socketpair.newlib: filter: CONFIG_FULL_LIBC_SUPPORTED extra_configs: - CONFIG_REQUIRES_FULL_LIBC=y - platform_exclude: vmu_rt1170 mimxrt1160_evk_cm7 # See #61246 + platform_exclude: vmu_rt1170/mimxrt1176/cm7 mimxrt1160_evk/mimxrt1166/cm7 # See #61246 net.socket.socketpair.picolibc: filter: CONFIG_PICOLIBC_SUPPORTED extra_configs: - CONFIG_PICOLIBC=y - platform_exclude: vmu_rt1170 mimxrt1160_evk_cm7 # See #61246 + platform_exclude: vmu_rt1170/mimxrt1176/cm7 mimxrt1160_evk/mimxrt1166/cm7 # See #61246 net.socket.socketpair.high_mem: min_ram: 64 extra_configs: @@ -25,4 +25,4 @@ tests: # fail due to insufficient memory. So, use high buffer sizes. - CONFIG_NET_SOCKETPAIR_BUFFER_SIZE=4096 - CONFIG_HEAP_MEM_POOL_SIZE=32768 - platform_exclude: vmu_rt1170 mimxrt1160_evk_cm7 # See #61246 + platform_exclude: vmu_rt1170/mimxrt1176/cm7 mimxrt1160_evk/mimxrt1166/cm7 # See #61246 diff --git a/tests/net/socket/tls/testcase.yaml b/tests/net/socket/tls/testcase.yaml index 877b05cc2b97128..00a126769c7e7a8 100644 --- a/tests/net/socket/tls/testcase.yaml +++ b/tests/net/socket/tls/testcase.yaml @@ -9,7 +9,7 @@ common: filter: CONFIG_FULL_LIBC_SUPPORTED integration_platforms: - qemu_x86 - platform_exclude: vmu_rt1170 # See #61129 + platform_exclude: vmu_rt1170/mimxrt1176/cm7 # See #61129 tests: net.socket.tls: extra_configs: