diff --git a/platforms/chibios/vendors/RP/RP2040.mk b/platforms/chibios/vendors/RP/RP2040.mk
index 94f023d72b7..de26ecc9007 100644
--- a/platforms/chibios/vendors/RP/RP2040.mk
+++ b/platforms/chibios/vendors/RP/RP2040.mk
@@ -14,55 +14,67 @@ ADEFS  += -DCRT0_VTOR_INIT=1 \
 		  -DCRT0_EXTRA_CORES_NUMBER=0 \
           -DCRT0_INIT_VECTORS=1
 
-CFLAGS += -DPICO_NO_FPGA_CHECK \
-          -DNDEBUG
+CFLAGS += -DNDEBUG \
+          -DPICO_RP2040=1
 
 #
 # Pico SDK source and header files needed by QMK and ChibiOS
 ##############################################################################
-PICOSDKROOT   := $(TOP_DIR)/lib/pico-sdk
+PICOSDKROOT := $(TOP_DIR)/lib/pico-sdk
 
-PICOSDKSRC     = $(PICOSDKROOT)/src/rp2_common/hardware_clocks/clocks.c \
-                 $(PICOSDKROOT)/src/rp2_common/hardware_pll/pll.c \
-                 $(PICOSDKROOT)/src/rp2_common/hardware_pio/pio.c \
-                 $(PICOSDKROOT)/src/rp2_common/hardware_timer/timer.c \
-                 $(PICOSDKROOT)/src/rp2_common/hardware_flash/flash.c \
-                 $(PICOSDKROOT)/src/rp2_common/hardware_gpio/gpio.c \
-                 $(PICOSDKROOT)/src/rp2_common/hardware_claim/claim.c \
-                 $(PICOSDKROOT)/src/rp2_common/hardware_watchdog/watchdog.c \
-                 $(PICOSDKROOT)/src/rp2_common/hardware_xosc/xosc.c \
-                 $(PICOSDKROOT)/src/rp2_common/pico_bootrom/bootrom.c
+PICOSDKSRC  = $(PICOSDKROOT)/src/common/hardware_claim/claim.c \
+              $(PICOSDKROOT)/src/rp2_common/hardware_clocks/clocks.c \
+              $(PICOSDKROOT)/src/rp2_common/hardware_flash/flash.c \
+              $(PICOSDKROOT)/src/rp2_common/hardware_gpio/gpio.c \
+              $(PICOSDKROOT)/src/rp2_common/hardware_pio/pio.c \
+              $(PICOSDKROOT)/src/rp2_common/hardware_pll/pll.c \
+              $(PICOSDKROOT)/src/rp2_common/hardware_ticks/ticks.c \
+              $(PICOSDKROOT)/src/rp2_common/hardware_timer/timer.c \
+              $(PICOSDKROOT)/src/rp2_common/hardware_watchdog/watchdog.c \
+              $(PICOSDKROOT)/src/rp2_common/hardware_xosc/xosc.c \
+              $(PICOSDKROOT)/src/rp2_common/pico_bootrom/bootrom.c \
+              $(PICOSDKROOT)/src/rp2_common/pico_runtime_init/runtime_init_clocks.c \
+              $(PICOSDKROOT)/src/rp2_common/pico_runtime_init/runtime_init.c
 
