boards: update nRF51dk board to board scheme v2.

This commit updates nrf51dk_nrf51422 to use board scheme v2, and thus becomes board nrf51dk with the SoC nrf51422. It also uses the new SoC approach, and thereby ensuring that the right SoC is always used, and cannot accidentially be changed by the user. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
zephyrproject-rtos · Dec 20, 2023 · 5f87b4f · 5f87b4f
1 parent e54b95d
commit 5f87b4f
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 15 deletions.
diff --git a/boards/arm/nrf51dk_nrf51422/Kconfig.board b/boards/arm/nrf51dk_nrf51422/Kconfig.board
diff --git a/...ds/arm/nrf51dk_nrf51422/Kconfig.defconfig → ...s/v2/nordic_nrf/nrf51dk/Kconfig.defconfig b/...ds/arm/nrf51dk_nrf51422/Kconfig.defconfig → ...s/v2/nordic_nrf/nrf51dk/Kconfig.defconfig
@@ -5,9 +5,6 @@
 
 if BOARD_NRF51DK_NRF51422
 
-config BOARD
-	default "nrf51dk_nrf51422"
-
 config BT_CTLR
 	default BT
 

diff --git a/boards/v2/nordic_nrf/nrf51dk/Kconfig.nrf51dk b/boards/v2/nordic_nrf/nrf51dk/Kconfig.nrf51dk
@@ -0,0 +1,9 @@
+# Copyright (c) 2023 Nordic Semiconductor ASA
+
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_NRF51DK
+	bool
+	default y
+	select SOC_SERIES_NRF51X
+	select SOC_NRF51822_QFAC
diff --git a/boards/arm/nrf51dk_nrf51422/board.cmake → boards/v2/nordic_nrf/nrf51dk/board.cmake b/boards/arm/nrf51dk_nrf51422/board.cmake → boards/v2/nordic_nrf/nrf51dk/board.cmake
diff --git a/boards/v2/nordic_nrf/nrf51dk/board.yml b/boards/v2/nordic_nrf/nrf51dk/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: nrf51dk
+  vendor: Nordic Semiconductor
+  socs:
+  - name: nrf51422
diff --git a/...1dk_nrf51422/doc/img/nrf51dk_nrf51422.jpg → ..._nrf/nrf51dk/doc/img/nrf51dk_nrf51422.jpg b/...1dk_nrf51422/doc/img/nrf51dk_nrf51422.jpg → ..._nrf/nrf51dk/doc/img/nrf51dk_nrf51422.jpg
diff --git a/boards/arm/nrf51dk_nrf51422/doc/index.rst → boards/v2/nordic_nrf/nrf51dk/doc/index.rst b/boards/arm/nrf51dk_nrf51422/doc/index.rst → boards/v2/nordic_nrf/nrf51dk/doc/index.rst
diff --git a/...dk_nrf51422/nrf51dk_nrf51422-pinctrl.dtsi → ...nrf/nrf51dk/nrf51dk_nrf51422-pinctrl.dtsi b/...dk_nrf51422/nrf51dk_nrf51422-pinctrl.dtsi → ...nrf/nrf51dk/nrf51dk_nrf51422-pinctrl.dtsi
diff --git a/...arm/nrf51dk_nrf51422/nrf51dk_nrf51422.dts → ...2/nordic_nrf/nrf51dk/nrf51dk_nrf51422.dts b/...arm/nrf51dk_nrf51422/nrf51dk_nrf51422.dts → ...2/nordic_nrf/nrf51dk/nrf51dk_nrf51422.dts
diff --git a/...rm/nrf51dk_nrf51422/nrf51dk_nrf51422.yaml → .../nordic_nrf/nrf51dk/nrf51dk_nrf51422.yaml b/...rm/nrf51dk_nrf51422/nrf51dk_nrf51422.yaml → .../nordic_nrf/nrf51dk/nrf51dk_nrf51422.yaml
diff --git a/...f51dk_nrf51422/nrf51dk_nrf51422_defconfig → ...ic_nrf/nrf51dk/nrf51dk_nrf51422_defconfig b/...f51dk_nrf51422/nrf51dk_nrf51422_defconfig → ...ic_nrf/nrf51dk/nrf51dk_nrf51422_defconfig
@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_NRF51X=y
-CONFIG_SOC_NRF51822_QFAC=y
-CONFIG_BOARD_NRF51DK_NRF51422=y
-
 # enable GPIO
 CONFIG_GPIO=y
 

diff --git a/...s/arm/nrf51dk_nrf51422/pre_dt_board.cmake → .../v2/nordic_nrf/nrf51dk/pre_dt_board.cmake b/...s/arm/nrf51dk_nrf51422/pre_dt_board.cmake → .../v2/nordic_nrf/nrf51dk/pre_dt_board.cmake