From 35782c6be1eee50e00b41eb3088cd50d2bd2366f Mon Sep 17 00:00:00 2001
From: "Luke T. Shumaker" <lukeshu@lukeshu.com>
Date: Tue, 12 Nov 2024 16:29:03 -0700
Subject: try to remove pico_time

---
 CMakeLists.txt                 | 3 +++
 cmd/sbc_harness/CMakeLists.txt | 3 ++-
 cmd/sbc_harness/main.c         | 4 ++--
 libhw/CMakeLists.txt           | 2 ++
 libhw/rp2040_hwtimer.c         | 6 +++---
 libusb/CMakeLists.txt          | 1 +
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eef2617..b4ef20a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,9 @@
 
 cmake_minimum_required(VERSION 3.30)
 
+
+set_property(GLOBAL PROPERTY GLOBAL_DEPENDS_DEBUG_MODE 1)
+
 if (NOT PICO_PLATFORM)
         message(FATAL_ERROR "PICO_PLATFORM must be specified; use the GNUmakefile to set this")
 endif()
diff --git a/cmd/sbc_harness/CMakeLists.txt b/cmd/sbc_harness/CMakeLists.txt
index 6199e0c..5eebdcf 100644
--- a/cmd/sbc_harness/CMakeLists.txt
+++ b/cmd/sbc_harness/CMakeLists.txt
@@ -14,7 +14,8 @@ add_library(sbc_harness_objs OBJECT
 target_include_directories(sbc_harness_objs PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/config)
 target_include_directories(sbc_harness_objs PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(sbc_harness_objs
-	pico_stdlib
+	pico_stdio_uart
+	hardware_uart
 	hardware_flash
 
 	libmisc
diff --git a/cmd/sbc_harness/main.c b/cmd/sbc_harness/main.c
index 23195b3..4e6e30a 100644
--- a/cmd/sbc_harness/main.c
+++ b/cmd/sbc_harness/main.c
@@ -6,8 +6,8 @@
 
 #include <string.h>         /* libc: for strlen() */
 
-#include <pico/stdlib.h>    /* pico-sdk:pico_stdlib: for stdio_uart_init() */
-#include <hardware/flash.h> /* pico-sdk:hardware_flash: for flash_get_unique_id() */
+#include <pico/stdio_uart.h> /* pico-sdk:pico_stdio_uart: for stdio_uart_init() */
+#include <hardware/flash.h>  /* pico-sdk:hardware_flash: for flash_get_unique_id() */
 
 #include <libcr/coroutine.h>
 #include <libhw/rp2040_hwspi.h>
diff --git a/libhw/CMakeLists.txt b/libhw/CMakeLists.txt
index d1767da..a18c968 100644
--- a/libhw/CMakeLists.txt
+++ b/libhw/CMakeLists.txt
@@ -19,6 +19,8 @@ if (PICO_PLATFORM STREQUAL "rp2040")
 		w5500.c
 	)
 	target_link_libraries(libhw INTERFACE
+		pico_binary_info
+		pico_runtime
 		hardware_gpio
 		hardware_irq
 		hardware_spi
diff --git a/libhw/rp2040_hwtimer.c b/libhw/rp2040_hwtimer.c
index 4499642..3116213 100644
--- a/libhw/rp2040_hwtimer.c
+++ b/libhw/rp2040_hwtimer.c
@@ -15,10 +15,10 @@
 #include <libhw/generic/alarmclock.h>
 #include <libhw/rp2040_hwtimer.h>
 
-/******************************************************************************/
+/* Guards *********************************************************************/
 
-/** Conflict with pico-sdk:pico_time:!PICO_TIME_DEFAULT_ALARM_POOL_DISABLED.  */
-void add_alarm_at(void) {};
+/** Conflict with pico-sdk:pico_time. */
+void alarm_pool_add_alarm_at_force_in_context(void) {};
 
 /* Types **********************************************************************/
 
diff --git a/libusb/CMakeLists.txt b/libusb/CMakeLists.txt
index c23f30e..e04884a 100644
--- a/libusb/CMakeLists.txt
+++ b/libusb/CMakeLists.txt
@@ -9,6 +9,7 @@ target_sources(libusb INTERFACE
 	usb_common.c
 )
 target_link_libraries(libusb INTERFACE
+	pico_stdlib_headers
 	pico_unique_id
 	tinyusb_device
 	tinyusb_board
-- 
cgit v1.2.3-2-g168b