From ee1ce24a428876cbd3e9d12e5d6fc6b459bb5c65 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 2 Feb 2024 11:38:12 +0000 Subject: [PATCH] boards: arm: bbc_microbit: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- .../bbc_microbit/Kconfig.bbc_microbit} | 3 +-- .../arm => bbc}/bbc_microbit/Kconfig.defconfig | 3 --- .../bbc_microbit/bbc_microbit-pinctrl.dtsi | 0 .../arm => bbc}/bbc_microbit/bbc_microbit.dts | 0 .../arm => bbc}/bbc_microbit/bbc_microbit.yaml | 0 .../arm => bbc}/bbc_microbit/bbc_microbit_defconfig | 12 ++++-------- .../arm => bbc}/bbc_microbit/board.cmake | 0 .../{boards_legacy/arm => bbc}/bbc_microbit/board.h | 0 boards/bbc/bbc_microbit/board.yml | 3 +++ .../bbc_microbit/doc/img/bbc_microbit.jpg | Bin .../arm => bbc}/bbc_microbit/doc/index.rst | 0 .../arm => bbc}/bbc_microbit/pre_dt_board.cmake | 0 boards/bbc/bbc_microbit_v2/board.yml | 2 +- boards/laird_connect/rm1xx_dvk/board.yml | 2 ++ 14 files changed, 11 insertions(+), 14 deletions(-) rename boards/{boards_legacy/arm/bbc_microbit/Kconfig.board => bbc/bbc_microbit/Kconfig.bbc_microbit} (74%) rename boards/{boards_legacy/arm => bbc}/bbc_microbit/Kconfig.defconfig (88%) rename boards/{boards_legacy/arm => bbc}/bbc_microbit/bbc_microbit-pinctrl.dtsi (100%) rename boards/{boards_legacy/arm => bbc}/bbc_microbit/bbc_microbit.dts (100%) rename boards/{boards_legacy/arm => bbc}/bbc_microbit/bbc_microbit.yaml (100%) rename boards/{boards_legacy/arm => bbc}/bbc_microbit/bbc_microbit_defconfig (55%) rename boards/{boards_legacy/arm => bbc}/bbc_microbit/board.cmake (100%) rename boards/{boards_legacy/arm => bbc}/bbc_microbit/board.h (100%) create mode 100644 boards/bbc/bbc_microbit/board.yml rename boards/{boards_legacy/arm => bbc}/bbc_microbit/doc/img/bbc_microbit.jpg (100%) rename boards/{boards_legacy/arm => bbc}/bbc_microbit/doc/index.rst (100%) rename boards/{boards_legacy/arm => bbc}/bbc_microbit/pre_dt_board.cmake (100%) diff --git a/boards/boards_legacy/arm/bbc_microbit/Kconfig.board b/boards/bbc/bbc_microbit/Kconfig.bbc_microbit similarity index 74% rename from boards/boards_legacy/arm/bbc_microbit/Kconfig.board rename to boards/bbc/bbc_microbit/Kconfig.bbc_microbit index 758673ff32c..37fc2a5e24f 100644 --- a/boards/boards_legacy/arm/bbc_microbit/Kconfig.board +++ b/boards/bbc/bbc_microbit/Kconfig.bbc_microbit @@ -4,5 +4,4 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_BBC_MICROBIT - bool "BBC MICRO:BIT" - depends on SOC_NRF51822_QFAA + select SOC_NRF51822_QFAA diff --git a/boards/boards_legacy/arm/bbc_microbit/Kconfig.defconfig b/boards/bbc/bbc_microbit/Kconfig.defconfig similarity index 88% rename from boards/boards_legacy/arm/bbc_microbit/Kconfig.defconfig rename to boards/bbc/bbc_microbit/Kconfig.defconfig index 17decdb0abe..1f8bf5b8bc7 100644 --- a/boards/boards_legacy/arm/bbc_microbit/Kconfig.defconfig +++ b/boards/bbc/bbc_microbit/Kconfig.defconfig @@ -5,9 +5,6 @@ if BOARD_BBC_MICROBIT -config BOARD - default "bbc_microbit" - config BT_CTLR default BT diff --git a/boards/boards_legacy/arm/bbc_microbit/bbc_microbit-pinctrl.dtsi b/boards/bbc/bbc_microbit/bbc_microbit-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/bbc_microbit/bbc_microbit-pinctrl.dtsi rename to boards/bbc/bbc_microbit/bbc_microbit-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/bbc_microbit/bbc_microbit.dts b/boards/bbc/bbc_microbit/bbc_microbit.dts similarity index 100% rename from boards/boards_legacy/arm/bbc_microbit/bbc_microbit.dts rename to boards/bbc/bbc_microbit/bbc_microbit.dts diff --git a/boards/boards_legacy/arm/bbc_microbit/bbc_microbit.yaml b/boards/bbc/bbc_microbit/bbc_microbit.yaml similarity index 100% rename from boards/boards_legacy/arm/bbc_microbit/bbc_microbit.yaml rename to boards/bbc/bbc_microbit/bbc_microbit.yaml diff --git a/boards/boards_legacy/arm/bbc_microbit/bbc_microbit_defconfig b/boards/bbc/bbc_microbit/bbc_microbit_defconfig similarity index 55% rename from boards/boards_legacy/arm/bbc_microbit/bbc_microbit_defconfig rename to boards/bbc/bbc_microbit/bbc_microbit_defconfig index 8396a17b16f..6bff8b91228 100644 --- a/boards/boards_legacy/arm/bbc_microbit/bbc_microbit_defconfig +++ b/boards/bbc/bbc_microbit/bbc_microbit_defconfig @@ -1,19 +1,15 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NRF51X=y -CONFIG_SOC_NRF51822_QFAA=y -CONFIG_BOARD_BBC_MICROBIT=y - -# enable GPIO +# Enable GPIO CONFIG_GPIO=y -# clock control +# Clock control CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y CONFIG_CLOCK_CONTROL_NRF_K32SRC_250PPM=y -# enable uart driver +# Enable uart driver CONFIG_SERIAL=y -# enable console +# Enable console CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/boards_legacy/arm/bbc_microbit/board.cmake b/boards/bbc/bbc_microbit/board.cmake similarity index 100% rename from boards/boards_legacy/arm/bbc_microbit/board.cmake rename to boards/bbc/bbc_microbit/board.cmake diff --git a/boards/boards_legacy/arm/bbc_microbit/board.h b/boards/bbc/bbc_microbit/board.h similarity index 100% rename from boards/boards_legacy/arm/bbc_microbit/board.h rename to boards/bbc/bbc_microbit/board.h diff --git a/boards/bbc/bbc_microbit/board.yml b/boards/bbc/bbc_microbit/board.yml new file mode 100644 index 00000000000..3fa20e09324 --- /dev/null +++ b/boards/bbc/bbc_microbit/board.yml @@ -0,0 +1,3 @@ +board: + name: bbc_microbit + vendor: BBC diff --git a/boards/boards_legacy/arm/bbc_microbit/doc/img/bbc_microbit.jpg b/boards/bbc/bbc_microbit/doc/img/bbc_microbit.jpg similarity index 100% rename from boards/boards_legacy/arm/bbc_microbit/doc/img/bbc_microbit.jpg rename to boards/bbc/bbc_microbit/doc/img/bbc_microbit.jpg diff --git a/boards/boards_legacy/arm/bbc_microbit/doc/index.rst b/boards/bbc/bbc_microbit/doc/index.rst similarity index 100% rename from boards/boards_legacy/arm/bbc_microbit/doc/index.rst rename to boards/bbc/bbc_microbit/doc/index.rst diff --git a/boards/boards_legacy/arm/bbc_microbit/pre_dt_board.cmake b/boards/bbc/bbc_microbit/pre_dt_board.cmake similarity index 100% rename from boards/boards_legacy/arm/bbc_microbit/pre_dt_board.cmake rename to boards/bbc/bbc_microbit/pre_dt_board.cmake diff --git a/boards/bbc/bbc_microbit_v2/board.yml b/boards/bbc/bbc_microbit_v2/board.yml index e582b1aa09a..6b8c8055b72 100644 --- a/boards/bbc/bbc_microbit_v2/board.yml +++ b/boards/bbc/bbc_microbit_v2/board.yml @@ -2,4 +2,4 @@ board: name: bbc_microbit_v2 vendor: BBC socs: - - name: nrf51822 + - name: nrf52833 diff --git a/boards/laird_connect/rm1xx_dvk/board.yml b/boards/laird_connect/rm1xx_dvk/board.yml index 302a3964228..fea95b9e9f6 100644 --- a/boards/laird_connect/rm1xx_dvk/board.yml +++ b/boards/laird_connect/rm1xx_dvk/board.yml @@ -1,3 +1,5 @@ board: name: rm1xx_dvk vendor: Laird Connectivity + socs: + - name: nrf51822