From 29ef2f23eb2f3c538139010a0d12a816aa6d31c2 Mon Sep 17 00:00:00 2001 From: Daniel DeGrasse Date: Thu, 29 Feb 2024 18:57:12 +0000 Subject: [PATCH] boards: udoo_neo_full: convert to HWMv2 Convert udoo_neo_full board to HWMv2. Signed-off-by: Daniel DeGrasse --- .../arm/udoo_neo_full_m4/Kconfig.board | 7 ------- .../arm/udoo_neo_full_m4/Kconfig.defconfig | 11 ----------- boards/udoo/index.rst | 10 ++++++++++ boards/udoo/udoo_neo_full/Kconfig.udoo_neo_full | 6 ++++++ .../udoo_neo_full}/board.cmake | 0 boards/udoo/udoo_neo_full/board.yml | 5 +++++ .../udoo_neo_full}/doc/index.rst | 8 ++++---- .../udoo_neo_full/doc/udoo_neo_full_mcimx6x_m4.jpg} | Bin .../udoo_neo_full/udoo_neo_full-pinctrl.dtsi} | 0 .../udoo_neo_full/udoo_neo_full_mcimx6x_m4.dts} | 6 +++--- .../udoo_neo_full/udoo_neo_full_mcimx6x_m4.yaml} | 2 +- .../udoo_neo_full_mcimx6x_m4_defconfig} | 3 --- samples/drivers/ipm/ipm_imx/README.rst | 4 ++-- samples/drivers/ipm/ipm_imx/sample.yaml | 6 +++--- ..._m4.overlay => udoo_neo_full_mcimx6x_m4.overlay} | 0 tests/drivers/gpio/gpio_basic_api/src/main.c | 4 ++-- 16 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 boards/boards_legacy/arm/udoo_neo_full_m4/Kconfig.board delete mode 100644 boards/boards_legacy/arm/udoo_neo_full_m4/Kconfig.defconfig create mode 100644 boards/udoo/index.rst create mode 100644 boards/udoo/udoo_neo_full/Kconfig.udoo_neo_full rename boards/{boards_legacy/arm/udoo_neo_full_m4 => udoo/udoo_neo_full}/board.cmake (100%) create mode 100644 boards/udoo/udoo_neo_full/board.yml rename boards/{boards_legacy/arm/udoo_neo_full_m4 => udoo/udoo_neo_full}/doc/index.rst (98%) rename boards/{boards_legacy/arm/udoo_neo_full_m4/doc/udoo_neo_full_m4.jpg => udoo/udoo_neo_full/doc/udoo_neo_full_mcimx6x_m4.jpg} (100%) rename boards/{boards_legacy/arm/udoo_neo_full_m4/udoo_neo_full_m4-pinctrl.dtsi => udoo/udoo_neo_full/udoo_neo_full-pinctrl.dtsi} (100%) rename boards/{boards_legacy/arm/udoo_neo_full_m4/udoo_neo_full_m4.dts => udoo/udoo_neo_full/udoo_neo_full_mcimx6x_m4.dts} (92%) rename boards/{boards_legacy/arm/udoo_neo_full_m4/udoo_neo_full_m4.yaml => udoo/udoo_neo_full/udoo_neo_full_mcimx6x_m4.yaml} (86%) rename boards/{boards_legacy/arm/udoo_neo_full_m4/udoo_neo_full_m4_defconfig => udoo/udoo_neo_full/udoo_neo_full_mcimx6x_m4_defconfig} (73%) rename tests/drivers/gpio/gpio_basic_api/boards/{udoo_neo_full_m4.overlay => udoo_neo_full_mcimx6x_m4.overlay} (100%) diff --git a/boards/boards_legacy/arm/udoo_neo_full_m4/Kconfig.board b/boards/boards_legacy/arm/udoo_neo_full_m4/Kconfig.board deleted file mode 100644 index f9f67b923ed..00000000000 --- a/boards/boards_legacy/arm/udoo_neo_full_m4/Kconfig.board +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2018, NXP -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_UDOO_NEO_FULL_M4 - bool "UDOO Neo Full" - depends on SOC_SERIES_IMX_6X_M4 - select SOC_PART_NUMBER_MCIMX6X4EVM10AB diff --git a/boards/boards_legacy/arm/udoo_neo_full_m4/Kconfig.defconfig b/boards/boards_legacy/arm/udoo_neo_full_m4/Kconfig.defconfig deleted file mode 100644 index 62636188a78..00000000000 --- a/boards/boards_legacy/arm/udoo_neo_full_m4/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# UDOO Neo Full board - -# Copyright (c) 2018, NXP -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_UDOO_NEO_FULL_M4 - -config BOARD - default "udoo_neo_full_m4" - -endif # BOARD_UDOO_NEO_FULL_M4 diff --git a/boards/udoo/index.rst b/boards/udoo/index.rst new file mode 100644 index 00000000000..aac4e7f711a --- /dev/null +++ b/boards/udoo/index.rst @@ -0,0 +1,10 @@ +.. _boards-udoo: + +UDOO +#### + +.. toctree:: + :maxdepth: 1 + :glob: + + **/* diff --git a/boards/udoo/udoo_neo_full/Kconfig.udoo_neo_full b/boards/udoo/udoo_neo_full/Kconfig.udoo_neo_full new file mode 100644 index 00000000000..e0e9d50bd17 --- /dev/null +++ b/boards/udoo/udoo_neo_full/Kconfig.udoo_neo_full @@ -0,0 +1,6 @@ +# Copyright 2018,2024 NXP +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_UDOO_NEO_FULL + select SOC_PART_NUMBER_MCIMX6X4EVM10AB + select SOC_MCIMX6X_M4 if BOARD_UDOO_NEO_FULL_MCIMX6X_M4 diff --git a/boards/boards_legacy/arm/udoo_neo_full_m4/board.cmake b/boards/udoo/udoo_neo_full/board.cmake similarity index 100% rename from boards/boards_legacy/arm/udoo_neo_full_m4/board.cmake rename to boards/udoo/udoo_neo_full/board.cmake diff --git a/boards/udoo/udoo_neo_full/board.yml b/boards/udoo/udoo_neo_full/board.yml new file mode 100644 index 00000000000..1c20ebdc15f --- /dev/null +++ b/boards/udoo/udoo_neo_full/board.yml @@ -0,0 +1,5 @@ +board: + name: udoo_neo_full + vendor: udoo + socs: + - name: mcimx6x diff --git a/boards/boards_legacy/arm/udoo_neo_full_m4/doc/index.rst b/boards/udoo/udoo_neo_full/doc/index.rst similarity index 98% rename from boards/boards_legacy/arm/udoo_neo_full_m4/doc/index.rst rename to boards/udoo/udoo_neo_full/doc/index.rst index f3c11e3dd31..945c1dcee4a 100644 --- a/boards/boards_legacy/arm/udoo_neo_full_m4/doc/index.rst +++ b/boards/udoo/udoo_neo_full/doc/index.rst @@ -1,4 +1,4 @@ -.. _udoo_neo_full_m4: +.. _udoo_neo_full: UDOO Neo Full ############# @@ -13,7 +13,7 @@ core running up to 227 MHz for high CPU performance and real-time response. Zephyr was ported to run on the Cortex-M4 core only. In a future release, it will also communicate with the Cortex-A9 core (running Linux) via OpenAMP. -.. figure:: udoo_neo_full_m4.jpg +.. figure:: udoo_neo_full_mcimx6x_m4.jpg :align: center :alt: UDOO-Neo-Full @@ -135,7 +135,7 @@ features: The default configuration can be found in the defconfig file: - ``boards/arm/udoo_neo_full_m4/udoo_neo_full_m4_defconfig`` + :zephyr_file:`boards/udoo/udoo_neo_full/udoo_neo_full_mcimx6x_m4_defconfig` Other hardware features are not currently supported by the port. @@ -200,7 +200,7 @@ References - `NXP i.MX 6SoloX Reference Manual`_ Chapter 2 - Memory Maps You have to choose which RAM will be used at compilation time. This configuration -is done in the file ``boards/arm/udoo_neo_full_m4/udoo_neo_full_m4.dts``. +is done in the file :zephyr_file:`boards/udoo/udoo_neo_full/udoo_neo_full_mcimx6x_m4.dts`. If you want to have the code placed in the subregion of a memory, which will likely be the case when using DDR, select "zephyr,flash=&flash" and set the diff --git a/boards/boards_legacy/arm/udoo_neo_full_m4/doc/udoo_neo_full_m4.jpg b/boards/udoo/udoo_neo_full/doc/udoo_neo_full_mcimx6x_m4.jpg similarity index 100% rename from boards/boards_legacy/arm/udoo_neo_full_m4/doc/udoo_neo_full_m4.jpg rename to boards/udoo/udoo_neo_full/doc/udoo_neo_full_mcimx6x_m4.jpg diff --git a/boards/boards_legacy/arm/udoo_neo_full_m4/udoo_neo_full_m4-pinctrl.dtsi b/boards/udoo/udoo_neo_full/udoo_neo_full-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/udoo_neo_full_m4/udoo_neo_full_m4-pinctrl.dtsi rename to boards/udoo/udoo_neo_full/udoo_neo_full-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/udoo_neo_full_m4/udoo_neo_full_m4.dts b/boards/udoo/udoo_neo_full/udoo_neo_full_mcimx6x_m4.dts similarity index 92% rename from boards/boards_legacy/arm/udoo_neo_full_m4/udoo_neo_full_m4.dts rename to boards/udoo/udoo_neo_full/udoo_neo_full_mcimx6x_m4.dts index 6e7ee0bfb63..f54b88102cd 100644 --- a/boards/boards_legacy/arm/udoo_neo_full_m4/udoo_neo_full_m4.dts +++ b/boards/udoo/udoo_neo_full/udoo_neo_full_mcimx6x_m4.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, NXP + * Copyright 2018,2024 NXP * * SPDX-License-Identifier: Apache-2.0 */ @@ -25,11 +25,11 @@ #define DT_SRAM_ADDR 84080000 /* DT_ADDR will add leading 0x where needed */ #include -#include "udoo_neo_full_m4-pinctrl.dtsi" +#include "udoo_neo_full-pinctrl.dtsi" / { model = "UDOO Neo Full board"; - compatible = "nxp,mcimx6x_m4"; + compatible = "nxp,mcmcimx6x_m4"; aliases { led0 = &red_led; diff --git a/boards/boards_legacy/arm/udoo_neo_full_m4/udoo_neo_full_m4.yaml b/boards/udoo/udoo_neo_full/udoo_neo_full_mcimx6x_m4.yaml similarity index 86% rename from boards/boards_legacy/arm/udoo_neo_full_m4/udoo_neo_full_m4.yaml rename to boards/udoo/udoo_neo_full/udoo_neo_full_mcimx6x_m4.yaml index 8e2876ca5ab..4fdd6493309 100644 --- a/boards/boards_legacy/arm/udoo_neo_full_m4/udoo_neo_full_m4.yaml +++ b/boards/udoo/udoo_neo_full/udoo_neo_full_mcimx6x_m4.yaml @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -identifier: udoo_neo_full_m4 +identifier: udoo_neo_full/mcimx6x/m4 name: UDOO Neo Full type: mcu arch: arm diff --git a/boards/boards_legacy/arm/udoo_neo_full_m4/udoo_neo_full_m4_defconfig b/boards/udoo/udoo_neo_full/udoo_neo_full_mcimx6x_m4_defconfig similarity index 73% rename from boards/boards_legacy/arm/udoo_neo_full_m4/udoo_neo_full_m4_defconfig rename to boards/udoo/udoo_neo_full/udoo_neo_full_mcimx6x_m4_defconfig index c03d8770a7d..140679e50c3 100644 --- a/boards/boards_legacy/arm/udoo_neo_full_m4/udoo_neo_full_m4_defconfig +++ b/boards/udoo/udoo_neo_full/udoo_neo_full_mcimx6x_m4_defconfig @@ -4,9 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_MCIMX6X_M4=y -CONFIG_SOC_SERIES_IMX_6X_M4=y -CONFIG_BOARD_UDOO_NEO_FULL_M4=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_SERIAL=y diff --git a/samples/drivers/ipm/ipm_imx/README.rst b/samples/drivers/ipm/ipm_imx/README.rst index 570f7115362..ecffdbede07 100644 --- a/samples/drivers/ipm/ipm_imx/README.rst +++ b/samples/drivers/ipm/ipm_imx/README.rst @@ -35,11 +35,11 @@ It can be built as follows: .. zephyr-app-commands:: :zephyr-app: samples/drivers/ipm/ipm_imx - :board: udoo_neo_full_m4 + :board: udoo_neo_full/mcimx6x/m4 :goals: build flash :compact: -Follow the instructions in the :ref:`udoo_neo_full_m4` board documentation +Follow the instructions in the :ref:`udoo_neo_full` board documentation for how to load the Zephyr binary to the desired core and execute it. Building and Running the Linux Code diff --git a/samples/drivers/ipm/ipm_imx/sample.yaml b/samples/drivers/ipm/ipm_imx/sample.yaml index 227faf7a8dc..8b5e9de9aeb 100644 --- a/samples/drivers/ipm/ipm_imx/sample.yaml +++ b/samples/drivers/ipm/ipm_imx/sample.yaml @@ -5,13 +5,13 @@ sample: tests: sample.ipm.ipm_imx: build_only: true - filter: CONFIG_SOC_FAMILY_IMX + filter: CONFIG_SOC_FAMILY_NXP_IMX platform_allow: - - udoo_neo_full_m4 + - udoo_neo_full/mcimx6x/m4 - colibri_imx7d_m4 - warp7_m4 integration_platforms: - - udoo_neo_full_m4 + - udoo_neo_full/mcimx6x/m4 tags: - samples - ipm diff --git a/tests/drivers/gpio/gpio_basic_api/boards/udoo_neo_full_m4.overlay b/tests/drivers/gpio/gpio_basic_api/boards/udoo_neo_full_mcimx6x_m4.overlay similarity index 100% rename from tests/drivers/gpio/gpio_basic_api/boards/udoo_neo_full_m4.overlay rename to tests/drivers/gpio/gpio_basic_api/boards/udoo_neo_full_mcimx6x_m4.overlay diff --git a/tests/drivers/gpio/gpio_basic_api/src/main.c b/tests/drivers/gpio/gpio_basic_api/src/main.c index 143be7d314d..67326505e98 100644 --- a/tests/drivers/gpio/gpio_basic_api/src/main.c +++ b/tests/drivers/gpio/gpio_basic_api/src/main.c @@ -10,7 +10,7 @@ /* Grotesque hack for pinmux boards */ #if defined(CONFIG_BOARD_RV32M1_VEGA) #include -#elif defined(CONFIG_BOARD_UDOO_NEO_FULL_M4) +#elif defined(CONFIG_BOARD_UDOO_NEO_FULL_MCIMX6X_M4) #include "device_imx.h" #elif defined(CONFIG_BOARD_MIMXRT1050_EVK) #include @@ -32,7 +32,7 @@ static void board_setup(void) } #endif -#if defined(CONFIG_BOARD_UDOO_NEO_FULL_M4) +#if defined(CONFIG_BOARD_UDOO_NEO_FULL_MCIMX6X_M4) /* * Configure pin mux. * The following code needs to configure the same GPIOs which were