From cb348c7edf3617fbdd544f16bcf92184127b0d12 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Mon, 12 Feb 2024 16:09:01 +0000 Subject: [PATCH] boards: arm: nrf54l15pdk_nrf54l15: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- .../nrf54l15pdk}/Kconfig.defconfig | 3 --- .../nrf54l15pdk/Kconfig.nrf54l15pdk} | 3 +-- .../nrf54l15pdk}/board.cmake | 0 boards/nordic_nrf/nrf54l15pdk/board.yml | 5 +++++ .../nrf54l15pdk}/doc/img/nrf54l15pdk_nrf54l15.webp | Bin .../nrf54l15pdk}/doc/index.rst | 6 +++--- .../nrf54l15pdk_nrf54l15_cpuapp-pinctrl.dtsi | 0 .../nrf54l15pdk}/nrf54l15pdk_nrf54l15_cpuapp.dts | 0 .../nrf54l15pdk}/nrf54l15pdk_nrf54l15_cpuapp.yaml | 2 +- .../nrf54l15pdk_nrf54l15_cpuapp_defconfig | 4 ---- .../nrf54l15pdk/nrf54l15pdk_nrf54l15_defconfig | 1 + .../nrf54l15pdk}/revision.cmake | 0 12 files changed, 11 insertions(+), 13 deletions(-) rename boards/{boards_legacy/arm/nrf54l15pdk_nrf54l15 => nordic_nrf/nrf54l15pdk}/Kconfig.defconfig (78%) rename boards/{boards_legacy/arm/nrf54l15pdk_nrf54l15/Kconfig.board => nordic_nrf/nrf54l15pdk/Kconfig.nrf54l15pdk} (60%) rename boards/{boards_legacy/arm/nrf54l15pdk_nrf54l15 => nordic_nrf/nrf54l15pdk}/board.cmake (100%) create mode 100644 boards/nordic_nrf/nrf54l15pdk/board.yml rename boards/{boards_legacy/arm/nrf54l15pdk_nrf54l15 => nordic_nrf/nrf54l15pdk}/doc/img/nrf54l15pdk_nrf54l15.webp (100%) rename boards/{boards_legacy/arm/nrf54l15pdk_nrf54l15 => nordic_nrf/nrf54l15pdk}/doc/index.rst (96%) rename boards/{boards_legacy/arm/nrf54l15pdk_nrf54l15 => nordic_nrf/nrf54l15pdk}/nrf54l15pdk_nrf54l15_cpuapp-pinctrl.dtsi (100%) rename boards/{boards_legacy/arm/nrf54l15pdk_nrf54l15 => nordic_nrf/nrf54l15pdk}/nrf54l15pdk_nrf54l15_cpuapp.dts (100%) rename boards/{boards_legacy/arm/nrf54l15pdk_nrf54l15 => nordic_nrf/nrf54l15pdk}/nrf54l15pdk_nrf54l15_cpuapp.yaml (87%) rename boards/{boards_legacy/arm/nrf54l15pdk_nrf54l15 => nordic_nrf/nrf54l15pdk}/nrf54l15pdk_nrf54l15_cpuapp_defconfig (85%) create mode 100644 boards/nordic_nrf/nrf54l15pdk/nrf54l15pdk_nrf54l15_defconfig rename boards/{boards_legacy/arm/nrf54l15pdk_nrf54l15 => nordic_nrf/nrf54l15pdk}/revision.cmake (100%) diff --git a/boards/boards_legacy/arm/nrf54l15pdk_nrf54l15/Kconfig.defconfig b/boards/nordic_nrf/nrf54l15pdk/Kconfig.defconfig similarity index 78% rename from boards/boards_legacy/arm/nrf54l15pdk_nrf54l15/Kconfig.defconfig rename to boards/nordic_nrf/nrf54l15pdk/Kconfig.defconfig index 532ea07c859..bd9c7231616 100644 --- a/boards/boards_legacy/arm/nrf54l15pdk_nrf54l15/Kconfig.defconfig +++ b/boards/nordic_nrf/nrf54l15pdk/Kconfig.defconfig @@ -3,9 +3,6 @@ if BOARD_NRF54L15PDK_NRF54L15_CPUAPP -config BOARD - default "nrf54l15pdk_nrf54l15_cpuapp" - config BT_CTLR default BT diff --git a/boards/boards_legacy/arm/nrf54l15pdk_nrf54l15/Kconfig.board b/boards/nordic_nrf/nrf54l15pdk/Kconfig.nrf54l15pdk similarity index 60% rename from boards/boards_legacy/arm/nrf54l15pdk_nrf54l15/Kconfig.board rename to boards/nordic_nrf/nrf54l15pdk/Kconfig.nrf54l15pdk index d95fe51009f..4ec5b6ee62d 100644 --- a/boards/boards_legacy/arm/nrf54l15pdk_nrf54l15/Kconfig.board +++ b/boards/nordic_nrf/nrf54l15pdk/Kconfig.nrf54l15pdk @@ -2,5 +2,4 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_NRF54L15PDK_NRF54L15_CPUAPP - bool "nRF54L15 PDK nRF54L15 Application MCU" - depends on SOC_NRF54L15_ENGA_CPUAPP + select SOC_NRF54L15_ENGA_CPUAPP diff --git a/boards/boards_legacy/arm/nrf54l15pdk_nrf54l15/board.cmake b/boards/nordic_nrf/nrf54l15pdk/board.cmake similarity index 100% rename from boards/boards_legacy/arm/nrf54l15pdk_nrf54l15/board.cmake rename to boards/nordic_nrf/nrf54l15pdk/board.cmake diff --git a/boards/nordic_nrf/nrf54l15pdk/board.yml b/boards/nordic_nrf/nrf54l15pdk/board.yml new file mode 100644 index 00000000000..9863c0935f7 --- /dev/null +++ b/boards/nordic_nrf/nrf54l15pdk/board.yml @@ -0,0 +1,5 @@ +board: + name: nrf54l15pdk + vendor: Nordic Semiconductor + socs: + - name: nrf54l15 diff --git a/boards/boards_legacy/arm/nrf54l15pdk_nrf54l15/doc/img/nrf54l15pdk_nrf54l15.webp b/boards/nordic_nrf/nrf54l15pdk/doc/img/nrf54l15pdk_nrf54l15.webp similarity index 100% rename from boards/boards_legacy/arm/nrf54l15pdk_nrf54l15/doc/img/nrf54l15pdk_nrf54l15.webp rename to boards/nordic_nrf/nrf54l15pdk/doc/img/nrf54l15pdk_nrf54l15.webp diff --git a/boards/boards_legacy/arm/nrf54l15pdk_nrf54l15/doc/index.rst b/boards/nordic_nrf/nrf54l15pdk/doc/index.rst similarity index 96% rename from boards/boards_legacy/arm/nrf54l15pdk_nrf54l15/doc/index.rst rename to boards/nordic_nrf/nrf54l15pdk/doc/index.rst index dce1c841b1c..ccc6230dd7d 100644 --- a/boards/boards_legacy/arm/nrf54l15pdk_nrf54l15/doc/index.rst +++ b/boards/nordic_nrf/nrf54l15pdk/doc/index.rst @@ -49,7 +49,7 @@ internal or external capacitors. Supported Features ================== -The nrf54l15pdk_nrf54l15 board configuration supports the following +The ``nrf54l15pdk/nrf54l15/cpuapp`` board configuration supports the following hardware features: +-----------+------------+----------------------+ @@ -89,7 +89,7 @@ Other hardware features have not been enabled yet for this board. Programming and Debugging ************************* -Applications for the ``nrf54l15pdk_nrf54l15_cpuapp`` board can be +Applications for the ``nrf54l15pdk/nrf54l15/cpuapp`` board can be built, flashed, and debugged in the usual way. See :ref:`build_an_application` and :ref:`application_run` for more details on building and running. @@ -130,7 +130,7 @@ Next, build the sample by running the following command: .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: nrf54l15pdk_nrf54l15_cpuapp + :board: nrf54l15pdk/nrf54l15/cpuapp :goals: build flash Testing the LEDs and buttons in the nRF54L15 PDK diff --git a/boards/boards_legacy/arm/nrf54l15pdk_nrf54l15/nrf54l15pdk_nrf54l15_cpuapp-pinctrl.dtsi b/boards/nordic_nrf/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/nrf54l15pdk_nrf54l15/nrf54l15pdk_nrf54l15_cpuapp-pinctrl.dtsi rename to boards/nordic_nrf/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/nrf54l15pdk_nrf54l15/nrf54l15pdk_nrf54l15_cpuapp.dts b/boards/nordic_nrf/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp.dts similarity index 100% rename from boards/boards_legacy/arm/nrf54l15pdk_nrf54l15/nrf54l15pdk_nrf54l15_cpuapp.dts rename to boards/nordic_nrf/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp.dts diff --git a/boards/boards_legacy/arm/nrf54l15pdk_nrf54l15/nrf54l15pdk_nrf54l15_cpuapp.yaml b/boards/nordic_nrf/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp.yaml similarity index 87% rename from boards/boards_legacy/arm/nrf54l15pdk_nrf54l15/nrf54l15pdk_nrf54l15_cpuapp.yaml rename to boards/nordic_nrf/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp.yaml index de5ce29d162..ddcd456fb4a 100644 --- a/boards/boards_legacy/arm/nrf54l15pdk_nrf54l15/nrf54l15pdk_nrf54l15_cpuapp.yaml +++ b/boards/nordic_nrf/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp.yaml @@ -1,7 +1,7 @@ # Copyright (c) 2024 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -identifier: nrf54l15pdk_nrf54l15_cpuapp +identifier: nrf54l15pdk/nrf54l15/cpuapp name: nRF54l15-PDK-nRF54l15-Application type: mcu arch: arm diff --git a/boards/boards_legacy/arm/nrf54l15pdk_nrf54l15/nrf54l15pdk_nrf54l15_cpuapp_defconfig b/boards/nordic_nrf/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_defconfig similarity index 85% rename from boards/boards_legacy/arm/nrf54l15pdk_nrf54l15/nrf54l15pdk_nrf54l15_cpuapp_defconfig rename to boards/nordic_nrf/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_defconfig index bc74c3eeb33..0352761e0ce 100644 --- a/boards/boards_legacy/arm/nrf54l15pdk_nrf54l15/nrf54l15pdk_nrf54l15_cpuapp_defconfig +++ b/boards/nordic_nrf/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2024 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF54LX=y -CONFIG_SOC_NRF54L15_ENGA_CPUAPP=y -CONFIG_BOARD_NRF54L15PDK_NRF54L15_CPUAPP=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/nordic_nrf/nrf54l15pdk/nrf54l15pdk_nrf54l15_defconfig b/boards/nordic_nrf/nrf54l15pdk/nrf54l15pdk_nrf54l15_defconfig new file mode 100644 index 00000000000..9881313609a --- /dev/null +++ b/boards/nordic_nrf/nrf54l15pdk/nrf54l15pdk_nrf54l15_defconfig @@ -0,0 +1 @@ +# SPDX-License-Identifier: Apache-2.0 diff --git a/boards/boards_legacy/arm/nrf54l15pdk_nrf54l15/revision.cmake b/boards/nordic_nrf/nrf54l15pdk/revision.cmake similarity index 100% rename from boards/boards_legacy/arm/nrf54l15pdk_nrf54l15/revision.cmake rename to boards/nordic_nrf/nrf54l15pdk/revision.cmake