-PICOSDKINC     = $(CHIBIOS)//os/various/pico_bindings/dumb/include \
-                 $(PICOSDKROOT)/src/common/pico_base/include \
-                 $(PICOSDKROOT)/src/rp2_common/pico_platform/include \
-                 $(PICOSDKROOT)/src/rp2_common/hardware_base/include \
-                 $(PICOSDKROOT)/src/rp2_common/hardware_clocks/include \
-                 $(PICOSDKROOT)/src/rp2_common/hardware_claim/include \
-                 $(PICOSDKROOT)/src/rp2_common/hardware_flash/include \
-                 $(PICOSDKROOT)/src/rp2_common/hardware_gpio/include \
-                 $(PICOSDKROOT)/src/rp2_common/hardware_irq/include \
-                 $(PICOSDKROOT)/src/rp2_common/hardware_pll/include \
-                 $(PICOSDKROOT)/src/rp2_common/hardware_pio/include \
-                 $(PICOSDKROOT)/src/rp2_common/hardware_sync/include \
-                 $(PICOSDKROOT)/src/rp2_common/hardware_timer/include \
-                 $(PICOSDKROOT)/src/rp2_common/hardware_resets/include \
-                 $(PICOSDKROOT)/src/rp2_common/hardware_watchdog/include \
-                 $(PICOSDKROOT)/src/rp2_common/hardware_xosc/include \
-                 $(PICOSDKROOT)/src/rp2040/hardware_regs/include \
-                 $(PICOSDKROOT)/src/rp2040/hardware_structs/include \
-                 $(PICOSDKROOT)/src/boards/include \
-                 $(PICOSDKROOT)/src/rp2_common/pico_bootrom/include
-
-PLATFORM_SRC += $(PICOSDKSRC)
-EXTRAINCDIRS += $(PICOSDKINC)
+PICOSDKINC  = $(CHIBIOS)/os/various/pico_bindings/dumb/include \
+              $(PICOSDKROOT)/src/boards/include \
+              $(PICOSDKROOT)/src/common/boot_picobin_headers/include \
+              $(PICOSDKROOT)/src/common/boot_picoboot_headers/include \
+              $(PICOSDKROOT)/src/common/hardware_claim/include \
+              $(PICOSDKROOT)/src/common/pico_base_headers/include \
+              $(PICOSDKROOT)/src/rp2_common/boot_bootrom_headers/include \
+              $(PICOSDKROOT)/src/rp2_common/hardware_base/include \
+              $(PICOSDKROOT)/src/rp2_common/hardware_boot_lock/include \
+              $(PICOSDKROOT)/src/rp2_common/hardware_clocks/include \
+              $(PICOSDKROOT)/src/rp2_common/hardware_flash/include \
+              $(PICOSDKROOT)/src/rp2_common/hardware_gpio/include \
+              $(PICOSDKROOT)/src/rp2_common/hardware_irq/include \
+              $(PICOSDKROOT)/src/rp2_common/hardware_pio/include \
+              $(PICOSDKROOT)/src/rp2_common/hardware_pll/include \
+              $(PICOSDKROOT)/src/rp2_common/hardware_resets/include \
+              $(PICOSDKROOT)/src/rp2_common/hardware_sync_spin_lock/include \
+              $(PICOSDKROOT)/src/rp2_common/hardware_sync/include \
+              $(PICOSDKROOT)/src/rp2_common/hardware_ticks/include \
+              $(PICOSDKROOT)/src/rp2_common/hardware_timer/include \
+              $(PICOSDKROOT)/src/rp2_common/hardware_watchdog/include \
+              $(PICOSDKROOT)/src/rp2_common/hardware_xosc/include \
+              $(PICOSDKROOT)/src/rp2_common/pico_bootrom/include \
+              $(PICOSDKROOT)/src/rp2_common/pico_flash/include \
+              $(PICOSDKROOT)/src/rp2_common/pico_platform_compiler/include \
+              $(PICOSDKROOT)/src/rp2_common/pico_platform_panic/include \
+              $(PICOSDKROOT)/src/rp2_common/pico_platform_sections/include \
+              $(PICOSDKROOT)/src/rp2_common/pico_runtime_init/include \
+              $(PICOSDKROOT)/src/rp2_common/pico_runtime/include \
+              $(PICOSDKROOT)/src/rp2040/hardware_regs/include \
+              $(PICOSDKROOT)/src/rp2040/hardware_structs/include \
+              $(PICOSDKROOT)/src/rp2040/pico_platform/include
 
 PLATFORM_RP2040_PATH := $(PLATFORM_PATH)/$(PLATFORM_KEY)/vendors/$(MCU_FAMILY)
 
-PLATFORM_SRC +=	$(PLATFORM_RP2040_PATH)/stage2_bootloaders.c \
-				$(PLATFORM_RP2040_PATH)/pico_sdk_shims.c
+PICOSDKSRC += $(PLATFORM_RP2040_PATH)/stage2_bootloaders.c \
+			  $(PLATFORM_RP2040_PATH)/pico_sdk_shims.c
 
-EXTRAINCDIRS += $(PLATFORM_RP2040_PATH)
+PICOSDKINC += $(PLATFORM_RP2040_PATH)
 
 #
 # RP2040 optimized compiler intrinsics
@@ -74,12 +86,12 @@ EXTRAINCDIRS += $(PLATFORM_RP2040_PATH)
 # bootup. This mechanism needs startup code and linker script support from
 # ChibiOS, which is currently not implemented thus these functions are disabled
 # ATM.
-PICOSDKINTRINSICSSRC =  $(PICOSDKROOT)/src/rp2_common/pico_divider/divider.S \
-                        $(PICOSDKROOT)/src/rp2_common/pico_int64_ops/pico_int64_ops_aeabi.S
+PICOSDKSRC += $(PICOSDKROOT)/src/rp2_common/hardware_divider/divider.S \
+              $(PICOSDKROOT)/src/rp2_common/pico_divider/divider_hardware.S \
+              $(PICOSDKROOT)/src/rp2_common/pico_int64_ops/pico_int64_ops_aeabi.S
 
-PICOSDKINTRINSICSINC =  $(PICOSDKROOT)/src/common/pico_base/include \
-                        $(PICOSDKROOT)/src/rp2_common/pico_platfrom/include \
-                        $(PICOSDKROOT)/src/rp2_common/hardware_divider/include
+PICOSDKINC += $(PICOSDKROOT)/src/rp2_common/hardware_divider/include \
+              $(PICOSDKROOT)/src/common/pico_divider_headers/include
 
 # integer division intrinsics utilizing the RP2040 hardware divider
 OPT_DEFS += -DPICO_DIVIDER_IN_RAM=1
@@ -97,5 +109,5 @@ OPT_DEFS += -DPICO_INT64_OPS_IN_RAM=1
 
 CFLAGS += -Wl,--wrap=__aeabi_lmul
 
-PLATFORM_SRC += $(PICOSDKINTRINSICSSRC)
-EXTRAINCDIRS += $(PICOSDKINTRINSICSINC)
+PLATFORM_SRC += $(PICOSDKSRC)
+EXTRAINCDIRS += $(PICOSDKINC)