From a6289516e41372ffd04d5f6ecec45717a98e50ab Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 2 Feb 2024 11:38:08 +0000 Subject: [PATCH] boards: arm: 96b_nitrogen: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- .../arm => 96boards}/96b_nitrogen/96b_lscon.dtsi | 0 .../96b_nitrogen/96b_nitrogen-pinctrl.dtsi | 0 .../arm => 96boards}/96b_nitrogen/96b_nitrogen.dts | 0 .../arm => 96boards}/96b_nitrogen/96b_nitrogen.yaml | 0 .../96b_nitrogen/96b_nitrogen_defconfig | 3 --- .../96b_nitrogen/Kconfig.96b_nitrogen} | 3 +-- .../arm => 96boards}/96b_nitrogen/Kconfig.defconfig | 3 --- .../arm => 96boards}/96b_nitrogen/board.cmake | 0 boards/96boards/96b_nitrogen/board.yml | 3 +++ .../96b_nitrogen/doc/img/96b_nitrogen.jpg | Bin .../arm => 96boards}/96b_nitrogen/doc/index.rst | 2 +- .../96b_nitrogen/pre_dt_board.cmake | 0 boards/boards_legacy/arm/96b_nitrogen/Kconfig | 8 -------- boards/particle/nrf52_blenano2/board.yml | 2 ++ 14 files changed, 7 insertions(+), 17 deletions(-) rename boards/{boards_legacy/arm => 96boards}/96b_nitrogen/96b_lscon.dtsi (100%) rename boards/{boards_legacy/arm => 96boards}/96b_nitrogen/96b_nitrogen-pinctrl.dtsi (100%) rename boards/{boards_legacy/arm => 96boards}/96b_nitrogen/96b_nitrogen.dts (100%) rename boards/{boards_legacy/arm => 96boards}/96b_nitrogen/96b_nitrogen.yaml (100%) rename boards/{boards_legacy/arm => 96boards}/96b_nitrogen/96b_nitrogen_defconfig (77%) rename boards/{boards_legacy/arm/96b_nitrogen/Kconfig.board => 96boards/96b_nitrogen/Kconfig.96b_nitrogen} (71%) rename boards/{boards_legacy/arm => 96boards}/96b_nitrogen/Kconfig.defconfig (84%) rename boards/{boards_legacy/arm => 96boards}/96b_nitrogen/board.cmake (100%) create mode 100644 boards/96boards/96b_nitrogen/board.yml rename boards/{boards_legacy/arm => 96boards}/96b_nitrogen/doc/img/96b_nitrogen.jpg (100%) rename boards/{boards_legacy/arm => 96boards}/96b_nitrogen/doc/index.rst (99%) rename boards/{boards_legacy/arm => 96boards}/96b_nitrogen/pre_dt_board.cmake (100%) delete mode 100644 boards/boards_legacy/arm/96b_nitrogen/Kconfig diff --git a/boards/boards_legacy/arm/96b_nitrogen/96b_lscon.dtsi b/boards/96boards/96b_nitrogen/96b_lscon.dtsi similarity index 100% rename from boards/boards_legacy/arm/96b_nitrogen/96b_lscon.dtsi rename to boards/96boards/96b_nitrogen/96b_lscon.dtsi diff --git a/boards/boards_legacy/arm/96b_nitrogen/96b_nitrogen-pinctrl.dtsi b/boards/96boards/96b_nitrogen/96b_nitrogen-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/96b_nitrogen/96b_nitrogen-pinctrl.dtsi rename to boards/96boards/96b_nitrogen/96b_nitrogen-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/96b_nitrogen/96b_nitrogen.dts b/boards/96boards/96b_nitrogen/96b_nitrogen.dts similarity index 100% rename from boards/boards_legacy/arm/96b_nitrogen/96b_nitrogen.dts rename to boards/96boards/96b_nitrogen/96b_nitrogen.dts diff --git a/boards/boards_legacy/arm/96b_nitrogen/96b_nitrogen.yaml b/boards/96boards/96b_nitrogen/96b_nitrogen.yaml similarity index 100% rename from boards/boards_legacy/arm/96b_nitrogen/96b_nitrogen.yaml rename to boards/96boards/96b_nitrogen/96b_nitrogen.yaml diff --git a/boards/boards_legacy/arm/96b_nitrogen/96b_nitrogen_defconfig b/boards/96boards/96b_nitrogen/96b_nitrogen_defconfig similarity index 77% rename from boards/boards_legacy/arm/96b_nitrogen/96b_nitrogen_defconfig rename to boards/96boards/96b_nitrogen/96b_nitrogen_defconfig index b8565973eb1..7167aca850a 100644 --- a/boards/boards_legacy/arm/96b_nitrogen/96b_nitrogen_defconfig +++ b/boards/96boards/96b_nitrogen/96b_nitrogen_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF52X=y -CONFIG_SOC_NRF52832_QFAA=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/boards_legacy/arm/96b_nitrogen/Kconfig.board b/boards/96boards/96b_nitrogen/Kconfig.96b_nitrogen similarity index 71% rename from boards/boards_legacy/arm/96b_nitrogen/Kconfig.board rename to boards/96boards/96b_nitrogen/Kconfig.96b_nitrogen index a771ff27019..7ae2b0710fb 100644 --- a/boards/boards_legacy/arm/96b_nitrogen/Kconfig.board +++ b/boards/96boards/96b_nitrogen/Kconfig.96b_nitrogen @@ -4,5 +4,4 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_96B_NITROGEN - bool "96Boards Nitrogen" - depends on SOC_NRF52832_QFAA + select SOC_NRF52832_QFAA diff --git a/boards/boards_legacy/arm/96b_nitrogen/Kconfig.defconfig b/boards/96boards/96b_nitrogen/Kconfig.defconfig similarity index 84% rename from boards/boards_legacy/arm/96b_nitrogen/Kconfig.defconfig rename to boards/96boards/96b_nitrogen/Kconfig.defconfig index 00ff29cb2bc..c1686a82539 100644 --- a/boards/boards_legacy/arm/96b_nitrogen/Kconfig.defconfig +++ b/boards/96boards/96b_nitrogen/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_96B_NITROGEN -config BOARD - default "96b_nitrogen" - config BT_CTLR default BT diff --git a/boards/boards_legacy/arm/96b_nitrogen/board.cmake b/boards/96boards/96b_nitrogen/board.cmake similarity index 100% rename from boards/boards_legacy/arm/96b_nitrogen/board.cmake rename to boards/96boards/96b_nitrogen/board.cmake diff --git a/boards/96boards/96b_nitrogen/board.yml b/boards/96boards/96b_nitrogen/board.yml new file mode 100644 index 00000000000..51f897f0a2e --- /dev/null +++ b/boards/96boards/96b_nitrogen/board.yml @@ -0,0 +1,3 @@ +board: + name: 96b_nitrogen + vendor: 96Boards diff --git a/boards/boards_legacy/arm/96b_nitrogen/doc/img/96b_nitrogen.jpg b/boards/96boards/96b_nitrogen/doc/img/96b_nitrogen.jpg similarity index 100% rename from boards/boards_legacy/arm/96b_nitrogen/doc/img/96b_nitrogen.jpg rename to boards/96boards/96b_nitrogen/doc/img/96b_nitrogen.jpg diff --git a/boards/boards_legacy/arm/96b_nitrogen/doc/index.rst b/boards/96boards/96b_nitrogen/doc/index.rst similarity index 99% rename from boards/boards_legacy/arm/96b_nitrogen/doc/index.rst rename to boards/96boards/96b_nitrogen/doc/index.rst index ea971f093a8..d5d353564b3 100644 --- a/boards/boards_legacy/arm/96b_nitrogen/doc/index.rst +++ b/boards/96boards/96b_nitrogen/doc/index.rst @@ -77,7 +77,7 @@ board hardware features. The default configuration can be found in the defconfig file: - ``boards/arm/96b_nitrogen/96b_nitrogen_defconfig`` + ``boards/96boards/96b_nitrogen/96b_nitrogen_defconfig`` Pin Mapping =========== diff --git a/boards/boards_legacy/arm/96b_nitrogen/pre_dt_board.cmake b/boards/96boards/96b_nitrogen/pre_dt_board.cmake similarity index 100% rename from boards/boards_legacy/arm/96b_nitrogen/pre_dt_board.cmake rename to boards/96boards/96b_nitrogen/pre_dt_board.cmake diff --git a/boards/boards_legacy/arm/96b_nitrogen/Kconfig b/boards/boards_legacy/arm/96b_nitrogen/Kconfig deleted file mode 100644 index acaec810c79..00000000000 --- a/boards/boards_legacy/arm/96b_nitrogen/Kconfig +++ /dev/null @@ -1,8 +0,0 @@ -# 96Boards NITROGEN board configuration - -# Copyright (c) 2016 Linaro Limited. -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_96B_NITROGEN - -endif # BOARD_96B_NITROGEN diff --git a/boards/particle/nrf52_blenano2/board.yml b/boards/particle/nrf52_blenano2/board.yml index 096016c53e2..7b9bf772ded 100644 --- a/boards/particle/nrf52_blenano2/board.yml +++ b/boards/particle/nrf52_blenano2/board.yml @@ -1,3 +1,5 @@ board: name: nrf52_blenano2 vendor: Particle Industries + socs: + - name: nrf52832