From f9f2da24041a7b1923e49893cca912482c138aae Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Thu, 15 Feb 2024 11:42:33 +0100 Subject: [PATCH] boards: custom_plank: port to HWMv2 Port the custom_plank example out-of-tree board to HWMv2. Signed-off-by: Gerard Marull-Paretas --- boards/arm/custom_plank/Kconfig.defconfig | 9 --------- boards/{arm => vendor}/custom_plank/Kconfig | 0 .../custom_plank/Kconfig.custom_plank} | 3 +-- boards/{arm => vendor}/custom_plank/README.md | 0 boards/{arm => vendor}/custom_plank/board.cmake | 0 boards/vendor/custom_plank/board.yml | 8 ++++++++ .../custom_plank/custom_plank-pinctrl.dtsi | 0 boards/{arm => vendor}/custom_plank/custom_plank.dts | 0 boards/{arm => vendor}/custom_plank/custom_plank.yaml | 1 + .../{arm => vendor}/custom_plank/custom_plank_defconfig | 4 ---- 10 files changed, 10 insertions(+), 15 deletions(-) delete mode 100644 boards/arm/custom_plank/Kconfig.defconfig rename boards/{arm => vendor}/custom_plank/Kconfig (100%) rename boards/{arm/custom_plank/Kconfig.board => vendor/custom_plank/Kconfig.custom_plank} (66%) rename boards/{arm => vendor}/custom_plank/README.md (100%) rename boards/{arm => vendor}/custom_plank/board.cmake (100%) create mode 100644 boards/vendor/custom_plank/board.yml rename boards/{arm => vendor}/custom_plank/custom_plank-pinctrl.dtsi (100%) rename boards/{arm => vendor}/custom_plank/custom_plank.dts (100%) rename boards/{arm => vendor}/custom_plank/custom_plank.yaml (94%) rename boards/{arm => vendor}/custom_plank/custom_plank_defconfig (66%) diff --git a/boards/arm/custom_plank/Kconfig.defconfig b/boards/arm/custom_plank/Kconfig.defconfig deleted file mode 100644 index 114f0ee..0000000 --- a/boards/arm/custom_plank/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2021 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_CUSTOM_PLANK - -config BOARD - default "custom_plank" - -endif # BOARD_CUSTOM_PLANK diff --git a/boards/arm/custom_plank/Kconfig b/boards/vendor/custom_plank/Kconfig similarity index 100% rename from boards/arm/custom_plank/Kconfig rename to boards/vendor/custom_plank/Kconfig diff --git a/boards/arm/custom_plank/Kconfig.board b/boards/vendor/custom_plank/Kconfig.custom_plank similarity index 66% rename from boards/arm/custom_plank/Kconfig.board rename to boards/vendor/custom_plank/Kconfig.custom_plank index 51cdc50..08c6e07 100644 --- a/boards/arm/custom_plank/Kconfig.board +++ b/boards/vendor/custom_plank/Kconfig.custom_plank @@ -2,5 +2,4 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_CUSTOM_PLANK - bool "Custom Plank Board" - depends on SOC_NRF52840_QIAA + select SOC_NRF52840_QIAA diff --git a/boards/arm/custom_plank/README.md b/boards/vendor/custom_plank/README.md similarity index 100% rename from boards/arm/custom_plank/README.md rename to boards/vendor/custom_plank/README.md diff --git a/boards/arm/custom_plank/board.cmake b/boards/vendor/custom_plank/board.cmake similarity index 100% rename from boards/arm/custom_plank/board.cmake rename to boards/vendor/custom_plank/board.cmake diff --git a/boards/vendor/custom_plank/board.yml b/boards/vendor/custom_plank/board.yml new file mode 100644 index 0000000..fde81e2 --- /dev/null +++ b/boards/vendor/custom_plank/board.yml @@ -0,0 +1,8 @@ +# Copyright (c) 2024 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +board: + name: custom_plank + vendor: vendor + socs: + - name: nrf52840 diff --git a/boards/arm/custom_plank/custom_plank-pinctrl.dtsi b/boards/vendor/custom_plank/custom_plank-pinctrl.dtsi similarity index 100% rename from boards/arm/custom_plank/custom_plank-pinctrl.dtsi rename to boards/vendor/custom_plank/custom_plank-pinctrl.dtsi diff --git a/boards/arm/custom_plank/custom_plank.dts b/boards/vendor/custom_plank/custom_plank.dts similarity index 100% rename from boards/arm/custom_plank/custom_plank.dts rename to boards/vendor/custom_plank/custom_plank.dts diff --git a/boards/arm/custom_plank/custom_plank.yaml b/boards/vendor/custom_plank/custom_plank.yaml similarity index 94% rename from boards/arm/custom_plank/custom_plank.yaml rename to boards/vendor/custom_plank/custom_plank.yaml index 071ba3d..1a057e0 100644 --- a/boards/arm/custom_plank/custom_plank.yaml +++ b/boards/vendor/custom_plank/custom_plank.yaml @@ -3,6 +3,7 @@ identifier: custom_plank name: Custom-Plank +vendor: vendor type: mcu arch: arm ram: 256 diff --git a/boards/arm/custom_plank/custom_plank_defconfig b/boards/vendor/custom_plank/custom_plank_defconfig similarity index 66% rename from boards/arm/custom_plank/custom_plank_defconfig rename to boards/vendor/custom_plank/custom_plank_defconfig index 02e28fe..5e5a7b7 100644 --- a/boards/arm/custom_plank/custom_plank_defconfig +++ b/boards/vendor/custom_plank/custom_plank_defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2021 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52840_QIAA=y -CONFIG_BOARD_CUSTOM_PLANK=y - CONFIG_ARM_MPU=y CONFIG_HW_STACK_PROTECTION=y