diff --git a/arch/arm/src/rp23xx/CMakeLists.txt b/arch/arm/src/rp23xx/CMakeLists.txt
new file mode 100644
index 0000000000..1b54235cc6
--- /dev/null
+++ b/arch/arm/src/rp23xx/CMakeLists.txt
@@ -0,0 +1,88 @@
+# ##############################################################################
+# arch/arm/src/rp23xx/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+list(
+  APPEND
+  SRCS
+  rp23xx_idle.c
+  rp23xx_irq.c
+  rp23xx_uart.c
+  rp23xx_serial.c
+  rp23xx_start.c
+  rp23xx_timerisr.c
+  rp23xx_gpio.c
+  rp23xx_pio.c
+  rp23xx_clock.c
+  rp23xx_xosc.c
+  rp23xx_pll.c)
+
+if(CONFIG_SMP)
+  list(APPEND SRCS rp23xx_cpustart.c rp23xx_smpcall.c rp23xx_cpuidlestack.c
+       rp23xx_testset.c)
+endif()
+
+if(CONFIG_ARCH_HAVE_MULTICPU)
+  list(APPEND SRCS rp23xx_cpuindex.c)
+endif()
+
+if(CONFIG_RP23XX_DMAC)
+  list(APPEND SRCS rp23xx_dmac.c)
+endif()
+
+if(CONFIG_RP23XX_SPI)
+  list(APPEND SRCS rp23xx_spi.c)
+endif()
+
+if(CONFIG_RP23XX_PWM)
+  list(APPEND SRCS rp23xx_pwm.c)
+endif()
+
+if(CONFIG_RP23XX_I2C)
+  list(APPEND SRCS rp23xx_i2c.c)
+endif()
+
+if(CONFIG_RP23XX_I2C_SLAVE)
+  list(APPEND SRCS rp23xx_i2c_slave.c)
+endif()
+
+if(CONFIG_RP23XX_I2S)
+  list(APPEND SRCS rp23xx_i2s.c)
+  list(APPEND SRCS rp23xx_i2s_pio.c)
+endif()
+
+if(CONFIG_USBDEV)
+  list(APPEND SRCS rp23xx_usbdev.c)
+endif()
+
+if(CONFIG_WS2812)
+  list(APPEND SRCS rp23xx_ws2812.c)
+endif()
+
+if(CONFIG_ADC)
+  list(APPEND SRCS rp23xx_adc.c)
+endif()
+
+if(CONFIG_WATCHDOG)
+  list(APPEND SRCS rp23xx_wdt.c)
+endif()
+
+target_sources(arch PRIVATE ${SRCS})
diff --git a/boards/arm/rp23xx/common/CMakeLists.txt b/boards/arm/rp23xx/common/CMakeLists.txt
new file mode 100644
index 0000000000..e6a59badf2
--- /dev/null
+++ b/boards/arm/rp23xx/common/CMakeLists.txt
@@ -0,0 +1,24 @@
+# ##############################################################################
+# boards/arm/rp23xx/common/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+add_subdirectory(src)
+target_include_directories(board PRIVATE include)
diff --git a/boards/arm/rp23xx/common/src/CMakeLists.txt b/boards/arm/rp23xx/common/src/CMakeLists.txt
new file mode 100644
index 0000000000..b56fd15859
--- /dev/null
+++ b/boards/arm/rp23xx/common/src/CMakeLists.txt
@@ -0,0 +1,115 @@
+# ##############################################################################
+# boards/arm/rp23xx/common/src/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_ARCH_BOARD_COMMON)
+  set(RP23XXFLAGS -DPICO_RP2040=0 -DPICO_RP2350=1 -DLIB_PICO_BINARY_INFO=0
+                  -DPICO_SECURE=1 -D__ARM_ARCH_6M__=0)
+
+  list(APPEND SRCS rp23xx_common_bringup.c rp23xx_common_initialize.c)
+
+  if(CONFIG_BOARDCTL_RESET)
+    list(APPEND SRCS rp23xx_reset.c)
+  endif()
+
+  if(CONFIG_SPI)
+    list(APPEND SRCS rp23xx_spi.c)
+  endif()
+
+  if(CONFIG_RP23XX_I2C_DRIVER)
+    list(APPEND SRCS rp23xx_i2cdev.c)
+  endif()
+
+  if(CONFIG_RP23XX_PWM)
+    list(APPEND SRCS rp23xx_pwmdev.c)
+  endif()
+
+  if(CONFIG_RP23XX_SPI_DRIVER)
+    list(APPEND SRCS rp23xx_spidev.c)
+  endif()
+
+  if(CONFIG_RP23XX_I2S)
+    list(APPEND SRCS rp23xx_i2sdev.c)
+  endif()
+
+  if(CONFIG_LCD_SSD1306)
+    list(APPEND SRCS rp23xx_ssd1306.c)
+  endif()
+
+  if(CONFIG_LCD_ST7789)
+    list(APPEND SRCS rp23xx_st7789.c)
+  endif()
+
+  if(CONFIG_LCD_ST7735)
+    list(APPEND SRCS rp23xx_st7735.c)
+  endif()
+
+  if(CONFIG_LCD_GC9A01)
+    list(APPEND SRCS rp23xx_gc9a01.c)
+  endif()
+
+  if(CONFIG_USBMSC)
+    list(APPEND SRCS rp23xx_usbmsc.c)
+  endif()
+
+  if(CONFIG_USBDEV_COMPOSITE)
+    list(APPEND SRCS rp23xx_composite.c)
+  endif()
+
+  if(CONFIG_RP23XX_SPISD)
+    list(APPEND SRCS rp23xx_spisd.c)
+  endif()
+
+  if(CONFIG_SENSORS_BMP180)
+    list(APPEND SRCS rp23xx_bmp180.c)
+  endif()
+
+  if(CONFIG_SENSORS_BMP280)
+    list(APPEND SRCS rp23xx_bmp280.c)
+  endif()
+
+  if(CONFIG_SENSORS_INA219)
+    list(APPEND SRCS rp23xx_ina219.c)
+  endif()
+
+  if(CONFIG_ENC28J60)
+    list(APPEND SRCS rp23xx_enc28j60.c)
+  endif()
+
+  if(CONFIG_LCD_BACKPACK)
+    list(APPEND SRCS rp23xx_lcd_backpack.c)
+  endif()
+
+  if(CONFIG_BOARDCTL_UNIQUEID)
+    list(APPEND SRCS rp23xx_uniqueid.c)
+  endif()
+
+  if(CONFIG_NET_W5500)
+    list(APPEND SRCS rp23xx_w5500.c)
+  endif()
+
+  if(CONFIG_SENSORS_MAX6675)
+    list(APPEND SRCS rp23xx_max6675.c)
+  endif()
+
+endif()
+target_sources(board PRIVATE ${SRCS})
+target_compile_options(board PRIVATE ${RP23XXFLAGS})
diff --git a/boards/arm/rp23xx/raspberrypi-pico-2/CMakeLists.txt b/boards/arm/rp23xx/raspberrypi-pico-2/CMakeLists.txt
new file mode 100644
index 0000000000..3e953a497c
--- /dev/null
+++ b/boards/arm/rp23xx/raspberrypi-pico-2/CMakeLists.txt
@@ -0,0 +1,40 @@
+# ##############################################################################
+# boards/arm/rp23xx/raspberrypi-pico-2/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+add_subdirectory(src)
+
+add_custom_target(
+  nuttx_post_build
+  DEPENDS nuttx
+  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+  COMMENT "Regenerate nuttx.uf2")
+
+# The uf2 command to convert ELF/BIN to UF2
+add_custom_command(
+  TARGET nuttx_post_build
+  POST_BUILD
+  COMMAND picotool ARGS uf2 convert --quiet -t elf nuttx nuttx.uf2
+  COMMAND_EXPAND_LISTS
+  COMMAND ${CMAKE_COMMAND} -E echo "nuttx.uf2" >>
+          ${CMAKE_BINARY_DIR}/nuttx.manifest
+  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+  COMMENT "Regenerate nuttx.uf2")
diff --git a/boards/arm/rp23xx/raspberrypi-pico-2/scripts/memmap_copy_to_ram.ld b/boards/arm/rp23xx/raspberrypi-pico-2/scripts/memmap_copy_to_ram.ld
index 6720ec8712..a4f6a5aa32 100644
--- a/boards/arm/rp23xx/raspberrypi-pico-2/scripts/memmap_copy_to_ram.ld
+++ b/boards/arm/rp23xx/raspberrypi-pico-2/scripts/memmap_copy_to_ram.ld
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/rp23xx/xiao-rp2350/scripts/memmap_copy_to_ram.ld
+ * boards/arm/rp23xx/raspberrypi-pico-2/scripts/memmap_copy_to_ram.ld
  *
  * SPDX-License-Identifier: Apache-2.0
  *
