From 8d3896caa4248be89c2c64141cc0e102aaab97f5 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Thu, 11 Jan 2024 10:12:55 +0000 Subject: [PATCH] boards: arm: rpi_pico: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- boards/arm/rpi_pico/Kconfig.board | 10 ---------- .../raspberry_pi}/rpi_pico/Kconfig.defconfig | 6 +----- boards/v2/raspberry_pi/rpi_pico/Kconfig.rpi_pico | 5 +++++ .../{arm => v2/raspberry_pi}/rpi_pico/board.cmake | 0 boards/v2/raspberry_pi/rpi_pico/board.yml | 7 +++++++ .../raspberry_pi}/rpi_pico/doc/img/rpi_pico.jpg | Bin .../raspberry_pi}/rpi_pico/doc/img/rpi_pico_w.jpg | Bin .../{arm => v2/raspberry_pi}/rpi_pico/doc/index.rst | 0 .../raspberry_pi}/rpi_pico/rpi_pico-common.dtsi | 0 .../raspberry_pi}/rpi_pico/rpi_pico-pinctrl.dtsi | 0 .../{arm => v2/raspberry_pi}/rpi_pico/rpi_pico.dts | 0 .../{arm => v2/raspberry_pi}/rpi_pico/rpi_pico.yaml | 0 .../raspberry_pi}/rpi_pico/rpi_pico_defconfig | 3 --- .../raspberry_pi/rpi_pico/rpi_pico_rp2040_w.dts} | 0 .../raspberry_pi/rpi_pico/rpi_pico_rp2040_w.yaml} | 2 +- .../rpi_pico/rpi_pico_rp2040_w_defconfig} | 3 --- .../raspberry_pi}/rpi_pico/support/openocd.cfg | 0 17 files changed, 14 insertions(+), 22 deletions(-) delete mode 100644 boards/arm/rpi_pico/Kconfig.board rename boards/{arm => v2/raspberry_pi}/rpi_pico/Kconfig.defconfig (72%) create mode 100644 boards/v2/raspberry_pi/rpi_pico/Kconfig.rpi_pico rename boards/{arm => v2/raspberry_pi}/rpi_pico/board.cmake (100%) create mode 100644 boards/v2/raspberry_pi/rpi_pico/board.yml rename boards/{arm => v2/raspberry_pi}/rpi_pico/doc/img/rpi_pico.jpg (100%) rename boards/{arm => v2/raspberry_pi}/rpi_pico/doc/img/rpi_pico_w.jpg (100%) rename boards/{arm => v2/raspberry_pi}/rpi_pico/doc/index.rst (100%) rename boards/{arm => v2/raspberry_pi}/rpi_pico/rpi_pico-common.dtsi (100%) rename boards/{arm => v2/raspberry_pi}/rpi_pico/rpi_pico-pinctrl.dtsi (100%) rename boards/{arm => v2/raspberry_pi}/rpi_pico/rpi_pico.dts (100%) rename boards/{arm => v2/raspberry_pi}/rpi_pico/rpi_pico.yaml (100%) rename boards/{arm => v2/raspberry_pi}/rpi_pico/rpi_pico_defconfig (78%) rename boards/{arm/rpi_pico/rpi_pico_w.dts => v2/raspberry_pi/rpi_pico/rpi_pico_rp2040_w.dts} (100%) rename boards/{arm/rpi_pico/rpi_pico_w.yaml => v2/raspberry_pi/rpi_pico/rpi_pico_rp2040_w.yaml} (91%) rename boards/{arm/rpi_pico/rpi_pico_w_defconfig => v2/raspberry_pi/rpi_pico/rpi_pico_rp2040_w_defconfig} (78%) rename boards/{arm => v2/raspberry_pi}/rpi_pico/support/openocd.cfg (100%) diff --git a/boards/arm/rpi_pico/Kconfig.board b/boards/arm/rpi_pico/Kconfig.board deleted file mode 100644 index e2c1318db67..00000000000 --- a/boards/arm/rpi_pico/Kconfig.board +++ /dev/null @@ -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 diff --git a/boards/arm/rpi_pico/Kconfig.defconfig b/boards/v2/raspberry_pi/rpi_pico/Kconfig.defconfig similarity index 72% rename from boards/arm/rpi_pico/Kconfig.defconfig rename to boards/v2/raspberry_pi/rpi_pico/Kconfig.defconfig index a664665480b..ed3ae5ef850 100644 --- a/boards/arm/rpi_pico/Kconfig.defconfig +++ b/boards/v2/raspberry_pi/rpi_pico/Kconfig.defconfig @@ -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 config I2C_DW_CLOCK_SPEED default 125 -endif #I2C_DW +endif # I2C_DW config USB_SELF_POWERED default n diff --git a/boards/v2/raspberry_pi/rpi_pico/Kconfig.rpi_pico b/boards/v2/raspberry_pi/rpi_pico/Kconfig.rpi_pico new file mode 100644 index 00000000000..cde6b9c8d27 --- /dev/null +++ b/boards/v2/raspberry_pi/rpi_pico/Kconfig.rpi_pico @@ -0,0 +1,5 @@ +# Copyright (c) 2021 Yonatan Schachter +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_RPI_PICO + select SOC_RP2040 diff --git a/boards/arm/rpi_pico/board.cmake b/boards/v2/raspberry_pi/rpi_pico/board.cmake similarity index 100% rename from boards/arm/rpi_pico/board.cmake rename to boards/v2/raspberry_pi/rpi_pico/board.cmake diff --git a/boards/v2/raspberry_pi/rpi_pico/board.yml b/boards/v2/raspberry_pi/rpi_pico/board.yml new file mode 100644 index 00000000000..38d0e3a03a1 --- /dev/null +++ b/boards/v2/raspberry_pi/rpi_pico/board.yml @@ -0,0 +1,7 @@ +board: + name: rpi_pico + vendor: Raspberry Pi + socs: + - name: rp2040 + variants: + - name: w diff --git a/boards/arm/rpi_pico/doc/img/rpi_pico.jpg b/boards/v2/raspberry_pi/rpi_pico/doc/img/rpi_pico.jpg similarity index 100% rename from boards/arm/rpi_pico/doc/img/rpi_pico.jpg rename to boards/v2/raspberry_pi/rpi_pico/doc/img/rpi_pico.jpg diff --git a/boards/arm/rpi_pico/doc/img/rpi_pico_w.jpg b/boards/v2/raspberry_pi/rpi_pico/doc/img/rpi_pico_w.jpg similarity index 100% rename from boards/arm/rpi_pico/doc/img/rpi_pico_w.jpg rename to boards/v2/raspberry_pi/rpi_pico/doc/img/rpi_pico_w.jpg diff --git a/boards/arm/rpi_pico/doc/index.rst b/boards/v2/raspberry_pi/rpi_pico/doc/index.rst similarity index 100% rename from boards/arm/rpi_pico/doc/index.rst rename to boards/v2/raspberry_pi/rpi_pico/doc/index.rst diff --git a/boards/arm/rpi_pico/rpi_pico-common.dtsi b/boards/v2/raspberry_pi/rpi_pico/rpi_pico-common.dtsi similarity index 100% rename from boards/arm/rpi_pico/rpi_pico-common.dtsi rename to boards/v2/raspberry_pi/rpi_pico/rpi_pico-common.dtsi diff --git a/boards/arm/rpi_pico/rpi_pico-pinctrl.dtsi b/boards/v2/raspberry_pi/rpi_pico/rpi_pico-pinctrl.dtsi similarity index 100% rename from boards/arm/rpi_pico/rpi_pico-pinctrl.dtsi rename to boards/v2/raspberry_pi/rpi_pico/rpi_pico-pinctrl.dtsi diff --git a/boards/arm/rpi_pico/rpi_pico.dts b/boards/v2/raspberry_pi/rpi_pico/rpi_pico.dts similarity index 100% rename from boards/arm/rpi_pico/rpi_pico.dts rename to boards/v2/raspberry_pi/rpi_pico/rpi_pico.dts diff --git a/boards/arm/rpi_pico/rpi_pico.yaml b/boards/v2/raspberry_pi/rpi_pico/rpi_pico.yaml similarity index 100% rename from boards/arm/rpi_pico/rpi_pico.yaml rename to boards/v2/raspberry_pi/rpi_pico/rpi_pico.yaml diff --git a/boards/arm/rpi_pico/rpi_pico_defconfig b/boards/v2/raspberry_pi/rpi_pico/rpi_pico_defconfig similarity index 78% rename from boards/arm/rpi_pico/rpi_pico_defconfig rename to boards/v2/raspberry_pi/rpi_pico/rpi_pico_defconfig index 111edceb147..df003531af9 100644 --- a/boards/arm/rpi_pico/rpi_pico_defconfig +++ b/boards/v2/raspberry_pi/rpi_pico/rpi_pico_defconfig @@ -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 diff --git a/boards/arm/rpi_pico/rpi_pico_w.dts b/boards/v2/raspberry_pi/rpi_pico/rpi_pico_rp2040_w.dts similarity index 100% rename from boards/arm/rpi_pico/rpi_pico_w.dts rename to boards/v2/raspberry_pi/rpi_pico/rpi_pico_rp2040_w.dts diff --git a/boards/arm/rpi_pico/rpi_pico_w.yaml b/boards/v2/raspberry_pi/rpi_pico/rpi_pico_rp2040_w.yaml similarity index 91% rename from boards/arm/rpi_pico/rpi_pico_w.yaml rename to boards/v2/raspberry_pi/rpi_pico/rpi_pico_rp2040_w.yaml index d0acab19cc6..2daa753f335 100644 --- a/boards/arm/rpi_pico/rpi_pico_w.yaml +++ b/boards/v2/raspberry_pi/rpi_pico/rpi_pico_rp2040_w.yaml @@ -1,4 +1,4 @@ -identifier: rpi_pico_w +identifier: rpi_pico//w name: RaspberryPi-Pico-w type: mcu arch: arm diff --git a/boards/arm/rpi_pico/rpi_pico_w_defconfig b/boards/v2/raspberry_pi/rpi_pico/rpi_pico_rp2040_w_defconfig similarity index 78% rename from boards/arm/rpi_pico/rpi_pico_w_defconfig rename to boards/v2/raspberry_pi/rpi_pico/rpi_pico_rp2040_w_defconfig index 9b3868541d1..df003531af9 100644 --- a/boards/arm/rpi_pico/rpi_pico_w_defconfig +++ b/boards/v2/raspberry_pi/rpi_pico/rpi_pico_rp2040_w_defconfig @@ -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 diff --git a/boards/arm/rpi_pico/support/openocd.cfg b/boards/v2/raspberry_pi/rpi_pico/support/openocd.cfg similarity index 100% rename from boards/arm/rpi_pico/support/openocd.cfg rename to boards/v2/raspberry_pi/rpi_pico/support/openocd.cfg