Adopting nRF SoC and boards to HWMv2

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

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2017 Linaro Limited
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <nordic/nrf51822_qfac.dtsi>
+#include "96b_carbon_nrf51822-pinctrl.dtsi"
+
+/ {
+	model = "Seeed Studio Carbon nRF51 96board";
+	compatible = "seeed,carbon_nrf51";
+
+	chosen {
+		zephyr,console = &uart0;
+		zephyr,shell-uart = &uart0;
+		zephyr,bt-mon-uart = &uart0;
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+	};
+
+	aliases {
+		watchdog0 = &wdt0;
+	};
+};
+
+&gpiote {
+	status = "okay";
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&i2c0 {
+	status = "okay";
+	pinctrl-0 = <&i2c0_default>;
+	pinctrl-1 = <&i2c0_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+&uart0 {
+	current-speed = <115200>;
+	status = "okay";
+	pinctrl-0 = <&uart0_default>;
+	pinctrl-1 = <&uart0_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+&spi1 {
+	compatible = "nordic,nrf-spis";
+	status = "okay";
+	def-char = <0x00>;
+
+	pinctrl-0 = <&spi1_default>;
+	pinctrl-names = "default";
+	bt-hci@0 {
+		compatible = "zephyr,bt-hci-spi-slave";
+		reg = <0>;
+		irq-gpios = <&gpio0 28 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
+	};
+};

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

@@ -0,0 +1,13 @@
+identifier: 96b_carbon/nrf51822
+name: 96Boards Carbon (nRF51)
+type: mcu
+arch: arm
+ram: 32
+flash: 256
+toolchain:
+  - zephyr
+  - gnuarmemb
+  - xtools
+supported:
+  - ble
+vendor: seeed

boards/96boards/96b_carbon/96b_carbon_nrf51822_defconfig

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

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

@@ -0,0 +1,18 @@
+identifier: 96b_carbon/stm32f401xe
+name: 96Boards Carbon
+type: mcu
+arch: arm
+toolchain:
+  - zephyr
+  - gnuarmemb
+  - xtools
+supported:
+  - gpio
+  - ble
+  - i2c
+  - counter
+  - spi
+  - usb_device
+ram: 96
+flash: 512
+vendor: 96boards

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

@@ -2,4 +2,5 @@ board:
   name: 96b_carbon
   vendor: 96boards
   socs:
-    - name: stm32f401xe
+  - name: stm32f401xe
+  - name: nrf51822