diff --git a/boards/arm/rp23xx/raspberrypi-pico-2/src/CMakeLists.txt b/boards/arm/rp23xx/raspberrypi-pico-2/src/CMakeLists.txt
new file mode 100644
index 0000000000..dea2301354
--- /dev/null
+++ b/boards/arm/rp23xx/raspberrypi-pico-2/src/CMakeLists.txt
@@ -0,0 +1,57 @@
+# ##############################################################################
+# boards/arm/rp23xx/raspberrypi-pico-2/src/CMakeLists.txt
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+set(SRCS rp23xx_boardinitialize.c rp23xx_bringup.c)
+
+if(CONFIG_DEV_GPIO)
+  list(APPEND SRCS rp23xx_gpio.c)
+endif()
+
+if(CONFIG_ARCH_LEDS)
+  list(APPEND SRCS rp23xx_autoleds.c)
+else()
+  list(APPEND SRCS rp23xx_userleds.c)
+endif()
+
+if(CONFIG_ARCH_BUTTONS)
+  list(APPEND SRCS rp23xx_buttons.c)
+endif()
+
+if(CONFIG_BOARDCTL)
+  list(APPEND SRCS rp23xx_appinit.c)
+endif()
+
+target_sources(board PRIVATE ${SRCS})
+
+if(CONFIG_BOOT_RUNFROMFLASH)
+  set_property(GLOBAL PROPERTY LD_SCRIPT
+                               "${NUTTX_BOARD_DIR}/scripts/memmap_default.ld")
+elseif(CONFIG_BOOT_COPYTORAM)
+  set_property(
+    GLOBAL PROPERTY LD_SCRIPT
+                    "${NUTTX_BOARD_DIR}/scripts/memmap_copy_to_ram.ld")
+else()
+  set_property(GLOBAL PROPERTY LD_SCRIPT
+                               "${NUTTX_BOARD_DIR}/scripts/memmap_no_flash.ld")
+endif()
+
+if(CONFIG_ETC_ROMFS)
+  # TODO: etc/init.d/rc.sysinit etc/init.d/rcS
+endif()