boards: colibri_imx7d: port to HWMv2

Port Colibri iMX7D board to HWMv2. This port only supports the M4 core
of the iMX7D SOC.

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

boards/boards_legacy/arm/colibri_imx7d_m4/Kconfig.board

@@ -1,9 +0,0 @@
-# Colibri iMX7D M4 board
-
-# Copyright (c) 2017, NXP
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_COLIBRI_IMX7D_M4
-	bool "Toradex Colibri iMX7 Dual"
-	depends on SOC_SERIES_IMX7_M4
-	select SOC_PART_NUMBER_MCIMX7D5EVM10SC

boards/toradex/colibri_imx7d/Kconfig.colibri_imx7d

@@ -0,0 +1,6 @@
+# Copyright 2017,2024 NXP
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_COLIBRI_IMX7D
+	select SOC_PART_NUMBER_MCIMX7D5EVM10SC
+	select SOC_MCIMX7D_M4 if BOARD_COLIBRI_IMX7D_MCIMX7D_M4

boards/toradex/colibri_imx7d/Kconfig.defconfig

@@ -1,12 +1,9 @@
 # Colibri iMX7D M4 board
 
-# Copyright (c) 2017, NXP
+# Copyright 2017,2024 NXP
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_COLIBRI_IMX7D_M4
+if BOARD_COLIBRI_IMX7D_MCIMX7D_M4
-
-config BOARD
-	default "colibri_imx7d_m4"
 
 if !XIP
 config FLASH_SIZE
@@ -16,4 +13,4 @@ config FLASH_BASE_ADDRESS
 endif
 
 
-endif # BOARD_COLIBRI_IMX7D_M4
+endif # BOARD_COLIBRI_IMX7D_MCIMX7D_M4

boards/toradex/colibri_imx7d/board.yml

@@ -0,0 +1,5 @@
+board:
+  name: colibri_imx7d
+  vendor: toradex
+  socs:
+    - name: mcimx7d

boards/toradex/colibri_imx7d/colibri_imx7d_mcimx7d_m4.dts

@@ -7,7 +7,7 @@
 /dts-v1/;
 
 #include <nxp/nxp_imx7d_m4.dtsi>
-#include "colibri_imx7d_m4-pinctrl.dtsi"
+#include "colibri_imx7d-pinctrl.dtsi"
 #include <zephyr/dt-bindings/input/input-event-codes.h>
 
 / {

boards/toradex/colibri_imx7d/colibri_imx7d_mcimx7d_m4.yaml

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-identifier: colibri_imx7d_m4
+identifier: colibri_imx7d/mcimx7d/m4
 name: TORADEX Colibri IMX7D
 type: mcu
 arch: arm

boards/toradex/colibri_imx7d/colibri_imx7d_mcimx7d_m4_defconfig

@@ -4,9 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-CONFIG_SOC_SERIES_IMX7_M4=y
-CONFIG_SOC_MCIMX7_M4=y
-CONFIG_BOARD_COLIBRI_IMX7D_M4=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y
 CONFIG_UART_INTERRUPT_DRIVEN=y

boards/toradex/colibri_imx7d/doc/index.rst

@@ -1,4 +1,4 @@
-.. _colibri_imx7d_m4:
+.. _colibri_imx7d:
 
 NXP i.MX 7 Computer on Module - Colibri iMX7
 ############################################
@@ -12,7 +12,7 @@ Zephyr was ported to run on the M4 core. In a later release, it will also
 communicate with the A7 core (running Linux) via RPmsg.
 
 
-.. image:: colibri_imx7d_m4.jpg
+.. image:: colibri_imx7d.jpg
    :align: center
    :alt: Colibri-iMX7
 
@@ -91,7 +91,7 @@ supports the following hardware features on the Cortex M4 Core:
 
 The default configuration can be found in the defconfig file:
 
-	``boards/arm/colibri_imx7d_m4/colibri_imx7d_m4_defconfig``
+	:zephyr_file:`boards/toradex/colibri_imx7d/colibri_imx7d_mcimx7d_m4_defconfig`
 
 Other hardware features are not currently supported by the port.
 
@@ -167,7 +167,8 @@ References
 
 
 At compilation time you have to choose which RAM will be used. This configuration is
-done in the file ``boards/arm/colibri_imx7d_m4/colibri_imx7d_m4.dts`` with "zephyr,flash" (when CONFIG_XIP=y) and "zephyr,sram"
+done in the file :zephyr_file:`boards/toradex/colibri_imx7d/colibri_imx7d_mcimx7d_m4.dts`
+with "zephyr,flash" (when CONFIG_XIP=y) and "zephyr,sram"
 properties. The available configurations are:
 
 .. code-block:: none
@@ -274,7 +275,7 @@ Issue the following commands inside J-Link commander:
    w4 0x00180004 00905020
    w4 0x3039000C 0xAA
 
-With these mechanisms, applications for the ``colibri_imx7d_m4`` board
+With these mechanisms, applications for the ``colibri_imx7d/imx7d/m4`` board
 configuration can be built and debugged in the usual way (see
 :ref:`build_an_application` and :ref:`application_run` for more details).
 

boards/toradex/index.rst

@@ -0,0 +1,10 @@
+.. _boards-toradex:
+
+Toradex
+#######
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*

samples/drivers/ipm/ipm_imx/sample.yaml

@@ -8,7 +8,7 @@ tests:
     filter: CONFIG_SOC_FAMILY_NXP_IMX
     platform_allow:
       - udoo_neo_full/mcimx6x/m4
-      - colibri_imx7d_m4
+      - colibri_imx7d/mcimx7d/m4
       - warp7_m4
     integration_platforms:
       - udoo_neo_full/mcimx6x/m4

tests/drivers/build_all/pwm/testcase.yaml

@@ -9,7 +9,7 @@ tests:
   drivers.pwm.gecko.build:
     platform_allow: efr32_radio/efr32fg1p133f256gm48
   drivers.pwm.imx.build:
-    platform_allow: colibri_imx7d_m4
+    platform_allow: colibri_imx7d/mcimx7d/m4
   drivers.pwm.litex.build:
     platform_allow: litex_vexriscv
   drivers.pwm.mcux.ftm.build:

tests/drivers/pwm/pwm_api/src/test_pwm.c

@@ -54,7 +54,7 @@
 #error "Define a PWM device"
 #endif
 
-#if defined(CONFIG_BOARD_COLIBRI_IMX7D_M4) || defined(CONFIG_SOC_MK64F12) ||                       \
+#if defined(CONFIG_BOARD_COLIBRI_IMX7D_MCIMX7D_M4) || defined(CONFIG_SOC_MK64F12) ||               \
 	defined(CONFIG_SOC_MKW41Z4) || defined(CONFIG_SOC_SERIES_ESP32S2) ||                       \
 	defined(CONFIG_SOC_SERIES_ESP32S3) || defined(CONFIG_SOC_SERIES_ESP32C3)
 #define DEFAULT_PERIOD_CYCLE 1024