From 1952d559f2b8c674b4f12beef00e9ba6df4d483e Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 2 Feb 2024 11:38:12 +0000 Subject: [PATCH] boards: arm: rm1xx_dvk: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- .../rm1xx_dvk/Kconfig.defconfig | 3 --- .../rm1xx_dvk/Kconfig.rm1xx_dvk} | 3 +-- .../arm => laird_connect}/rm1xx_dvk/board.cmake | 0 boards/laird_connect/rm1xx_dvk/board.yml | 3 +++ .../rm1xx_dvk/doc/img/RM186-DVK.jpg | Bin .../rm1xx_dvk/doc/img/RM186-SM.jpg | Bin .../arm => laird_connect}/rm1xx_dvk/doc/index.rst | 0 .../rm1xx_dvk/pre_dt_board.cmake | 0 .../rm1xx_dvk/rm1xx_dvk-pinctrl.dtsi | 0 .../arm => laird_connect}/rm1xx_dvk/rm1xx_dvk.dts | 0 .../arm => laird_connect}/rm1xx_dvk/rm1xx_dvk.yaml | 0 .../rm1xx_dvk/rm1xx_dvk_defconfig | 4 ---- boards/particle/nrf51_blenano/board.yml | 2 ++ 13 files changed, 6 insertions(+), 9 deletions(-) rename boards/{boards_legacy/arm => laird_connect}/rm1xx_dvk/Kconfig.defconfig (84%) rename boards/{boards_legacy/arm/rm1xx_dvk/Kconfig.board => laird_connect/rm1xx_dvk/Kconfig.rm1xx_dvk} (73%) rename boards/{boards_legacy/arm => laird_connect}/rm1xx_dvk/board.cmake (100%) create mode 100644 boards/laird_connect/rm1xx_dvk/board.yml rename boards/{boards_legacy/arm => laird_connect}/rm1xx_dvk/doc/img/RM186-DVK.jpg (100%) rename boards/{boards_legacy/arm => laird_connect}/rm1xx_dvk/doc/img/RM186-SM.jpg (100%) rename boards/{boards_legacy/arm => laird_connect}/rm1xx_dvk/doc/index.rst (100%) rename boards/{boards_legacy/arm => laird_connect}/rm1xx_dvk/pre_dt_board.cmake (100%) rename boards/{boards_legacy/arm => laird_connect}/rm1xx_dvk/rm1xx_dvk-pinctrl.dtsi (100%) rename boards/{boards_legacy/arm => laird_connect}/rm1xx_dvk/rm1xx_dvk.dts (100%) rename boards/{boards_legacy/arm => laird_connect}/rm1xx_dvk/rm1xx_dvk.yaml (100%) rename boards/{boards_legacy/arm => laird_connect}/rm1xx_dvk/rm1xx_dvk_defconfig (69%) diff --git a/boards/boards_legacy/arm/rm1xx_dvk/Kconfig.defconfig b/boards/laird_connect/rm1xx_dvk/Kconfig.defconfig similarity index 84% rename from boards/boards_legacy/arm/rm1xx_dvk/Kconfig.defconfig rename to boards/laird_connect/rm1xx_dvk/Kconfig.defconfig index 22a717477d2..01cbc05ee78 100644 --- a/boards/boards_legacy/arm/rm1xx_dvk/Kconfig.defconfig +++ b/boards/laird_connect/rm1xx_dvk/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_RM1XX_DVK -config BOARD - default "rm1xx_dvk" - config BT_CTLR default BT diff --git a/boards/boards_legacy/arm/rm1xx_dvk/Kconfig.board b/boards/laird_connect/rm1xx_dvk/Kconfig.rm1xx_dvk similarity index 73% rename from boards/boards_legacy/arm/rm1xx_dvk/Kconfig.board rename to boards/laird_connect/rm1xx_dvk/Kconfig.rm1xx_dvk index f5c1f23b932..ead49ede862 100644 --- a/boards/boards_legacy/arm/rm1xx_dvk/Kconfig.board +++ b/boards/laird_connect/rm1xx_dvk/Kconfig.rm1xx_dvk @@ -4,5 +4,4 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_RM1XX_DVK - bool "RM1XX_DVK" - depends on SOC_NRF51822_QFAC + select SOC_NRF51822_QFAC diff --git a/boards/boards_legacy/arm/rm1xx_dvk/board.cmake b/boards/laird_connect/rm1xx_dvk/board.cmake similarity index 100% rename from boards/boards_legacy/arm/rm1xx_dvk/board.cmake rename to boards/laird_connect/rm1xx_dvk/board.cmake diff --git a/boards/laird_connect/rm1xx_dvk/board.yml b/boards/laird_connect/rm1xx_dvk/board.yml new file mode 100644 index 00000000000..302a3964228 --- /dev/null +++ b/boards/laird_connect/rm1xx_dvk/board.yml @@ -0,0 +1,3 @@ +board: + name: rm1xx_dvk + vendor: Laird Connectivity diff --git a/boards/boards_legacy/arm/rm1xx_dvk/doc/img/RM186-DVK.jpg b/boards/laird_connect/rm1xx_dvk/doc/img/RM186-DVK.jpg similarity index 100% rename from boards/boards_legacy/arm/rm1xx_dvk/doc/img/RM186-DVK.jpg rename to boards/laird_connect/rm1xx_dvk/doc/img/RM186-DVK.jpg diff --git a/boards/boards_legacy/arm/rm1xx_dvk/doc/img/RM186-SM.jpg b/boards/laird_connect/rm1xx_dvk/doc/img/RM186-SM.jpg similarity index 100% rename from boards/boards_legacy/arm/rm1xx_dvk/doc/img/RM186-SM.jpg rename to boards/laird_connect/rm1xx_dvk/doc/img/RM186-SM.jpg diff --git a/boards/boards_legacy/arm/rm1xx_dvk/doc/index.rst b/boards/laird_connect/rm1xx_dvk/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/rm1xx_dvk/doc/index.rst rename to boards/laird_connect/rm1xx_dvk/doc/index.rst diff --git a/boards/boards_legacy/arm/rm1xx_dvk/pre_dt_board.cmake b/boards/laird_connect/rm1xx_dvk/pre_dt_board.cmake similarity index 100% rename from boards/boards_legacy/arm/rm1xx_dvk/pre_dt_board.cmake rename to boards/laird_connect/rm1xx_dvk/pre_dt_board.cmake diff --git a/boards/boards_legacy/arm/rm1xx_dvk/rm1xx_dvk-pinctrl.dtsi b/boards/laird_connect/rm1xx_dvk/rm1xx_dvk-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/rm1xx_dvk/rm1xx_dvk-pinctrl.dtsi rename to boards/laird_connect/rm1xx_dvk/rm1xx_dvk-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/rm1xx_dvk/rm1xx_dvk.dts b/boards/laird_connect/rm1xx_dvk/rm1xx_dvk.dts similarity index 100% rename from boards/boards_legacy/arm/rm1xx_dvk/rm1xx_dvk.dts rename to boards/laird_connect/rm1xx_dvk/rm1xx_dvk.dts diff --git a/boards/boards_legacy/arm/rm1xx_dvk/rm1xx_dvk.yaml b/boards/laird_connect/rm1xx_dvk/rm1xx_dvk.yaml similarity index 100% rename from boards/boards_legacy/arm/rm1xx_dvk/rm1xx_dvk.yaml rename to boards/laird_connect/rm1xx_dvk/rm1xx_dvk.yaml diff --git a/boards/boards_legacy/arm/rm1xx_dvk/rm1xx_dvk_defconfig b/boards/laird_connect/rm1xx_dvk/rm1xx_dvk_defconfig similarity index 69% rename from boards/boards_legacy/arm/rm1xx_dvk/rm1xx_dvk_defconfig rename to boards/laird_connect/rm1xx_dvk/rm1xx_dvk_defconfig index cee5bb0b4a0..46dc69d74cd 100644 --- a/boards/boards_legacy/arm/rm1xx_dvk/rm1xx_dvk_defconfig +++ b/boards/laird_connect/rm1xx_dvk/rm1xx_dvk_defconfig @@ -1,9 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF51X=y -CONFIG_SOC_NRF51822_QFAC=y -CONFIG_BOARD_RM1XX_DVK=y - # enable GPIO CONFIG_GPIO=y diff --git a/boards/particle/nrf51_blenano/board.yml b/boards/particle/nrf51_blenano/board.yml index a52b576a2ce..8d67411a490 100644 --- a/boards/particle/nrf51_blenano/board.yml +++ b/boards/particle/nrf51_blenano/board.yml @@ -1,3 +1,5 @@ board: name: nrf51_blenano vendor: Particle Industries + socs: + - name: nrf51822