summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
m---------3rd-party/pico-sdk0
-rw-r--r--cmd/sbc_harness/CMakeLists.txt3
-rw-r--r--libhw/rp2040_hwtimer.c5
3 files changed, 6 insertions, 2 deletions
diff --git a/3rd-party/pico-sdk b/3rd-party/pico-sdk
-Subproject efe2103f9b28458a1615ff096054479743ade23
+Subproject a029d9c1cc930ca972e7b52616e773e4d420a07
diff --git a/cmd/sbc_harness/CMakeLists.txt b/cmd/sbc_harness/CMakeLists.txt
index ec28446..6199e0c 100644
--- a/cmd/sbc_harness/CMakeLists.txt
+++ b/cmd/sbc_harness/CMakeLists.txt
@@ -22,8 +22,7 @@ target_link_libraries(sbc_harness_objs
libdhcp
libhw
)
-set_target_properties(sbc_harness_objs PROPERTIES PICO_TARGET_FLOAT_IMPL "pico_float_none") # default (pico), compiler, pico, none
-set_target_properties(sbc_harness_objs PROPERTIES PICO_TARGET_DOUBLE_IMPL "pico_double_none") # default (pico), compiler, pico, none
+pico_minimize_runtime(sbc_harness_objs)
pico_enable_stdio_usb(sbc_harness_objs 0)
pico_enable_stdio_uart(sbc_harness_objs 1)
pico_enable_stdio_semihosting(sbc_harness_objs 0)
diff --git a/libhw/rp2040_hwtimer.c b/libhw/rp2040_hwtimer.c
index 69c2a50..6f37d85 100644
--- a/libhw/rp2040_hwtimer.c
+++ b/libhw/rp2040_hwtimer.c
@@ -15,6 +15,11 @@
#include <libhw/generic/alarmclock.h>
#include <libhw/rp2040_hwtimer.h>
+/******************************************************************************/
+
+/** Conflict with pico-sdk:pico_time:!PICO_TIME_DEFAULT_ALARM_POOL_DISABLED. */
+void add_alarm_at(void) {};
+
/* Types **********************************************************************/
struct rp2040_hwtimer {