# This is a combination of 2 commits.

# This is the 1st commit message:

cpu/rp2350_riscv: move to shared rp2350_common

# The commit message #2 will be skipped:

# fixup! cpu/rp2350_riscv: move to shared rp2350_common

Author: AnnsAnns

cpu/rp2350_riscv/Makefile

@@ -2,6 +2,6 @@
 MODULE = cpu
 
 # add a list of subdirectories, that should also be built
-DIRS = $(RIOTCPU)/riscv_common periph
+DIRS = $(RIOTCPU)/rp2350_common $(RIOTCPU)/riscv_common
 
 include $(RIOTBASE)/Makefile.base

cpu/rp2350_riscv/Makefile.dep

@@ -1,5 +1,3 @@
-USEMODULE += periph
-
 FEATURES_REQUIRED += periph_xh3irq
-
+include $(RIOTCPU)/rp2350_common/Makefile.dep
 include $(RIOTCPU)/riscv_common/Makefile.dep

cpu/rp2350_riscv/Makefile.features

@@ -1,7 +1,9 @@
 CPU_CORE := rv32imac
+CPU_FAM     := RP2350
+CPU_MODEL   = rp2350_hazard3
 
-FEATURES_PROVIDED += periph_gpio
-FEATURES_PROVIDED += periph_uart
 FEATURES_PROVIDED += periph_xh3irq
 
+include $(RIOTCPU)/rp2350_common/Makefile.features
+
 include $(RIOTCPU)/riscv_common/Makefile.features

cpu/rp2350_riscv/Makefile.include

@@ -1,16 +1,3 @@
-CFLAGS += -Wno-pedantic
-
-ROM_LEN         ?= 2097152    # = 2 MiB used in the RPi Pico
-ROM_OFFSET      := 0          # bootloader size
-RAM_LEN         := 0x82000    # 520kB = 532479 used in the RPi Pico 2350
-ROM_START_ADDR  := 0x10000000 # XIP Non-Secure address for rp2350
-RAM_START_ADDR  := 0x20000000 # Non-Secure RAM address for rp2350
-
-INCLUDES += -I$(RIOTCPU)/rp2350_riscv/include
-INCLUDES += -isystem$(RIOTBASE)/build/pkg/picosdk/src/rp2_common/cmsis/stub/CMSIS/Core/Include
-INCLUDES += -isystem$(RIOTBASE)/build/pkg/picosdk/src/rp2_common/cmsis/stub/CMSIS/Device/RP2350/Include
-INCLUDES += -isystem$(RIOTBASE)/build/pkg/picosdk/src/rp2350/hardware_regs/include/hardware
-
 # CPU and architecture specific flags
 CFLAGS += -D$(CPU_MODEL)
 CFLAGS += -DROM_START_ADDR=$(ROM_START_ADDR)
@@ -24,9 +11,7 @@ LINKFLAGS += -Wl,--gc-sections
 LINKFLAGS += -Wl,--start-group -lc -lm -Wl,--end-group
 LINKFLAGS += -march=rv32imac_zicsr_zifencei_zba_zbb_zbkb_zbs
 
-# Supported programmers and debuggers
-PROGRAMMERS_SUPPORTED := picotool openocd jlink
-PROGRAMMER ?= picotool
-OPENOCD_DEBUG_ADAPTER ?= dap
-
+include $(RIOTCPU)/rp2350_common/Makefile.include
 include $(RIOTCPU)/riscv_common/Makefile.include
+
+INCLUDES += -I$(RIOTCPU)/rp2350_riscv/include

cpu/rp2350_riscv/clock.c

@@ -25,35 +25,13 @@
 
 #include <sys/unistd.h>
 
-void gpio_reset(void)
-{
-    reset_component(RESET_PADS_BANK0, RESET_PADS_BANK0);
-    reset_component(RESET_IO_BANK0, RESET_IO_BANK0);
-}
-
 /**
  * @brief Initialize the CPU, set IRQ priorities, clocks, peripheral
  */
 void cpu_init(void)
 {
-    /* Reset GPIO state */
-    gpio_reset();
-
-    /* Reset clock to default state */
-    clock_reset();
-
-    /* initialize the CPU clock */
-    cpu_clock_init();
-
     /* initialize the RISC-V core */
     riscv_init();
 
-    /* initialize the early peripherals */
-    early_init();
-
-    /* trigger static peripheral initialization */
-    periph_init();
-
-    /* initialize the board */
-    board_init();
+    rp2350_init();
 }

cpu/rp2350_riscv/cpu.c

@@ -23,6 +23,8 @@ extern "C" {
 
 #define CPU_DEFAULT_IRQ_PRIO 1u
 #define CPU_IRQ_NUMOF 52u
+/* This tells rp2350_common that we are using the RISC-V core */
+#define RP2350_USE_RISCV 1
 
 #ifdef __cplusplus
 }