boards: arm: 96b_carbon_nrf51: Convert to v2

Converts the board to hwmv2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>

boards/96boards/96b_carbon/96b_carbon_nrf51822.dts

@@ -6,7 +6,7 @@
 
 /dts-v1/;
 #include <nordic/nrf51822_qfac.dtsi>
-#include "96b_carbon_nrf51-pinctrl.dtsi"
+#include "96b_carbon_nrf51822-pinctrl.dtsi"
 
 / {
 	model = "Seeed Studio Carbon nRF51 96board";

boards/96boards/96b_carbon/96b_carbon_nrf51822.yaml

@@ -1,4 +1,4 @@
-identifier: 96b_carbon_nrf51
+identifier: 96b_carbon/nrf51822
 name: 96Boards Carbon (nRF51)
 type: mcu
 arch: arm

boards/96boards/96b_carbon/96b_carbon_nrf51822_defconfig

@@ -1,14 +1,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_NRF51X=y
+# Enable GPIO
-CONFIG_SOC_NRF51822_QFAC=y
-
-# enable GPIO
 CONFIG_GPIO=y
 
-# enable uart driver
+# Enable UART driver
 CONFIG_SERIAL=y
 
-# enable console
+# Enable console
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y

boards/96boards/96b_carbon/96b_carbon_stm32f401xe.yaml

@@ -1,4 +1,4 @@
-identifier: 96b_carbon
+identifier: 96b_carbon/stm32f401xe
 name: 96Boards Carbon
 type: mcu
 arch: arm

boards/96boards/96b_carbon/Kconfig.96b_carbon

@@ -1,5 +1,10 @@
 # Copyright (c) 2016 Linaro Limited.
 # SPDX-License-Identifier: Apache-2.0
 
-config BOARD_96B_CARBON
+config BOARD_96B_CARBON_STM32F401XE
+	bool
 	select SOC_STM32F401XE
+
+config BOARD_96B_CARBON_NRF51822
+	bool
+	select SOC_NRF51822_QFAC

boards/96boards/96b_carbon/Kconfig.defconfig

@@ -3,7 +3,7 @@
 # Copyright (c) 2016 Linaro Limited.
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_96B_CARBON
+if BOARD_96B_CARBON_STM32F401XE
 
 config SPI_STM32_INTERRUPT
 	default y
@@ -51,4 +51,11 @@ config NET_L2_BT_ZEP1656
 
 endif # NETWORKING
 
-endif # BOARD_96B_CARBON
+endif # BOARD_96B_CARBON_STM32F401XE
+
+if BOARD_96B_CARBON_NRF51822
+
+config BT_CTLR
+	default BT
+
+endif # BOARD_96B_CARBON_NRF51822

boards/96boards/96b_carbon/board.cmake

@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
-board_runner_args(dfu-util "--pid=0483:df11" "--alt=0" "--dfuse")
+if(CONFIG_BOARD_96B_CARBON_STM32F401XE)
+  board_runner_args(dfu-util "--pid=0483:df11" "--alt=0" "--dfuse")
 
-include(${ZEPHYR_BASE}/boards/common/dfu-util.board.cmake)
+  include(${ZEPHYR_BASE}/boards/common/dfu-util.board.cmake)
+endif()

boards/96boards/96b_carbon/board.yml

@@ -3,3 +3,4 @@ board:
   vendor: 96boards
   socs:
   - name: stm32f401xe
+  - name: nrf51822

boards/96boards/96b_carbon/doc/nrf51822.rst

@@ -49,9 +49,8 @@ Supported Features
 | RADIO     | on-chip    | Bluetooth                           |
 +-----------+------------+-------------------------------------+
 
-The default configuration can be found in the defconfig file:
+The default configuration can be found in
-
+:zephyr_file:`boards/96boards/96b_carbon/96b_carbon_nrf51822_defconfig`
-        ``boards/arm/96b_carbon_nrf51/96b_carbon_nrf51_defconfig``
 
 Connections and IOs
 ===================
@@ -135,12 +134,12 @@ on the board and attach a wire to the nRF51822's UART output.
 Providing Bluetooth to 96b_carbon
 *********************************
 
-This 96b_carbon_nrf51 Zephyr configuration can be used to provide
+This ``96b_carbon/nrf51822`` Zephyr board configuration can be used to provide
 Bluetooth functionality from the secondary nRF51822 chip to the
 primary STM32F401RE chip on the :ref:`96b_carbon_board`.
 
 To do this, build the ``samples/bluetooth/hci_spi/`` application
-provided with Zephyr with ``BOARD=96b_carbon_nrf51``, then flash it to
+provided with Zephyr with ``BOARD=96b_carbon/nrf51822``, then flash it to
 the nRF51822 chip using the instructions :ref:`above
 <96b_carbon_nrf51_programming>`. (For instructions on how to build a
 Zephyr application, see :ref:`build_an_application`.)

boards/96boards/96b_carbon/doc/stm32f401xe.rst

@@ -15,13 +15,13 @@ the Cortex-M4 CPU over SPI for Bluetooth LE connectivity.  Even though
 both chips exist on the same physical board, they must be programmed
 separately:
 
-- The ``96b_carbon`` configuration is used when developing programs for
+- The ``96b_carbon/stm32f401xe`` configuration is used when developing programs for
   the main chip on the board, the STM32F401RET. Users will likely want to
   write applications targeting this chip, using the ``96b_carbon``
   configuration, since it is connected to all of the breakout
   I/O headers.
 
-- The ``96b_carbon_nrf51`` configuration should be used for programming
+- The ``96b_carbon/nrf51822`` configuration should be used for programming
   the secondary nRF51822 chip. Most users will likely not develop
   applications for this chip, since Zephyr already provides a
   sample application that can be flashed onto the nRF51822
@@ -73,8 +73,8 @@ More information about STM32F401RE can be found here:
 Supported Features
 ==================
 
-The Zephyr 96b_carbon board configuration supports the following hardware
+The Zephyr ``96b_carbon/stm32f401xe`` board configuration supports the following
-features:
+hardware features:
 
 +------------+------------+-------------------------------------+
 | Interface  | Controller | Driver/Component                    |
@@ -303,7 +303,7 @@ Then build and flash an application. Here is an example for the
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: 96b_carbon
+   :board: 96b_carbon/stm32f401xe
    :goals: build flash
 
 Connect the micro-USB cable to the USB UART (FTDI) port and to your computer.
@@ -344,7 +344,7 @@ in general, see :ref:`build_an_application`.
 
    .. zephyr-app-commands::
       :zephyr-app: samples/bluetooth/ipsp
-      :board: 96b_carbon
+      :board: 96b_carbon/stm32f401xe
       :goals: build flash
 
 #. Refer to the instructions in :ref:`bluetooth-ipsp-sample` for how
@@ -357,7 +357,7 @@ further Bluetooth application development.
 Debugging
 =========
 
-The 96b_carbon can be debugged by installing a 100 mil (0.1 inch) header
+The ``96b_carbon/stm32f401xe`` board can be debugged by installing a 100 mil (0.1 inch) header
 into the header at the bottom right hand side of the board, and
 attaching an SWD debugger to the 3V3 (3.3V), GND, CLK, DIO, and RST
 pins on that header. Then apply power to the 96Boards Carbon via one

boards/96boards/96b_carbon/pre_dt_board.cmake

@@ -0,0 +1,8 @@
+# Copyright (c) 2022 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+if("${BOARD_IDENTIFIER}" STREQUAL "/nrf51822")
+  # Suppress "unique_unit_address_if_enabled" to handle the following overlaps:
+  # - power@40000000 & clock@40000000 & nrf-mpu@40000000
+  list(APPEND EXTRA_DTC_FLAGS "-Wno-unique_unit_address_if_enabled")
+endif()

boards/boards_legacy/arm/96b_carbon_nrf51/Kconfig.board

@@ -1,8 +0,0 @@
-# 96Boards Carbon nRF51 board configuration
-
-# Copyright (c) 2016, 2017 Linaro Limited.
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_96B_CARBON_NRF51
-	bool "96Boards Carbon (nRF51)"
-	depends on SOC_NRF51822_QFAC

boards/boards_legacy/arm/96b_carbon_nrf51/Kconfig.defconfig

@@ -1,14 +0,0 @@
-# 96Boards Carbon nRF51 board default configuration
-
-# Copyright (c) 2016, 2017 Linaro Limited.
-# SPDX-License-Identifier: Apache-2.0
-
-if BOARD_96B_CARBON_NRF51
-
-config BOARD
-	default "96b_carbon_nrf51"
-
-config BT_CTLR
-	default BT
-
-endif # BOARD_96B_CARBON_NRF51

boards/boards_legacy/arm/96b_carbon_nrf51/pre_dt_board.cmake

@@ -1,6 +0,0 @@
-# Copyright (c) 2022 Nordic Semiconductor
-# SPDX-License-Identifier: Apache-2.0
-
-# Suppress "unique_unit_address_if_enabled" to handle the following overlaps:
-# - power@40000000 & clock@40000000 & nrf-mpu@40000000
-list(APPEND EXTRA_DTC_FLAGS "-Wno-unique_unit_address_if_enabled")