From 6987b2e30521011e5b820c9c1c6f3a73d724b5dd Mon Sep 17 00:00:00 2001 From: Daniel DeGrasse Date: Thu, 29 Feb 2024 20:37:32 +0000 Subject: [PATCH] boards: pico_pi: convert to HVMv2 Convert pico_pi board to HWMv2. This board port only supports the M4 core on the SOC Signed-off-by: Daniel DeGrasse --- boards/boards_legacy/arm/pico_pi_m4/Kconfig.board | 8 -------- boards/technexion/index.rst | 10 ++++++++++ .../pico_pi}/Kconfig.defconfig | 7 ++----- boards/technexion/pico_pi/Kconfig.pico_pi | 7 +++++++ boards/technexion/pico_pi/board.yml | 5 +++++ .../pico_pi_m4 => technexion/pico_pi}/doc/index.rst | 8 ++++---- .../pico_pi/doc/pico_pi.jpg} | Bin .../pico_pi/pico_pi-pinctrl.dtsi} | 0 .../pico_pi/pico_pi_mcimx7d_m4.dts} | 2 +- .../pico_pi/pico_pi_mcimx7d_m4.yaml} | 2 +- .../pico_pi/pico_pi_mcimx7d_m4_defconfig} | 3 --- 11 files changed, 30 insertions(+), 22 deletions(-) delete mode 100644 boards/boards_legacy/arm/pico_pi_m4/Kconfig.board create mode 100644 boards/technexion/index.rst rename boards/{boards_legacy/arm/pico_pi_m4 => technexion/pico_pi}/Kconfig.defconfig (69%) create mode 100644 boards/technexion/pico_pi/Kconfig.pico_pi create mode 100644 boards/technexion/pico_pi/board.yml rename boards/{boards_legacy/arm/pico_pi_m4 => technexion/pico_pi}/doc/index.rst (97%) rename boards/{boards_legacy/arm/pico_pi_m4/doc/pico_pi_m4.jpg => technexion/pico_pi/doc/pico_pi.jpg} (100%) rename boards/{boards_legacy/arm/pico_pi_m4/pico_pi_m4-pinctrl.dtsi => technexion/pico_pi/pico_pi-pinctrl.dtsi} (100%) rename boards/{boards_legacy/arm/pico_pi_m4/pico_pi_m4.dts => technexion/pico_pi/pico_pi_mcimx7d_m4.dts} (96%) rename boards/{boards_legacy/arm/pico_pi_m4/pico_pi_m4.yaml => technexion/pico_pi/pico_pi_mcimx7d_m4.yaml} (88%) rename boards/{boards_legacy/arm/pico_pi_m4/pico_pi_m4_defconfig => technexion/pico_pi/pico_pi_mcimx7d_m4_defconfig} (73%) diff --git a/boards/boards_legacy/arm/pico_pi_m4/Kconfig.board b/boards/boards_legacy/arm/pico_pi_m4/Kconfig.board deleted file mode 100644 index e980c3d1ec9..00000000000 --- a/boards/boards_legacy/arm/pico_pi_m4/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Pico-Pi iMX7D M4 board - -# Copyright (c) 2019, Joris Offouga -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_PICO_PI_M4 - bool "Pico-PI iMX7D Dual" - depends on SOC_SERIES_IMX7_M4 diff --git a/boards/technexion/index.rst b/boards/technexion/index.rst new file mode 100644 index 00000000000..31b1d47e448 --- /dev/null +++ b/boards/technexion/index.rst @@ -0,0 +1,10 @@ +.. _boards-technexion: + +TECHNEXION +########## + +.. toctree:: + :maxdepth: 1 + :glob: + + **/* diff --git a/boards/boards_legacy/arm/pico_pi_m4/Kconfig.defconfig b/boards/technexion/pico_pi/Kconfig.defconfig similarity index 69% rename from boards/boards_legacy/arm/pico_pi_m4/Kconfig.defconfig rename to boards/technexion/pico_pi/Kconfig.defconfig index fb3f7cd2f89..aebd510fe61 100644 --- a/boards/boards_legacy/arm/pico_pi_m4/Kconfig.defconfig +++ b/boards/technexion/pico_pi/Kconfig.defconfig @@ -3,10 +3,7 @@ # Copyright (c) 2019, Joris Offouga # SPDX-License-Identifier: Apache-2.0 -if BOARD_PICO_PI_M4 - -config BOARD - default "pico_pi_m4" +if BOARD_PICO_PI if !XIP config FLASH_SIZE @@ -15,4 +12,4 @@ config FLASH_BASE_ADDRESS default 0 endif -endif # BOARD_PICO_PI_M4 +endif # BOARD_PICO_PI diff --git a/boards/technexion/pico_pi/Kconfig.pico_pi b/boards/technexion/pico_pi/Kconfig.pico_pi new file mode 100644 index 00000000000..02def5fdc0e --- /dev/null +++ b/boards/technexion/pico_pi/Kconfig.pico_pi @@ -0,0 +1,7 @@ +# Copyright (c) 2019, Joris Offouga +# Copyright 2024 NXP +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_PICO_PI + select SOC_PART_NUMBER_MCIMX7D7DVM10SC + select SOC_MCIMX7D_M4 if BOARD_PICO_PI_MCIMX7D_M4 diff --git a/boards/technexion/pico_pi/board.yml b/boards/technexion/pico_pi/board.yml new file mode 100644 index 00000000000..61c6713a925 --- /dev/null +++ b/boards/technexion/pico_pi/board.yml @@ -0,0 +1,5 @@ +board: + name: pico_pi + vendor: technexion + socs: + - name: mcimx7d diff --git a/boards/boards_legacy/arm/pico_pi_m4/doc/index.rst b/boards/technexion/pico_pi/doc/index.rst similarity index 97% rename from boards/boards_legacy/arm/pico_pi_m4/doc/index.rst rename to boards/technexion/pico_pi/doc/index.rst index 8e3c4e832c8..3b651729227 100644 --- a/boards/boards_legacy/arm/pico_pi_m4/doc/index.rst +++ b/boards/technexion/pico_pi/doc/index.rst @@ -1,4 +1,4 @@ -.. _pico_pi_m4: +.. _pico_pi: Pico-Pi i.MX7D - Android Things IoT Development Platform ############################################################# @@ -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:: pico_pi_m4.jpg +.. image:: pico_pi.jpg :align: center :alt: Pico-Pi i.MX7D @@ -71,7 +71,7 @@ Cortex M4 Core: +-----------+------------+-------------------------------------+ The default configuration can be found in the defconfig file: -``boards/arm/pico_pi_m4/pico_pi_m4_defconfig`` +:zephyr_file:`boards/technexion/pico_pi/pico_pi_mcimx7d_m4_defconfig` Other hardware features are not currently supported by the port. @@ -143,7 +143,7 @@ References At compilation time you have to choose which RAM will be used. This -configuration is done in the file ``boards/arm/pico_pi_m4/pico_pi_m4.dts`` with +configuration is done in the file :zephyr_file:`boards/technexion/pico_pi/pico_pi_mcimx7d_m4.dts` with "zephyr,flash" (when CONFIG_XIP=y) and "zephyr,sram" properties. The available configurations are: diff --git a/boards/boards_legacy/arm/pico_pi_m4/doc/pico_pi_m4.jpg b/boards/technexion/pico_pi/doc/pico_pi.jpg similarity index 100% rename from boards/boards_legacy/arm/pico_pi_m4/doc/pico_pi_m4.jpg rename to boards/technexion/pico_pi/doc/pico_pi.jpg diff --git a/boards/boards_legacy/arm/pico_pi_m4/pico_pi_m4-pinctrl.dtsi b/boards/technexion/pico_pi/pico_pi-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/pico_pi_m4/pico_pi_m4-pinctrl.dtsi rename to boards/technexion/pico_pi/pico_pi-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/pico_pi_m4/pico_pi_m4.dts b/boards/technexion/pico_pi/pico_pi_mcimx7d_m4.dts similarity index 96% rename from boards/boards_legacy/arm/pico_pi_m4/pico_pi_m4.dts rename to boards/technexion/pico_pi/pico_pi_mcimx7d_m4.dts index ecc1b2d41d9..988d5c2e398 100644 --- a/boards/boards_legacy/arm/pico_pi_m4/pico_pi_m4.dts +++ b/boards/technexion/pico_pi/pico_pi_mcimx7d_m4.dts @@ -8,7 +8,7 @@ /dts-v1/; #include -#include "pico_pi_m4-pinctrl.dtsi" +#include "pico_pi-pinctrl.dtsi" / { model = "Pico-Pi IMX7D board"; diff --git a/boards/boards_legacy/arm/pico_pi_m4/pico_pi_m4.yaml b/boards/technexion/pico_pi/pico_pi_mcimx7d_m4.yaml similarity index 88% rename from boards/boards_legacy/arm/pico_pi_m4/pico_pi_m4.yaml rename to boards/technexion/pico_pi/pico_pi_mcimx7d_m4.yaml index 8cc013a4e36..7baa570c548 100644 --- a/boards/boards_legacy/arm/pico_pi_m4/pico_pi_m4.yaml +++ b/boards/technexion/pico_pi/pico_pi_mcimx7d_m4.yaml @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -identifier: pico_pi_m4 +identifier: pico_pi/mcimx7d/m4 name: Pico-Pi IMX7D type: mcu arch: arm diff --git a/boards/boards_legacy/arm/pico_pi_m4/pico_pi_m4_defconfig b/boards/technexion/pico_pi/pico_pi_mcimx7d_m4_defconfig similarity index 73% rename from boards/boards_legacy/arm/pico_pi_m4/pico_pi_m4_defconfig rename to boards/technexion/pico_pi/pico_pi_mcimx7d_m4_defconfig index d2e77138089..a9f1db5c8a7 100644 --- a/boards/boards_legacy/arm/pico_pi_m4/pico_pi_m4_defconfig +++ b/boards/technexion/pico_pi/pico_pi_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_PICO_PI_M4=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y