[platform][rp2040] Update the pico platform after updating the SDK

The build was momentarily broken until this was added to fix it. Also generally remove a few extraneous defines in the platform code.
littlekernel · Feb 27, 2024 · 406f28a · 406f28a
1 parent c892c95
commit 406f28a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/platform/rp20xx/init.c b/platform/rp20xx/init.c
@@ -13,8 +13,6 @@
 #include <hardware/uart.h>
 #include <hardware/resets.h>
 
-extern void* vectab;
-
 void platform_early_init(void) {
     // initialize the clock tree.
     // gets clock values from defines in SDK at
@@ -34,10 +32,4 @@ void platform_early_init(void) {
     uart_puts(DEBUG_UART, "Hello World!\n");
 }
 
-void platform_init(void) {
-}
-
 
-bool running_on_fpga(void) {
-    return false;
-}
diff --git a/platform/rp20xx/rules.mk b/platform/rp20xx/rules.mk
@@ -14,7 +14,9 @@ ARM_CPU := cortex-m0plus
 GLOBAL_DEFINES += \
 	MEMSIZE=$(MEMSIZE) \
 	ARM_CM_SET_VTOR=1 \
+	PICO_NO_HARDWARE=0 \
 	PICO_ON_DEVICE=1 \
+	PICO_NO_FPGA_CHECK=1 \
 	PICO_NO_BINARY_INFO=1
 
 MODULE_SRCS += \
@@ -25,9 +27,11 @@ MODULE_SRCS += \
 	$(LOCAL_DIR)/vectab.c
 
 MODULE_SRCS += \
+	external/platform/pico/rp2_common/hardware_claim/claim.c \
 	external/platform/pico/rp2_common/hardware_clocks/clocks.c \
 	external/platform/pico/rp2_common/hardware_gpio/gpio.c \
 	external/platform/pico/rp2_common/hardware_pll/pll.c \
+	external/platform/pico/rp2_common/hardware_timer/timer.c \
 	external/platform/pico/rp2_common/hardware_uart/uart.c \
 	external/platform/pico/rp2_common/hardware_watchdog/watchdog.c \
 	external/platform/pico/rp2_common/hardware_xosc/xosc.c
@@ -39,12 +43,13 @@ GLOBAL_INCLUDES += \
 	external/platform/pico/rp2040/hardware_structs/include \
 	external/platform/pico/rp2_common/pico_platform/include \
 	external/platform/pico/rp2_common/hardware_base/include \
+	external/platform/pico/rp2_common/hardware_claim/include \
 	external/platform/pico/rp2_common/hardware_clocks/include \
 	external/platform/pico/rp2_common/hardware_gpio/include \
 	external/platform/pico/rp2_common/hardware_irq/include \
 	external/platform/pico/rp2_common/hardware_pll/include \
-	external/platform/pico/rp2_common/hardware_sync/include \
 	external/platform/pico/rp2_common/hardware_resets/include \
+	external/platform/pico/rp2_common/hardware_sync/include \
 	external/platform/pico/rp2_common/hardware_timer/include \
 	external/platform/pico/rp2_common/hardware_uart/include \
 	external/platform/pico/rp2_common/hardware_watchdog/include \