boards/rpi-pico-2: adjust to new rp2350_arm name

Author: AnnsAnns

boards/rpi-pico-2/Kconfig

@@ -8,4 +8,4 @@ config BOARD
 config BOARD_RPI_PICO_2
     bool
     default y
-    select CPU_MODEL_RP2350
+    select CPU_MODEL_RP2350_RISCV

boards/rpi-pico-2/Makefile.features

@@ -1 +1 @@
-CPU := rp2350
+CPU := rp2350_arm

boards/rpi-pico-2/Makefile.include

@@ -1,4 +1,4 @@
-CPU_MODEL       := RP2350
+CPU_MODEL       := RP2350_ARM
 PORT_LINUX      ?= /dev/ttyACM0
 
 # JLink isnt tested yet on RP2350

boards/rpi-pico-2/include/board.h

@@ -7,7 +7,7 @@
 #pragma once
 
 /**
- * @ingroup         boards_rpi_pico_2
+ * @ingroup         boards_rpi_pico_2_arm
  * @{
  *
  * @file
@@ -16,11 +16,10 @@
  * @author          Tom Hert <[email protected]>
  */
 
-#include "RP2350.h"
 #include "cpu.h"
-#include "cpu_conf.h"
 #include "periph_conf.h"
-#include "periph_cpu.h"
+
+#include "periph/gpio.h"
 
 /** GPIO Pin ID for the onboard LED */
 #define LED0_PIN_ID 25u

boards/rpi-pico-2/include/periph_conf.h

@@ -6,6 +6,16 @@
 
 #pragma once
 
+/**
+ * @ingroup         boards_rpi_pico_2_arm
+ * @{
+ *
+ * @file
+ * @brief           Board periph definitions for the Raspberry Pi Pico 2
+ *
+ * @author          Tom Hert <[email protected]>
+ */
+
 #include <stdint.h>
 
 #include "RP2350.h"
@@ -15,6 +25,38 @@
 extern "C" {
 #endif
 
+/**
+ * @brief   Configuration details for an UART interface
+ */
+typedef struct {
+    UART0_Type *dev;    /**< Base address of the I/O registers of the device */
+    gpio_t rx_pin;      /**< GPIO pin to use for RX */
+    gpio_t tx_pin;      /**< GPIO pin to use for TX */
+    IRQn_Type irqn;     /**< IRQ number of the UART interface */
+} uart_conf_t;
+
+static const uart_conf_t uart_config[] = {
+    {
+        .dev = UART0,
+        .rx_pin = GPIO_PIN(0, 1),
+        .tx_pin = GPIO_PIN(0, 0),
+        .irqn = UART0_IRQ_IRQn
+    },
+    {
+        .dev = UART1,
+        .rx_pin = GPIO_PIN(0, 9),
+        .tx_pin = GPIO_PIN(0, 8),
+        .irqn = UART1_IRQ_IRQn
+    }
+};
+
+#define UART_0_ISR      (isr_uart0)
+#define UART_1_ISR      (isr_uart1)
+
+#define UART_NUMOF      ARRAY_SIZE(uart_config)
+
 #ifdef __cplusplus
 }
 #endif
+
+/** @} */

features.yaml

@@ -283,10 +283,10 @@ groups:
         features:
         - name: cpu_rpx0xx
           help: The MCU is part of the Raspberry PI RPx0xx family.
-        - name: cpu_rp2350
-          help: The MCU is a Raspberry Pi RP2350
+        - name: cpu_rp2350_arm
+          help: The MCU is a Raspberry Pi RP2350 Cortex-M33 ARM,
         - name: cpu_rp2350_riscv
-          help: The MCU is a Raspberry Pi RP2350 RISCV
+          help: The MCU is a Raspberry Pi RP2350 Hazard3 RISC-V.
 
       - title: Silicon Laboratories EFM32 Grouping
         features:

makefiles/features_existing.inc.mk

@@ -86,7 +86,7 @@ FEATURES_EXISTING := \
     cpu_nrf53 \
     cpu_nrf9160 \
     cpu_qn908x \
-    cpu_rp2350 \
+    cpu_rp2350_arm \
     cpu_rp2350_riscv \
     cpu_rpx0xx \
     cpu_sam3 \