boards: arm: rpi_pico: Convert to v2

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
2 years ago · 8d3896caa4
17 changed files with 14 additions and 22 deletions
--- a/boards/arm/rpi_pico/Kconfig.board
+++ b/boards/arm/rpi_pico/Kconfig.board
@ -1,10 +0,0 @@
				@@ -1,10 +0,0 @@
-# Copyright (c) 2021 Yonatan Schachter
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_RPI_PICO
-	bool "Raspberry Pi Pico Board"
-	depends on SOC_RP2040
-
-config BOARD_RPI_PICO_W
-	bool "Raspberry Pi Pico W Board"
-	depends on SOC_RP2040
--- a/boards/v2/raspberry_pi/rpi_pico/Kconfig.defconfig
+++ b/boards/v2/raspberry_pi/rpi_pico/Kconfig.defconfig
@ -3,10 +3,6 @@
				@@ -3,10 +3,6 @@

 if BOARD_RPI_PICO || BOARD_RPI_PICO_W

-config BOARD
-	default "rpi_pico" if BOARD_RPI_PICO
-	default "rpi_pico_w" if BOARD_RPI_PICO_W
-
 config RP2_FLASH_W25Q080
 	default y

@ -15,7 +11,7 @@ if I2C_DW
				@@ -15,7 +11,7 @@ if I2C_DW
 config I2C_DW_CLOCK_SPEED
 	default 125

-endif #I2C_DW
+endif # I2C_DW

 config USB_SELF_POWERED
 	default n
--- a/boards/v2/raspberry_pi/rpi_pico/Kconfig.rpi_pico
+++ b/boards/v2/raspberry_pi/rpi_pico/Kconfig.rpi_pico
@ -0,0 +1,5 @@
				@@ -0,0 +1,5 @@
+# Copyright (c) 2021 Yonatan Schachter
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_RPI_PICO
+	select SOC_RP2040
--- a/boards/v2/raspberry_pi/rpi_pico/board.cmake
+++ b/boards/v2/raspberry_pi/rpi_pico/board.cmake
--- a/boards/v2/raspberry_pi/rpi_pico/board.yml
+++ b/boards/v2/raspberry_pi/rpi_pico/board.yml
@ -0,0 +1,7 @@
				@@ -0,0 +1,7 @@
+board:
+  name: rpi_pico
+  vendor: Raspberry Pi
+  socs:
+  - name: rp2040
+    variants:
+    - name: w
--- a/boards/v2/raspberry_pi/rpi_pico/doc/img/rpi_pico.jpg
+++ b/boards/v2/raspberry_pi/rpi_pico/doc/img/rpi_pico.jpg
--- a/boards/v2/raspberry_pi/rpi_pico/doc/img/rpi_pico_w.jpg
+++ b/boards/v2/raspberry_pi/rpi_pico/doc/img/rpi_pico_w.jpg
--- a/boards/v2/raspberry_pi/rpi_pico/doc/index.rst
+++ b/boards/v2/raspberry_pi/rpi_pico/doc/index.rst
--- a/boards/v2/raspberry_pi/rpi_pico/rpi_pico-common.dtsi
+++ b/boards/v2/raspberry_pi/rpi_pico/rpi_pico-common.dtsi
--- a/boards/v2/raspberry_pi/rpi_pico/rpi_pico-pinctrl.dtsi
+++ b/boards/v2/raspberry_pi/rpi_pico/rpi_pico-pinctrl.dtsi
--- a/boards/v2/raspberry_pi/rpi_pico/rpi_pico.dts
+++ b/boards/v2/raspberry_pi/rpi_pico/rpi_pico.dts
--- a/boards/v2/raspberry_pi/rpi_pico/rpi_pico.yaml
+++ b/boards/v2/raspberry_pi/rpi_pico/rpi_pico.yaml
--- a/boards/v2/raspberry_pi/rpi_pico/rpi_pico_defconfig
+++ b/boards/v2/raspberry_pi/rpi_pico/rpi_pico_defconfig
@ -1,6 +1,3 @@
				@@ -1,6 +1,3 @@
-CONFIG_SOC_SERIES_RP2XXX=y
-CONFIG_SOC_RP2040=y
-CONFIG_BOARD_RPI_PICO=y
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=125000000
 CONFIG_SERIAL=y
 CONFIG_CONSOLE=y
--- a/boards/v2/raspberry_pi/rpi_pico/rpi_pico_rp2040_w.dts
+++ b/boards/v2/raspberry_pi/rpi_pico/rpi_pico_rp2040_w.dts
--- a/boards/v2/raspberry_pi/rpi_pico/rpi_pico_rp2040_w.yaml
+++ b/boards/v2/raspberry_pi/rpi_pico/rpi_pico_rp2040_w.yaml
@ -1,4 +1,4 @@
				@@ -1,4 +1,4 @@
-identifier: rpi_pico_w
+identifier: rpi_pico//w
 name: RaspberryPi-Pico-w
 type: mcu
 arch: arm
--- a/boards/v2/raspberry_pi/rpi_pico/rpi_pico_rp2040_w_defconfig
+++ b/boards/v2/raspberry_pi/rpi_pico/rpi_pico_rp2040_w_defconfig
@ -1,6 +1,3 @@
				@@ -1,6 +1,3 @@
-CONFIG_SOC_SERIES_RP2XXX=y
-CONFIG_SOC_RP2040=y
-CONFIG_BOARD_RPI_PICO_W=y
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=125000000
 CONFIG_SERIAL=y
 CONFIG_CONSOLE=y
--- a/boards/v2/raspberry_pi/rpi_pico/support/openocd.cfg
+++ b/boards/v2/raspberry_pi/rpi_pico/support/openocd.cfg