From 406f28a3ea15c007971c00cbcb9d63386bdedba6 Mon Sep 17 00:00:00 2001 From: Travis Geiselbrecht Date: Tue, 27 Feb 2024 00:12:04 -0800 Subject: [PATCH] [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. --- platform/rp20xx/init.c | 8 -------- platform/rp20xx/rules.mk | 7 ++++++- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/platform/rp20xx/init.c b/platform/rp20xx/init.c index e4b21101f..e0004622c 100644 --- a/platform/rp20xx/init.c +++ b/platform/rp20xx/init.c @@ -13,8 +13,6 @@ #include #include -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 index 853caf978..eab06dc11 100644 --- 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 \