Update pico SDK to v2.1.0 with RP2350 support (#2918)

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        variant: [esp8266, host, rp2040]
+        variant: [esp8266, host, rp2040, rp2350]
         toolchain: [gcc]
         include:
           - variant: esp8266
@@ -31,6 +31,8 @@ jobs:
             toolchain: gcc64
           - variant: rp2040
             arch: Rp2040
+          - variant: rp2350
+            arch: Rp2040
 
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}-${{ toJson(matrix) }}

.gitmodules

@@ -122,7 +122,7 @@
 
 [submodule "Rp2040.picotool"]
 	path = Sming/Arch/Rp2040/Components/picotool/picotool
-	url = https://github.com/mikee47/picotool
+	url = https://github.com/raspberrypi/picotool
 	ignore = dirty
 
 [submodule "Rp2040.Sdk"]

Sming/Arch/Rp2040/Components/driver/hw_timer.cpp

@@ -18,7 +18,7 @@ namespace
 {
 void IRAM_ATTR timer1_isr()
 {
-    hw_clear_bits(&timer_hw->intr, BIT(0));
+	hw_clear_bits(&timer_hw->intr, BIT(0));
 	auto& p = hw_timer_private;
 	if(p.timer1_callback != nullptr) {
 		p.timer1_callback(p.timer1_arg);
@@ -33,20 +33,22 @@ void IRAM_ATTR timer1_isr()
 void IRAM_ATTR hw_timer1_attach_interrupt(hw_timer_source_type_t source_type, hw_timer_callback_t callback, void* arg)
 {
 	(void)source_type;
+	auto irq_num = TIMER_ALARM_IRQ_NUM(HW_TIMER_NUM, 0);
+	irq_set_enabled(irq_num, false);
 	auto& p = hw_timer_private;
-	irq_set_enabled(TIMER_IRQ_0, false);
 	p.timer1_callback = callback;
 	p.timer1_arg = arg;
-	irq_set_exclusive_handler(TIMER_IRQ_0, timer1_isr);
+	irq_set_exclusive_handler(irq_num, timer1_isr);
 	hw_set_bits(&timer_hw->inte, BIT(0));
-	irq_set_enabled(TIMER_IRQ_0, true);
+	irq_set_enabled(irq_num, true);
 }
 
 void hw_timer1_detach_interrupt()
 {
 	hw_clear_bits(&timer_hw->inte, BIT(0));
-	irq_set_enabled(TIMER_IRQ_0, false);
-	irq_remove_handler(TIMER_IRQ_0, timer1_isr);
+	auto irq_num = TIMER_ALARM_IRQ_NUM(HW_TIMER_NUM, 0);
+	irq_set_enabled(irq_num, false);
+	irq_remove_handler(irq_num, timer1_isr);
 }
 
 void IRAM_ATTR hw_timer1_enable(hw_timer_clkdiv_t div, hw_timer_intr_type_t intr_type, bool auto_load)
@@ -59,5 +61,5 @@ void IRAM_ATTR hw_timer1_enable(hw_timer_clkdiv_t div, hw_timer_intr_type_t intr
 
 void hw_timer_init()
 {
-	// hardware_alarm_claim(0);
+	timer_hardware_alarm_claim(HW_TIMER_INST, 0);
 }

Sming/Arch/Rp2040/Components/driver/include/driver/hw_timer.h

@@ -11,14 +11,17 @@
 #pragma once
 
 #include <esp_systemapi.h>
-#include <hardware/structs/timer.h>
+#include <hardware/timer.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #define HW_TIMER_BASE_CLK 1000000U
 
+#define HW_TIMER_NUM 0
+#define HW_TIMER_INST TIMER_INSTANCE(HW_TIMER_NUM)
+
 /**
  * @defgroup hw_timer Hardware Timer Driver
  * @ingroup drivers
@@ -36,7 +39,7 @@ extern "C" {
  */
 __forceinline uint32_t IRAM_ATTR hw_timer_ticks()
 {
-	return timer_hw->timerawl;
+	return timer_time_us_32(HW_TIMER_INST);
 }
 
 /*************************************
@@ -116,15 +119,15 @@ __forceinline void IRAM_ATTR hw_timer1_write(uint32_t ticks)
 {
 	ticks <<= hw_timer_private.timer1_clkdiv;
 	hw_timer_private.timer1_ticks = ticks;
-	timer_hw->alarm[0] = hw_timer_ticks() + ticks;
+	HW_TIMER_INST->alarm[0] = hw_timer_ticks() + ticks;
 }
 
 /**
  * @brief Disable the timer
  */
 __forceinline void IRAM_ATTR hw_timer1_disable()
 {
-	timer_hw->armed = BIT(0);
+	HW_TIMER_INST->armed = BIT(0);
 }
 
 /**
@@ -133,7 +136,7 @@ __forceinline void IRAM_ATTR hw_timer1_disable()
  */
 __forceinline uint32_t hw_timer1_read()
 {
-	int time = hw_timer_ticks() - timer_hw->alarm[0];
+	int time = hw_timer_ticks() - HW_TIMER_INST->alarm[0];
 	return (time > 0) ? (time >> hw_timer_private.timer1_clkdiv) : 0;
 }
 

Sming/Arch/Rp2040/Components/driver/os_timer.cpp

@@ -75,16 +75,16 @@ void IRAM_ATTR timer_schedule()
 	if(timer_list == nullptr) {
 		debug_tmr("cancel");
 		// Cancel hardware timer
-		timer_hw->armed = BIT(1);
+		HW_TIMER_INST->armed = BIT(1);
 		return;
 	}
 
 	constexpr int TIMER2_MIN_US{50};
 	auto now = hw_timer2_read();
 	if(int(timer_list->timer_expire - now) < TIMER2_MIN_US) {
-		timer_hw->alarm[1] = now + TIMER2_MIN_US;
+		HW_TIMER_INST->alarm[1] = now + TIMER2_MIN_US;
 	} else {
-		timer_hw->alarm[1] = timer_list->timer_expire;
+		HW_TIMER_INST->alarm[1] = timer_list->timer_expire;
 	}
 }
 
@@ -95,7 +95,7 @@ os_timer_t* find_expired_timer()
 	}
 
 	// Using Timer2 hardware to schedule software timers
-	if(timer_hw->armed & BIT(1)) {
+	if(HW_TIMER_INST->armed & BIT(1)) {
 		return nullptr;
 	}
 

Sming/Arch/Rp2040/Components/driver/uart.cpp

@@ -13,6 +13,12 @@
 #include <hardware/resets.h>
 #include <hardware/gpio.h>
 
+#ifdef ARCH_RP2040
+#define UART_FUNCSEL_NUM(gpio) GPIO_FUNC_UART
+#else
+#define UART_FUNCSEL_NUM(gpio) ((gpio) & 0x2 ? GPIO_FUNC_UART_AUX : GPIO_FUNC_UART)
+#endif
+
 namespace
 {
 using uart_dev_t = uart_hw_t;
@@ -721,15 +727,15 @@ bool smg_uart_set_pins(smg_uart_t* uart, int tx_pin, int rx_pin)
 		if(uart->tx_pin != UART_PIN_DEFAULT) {
 			gpio_set_function(uart->tx_pin, GPIO_FUNC_NULL);
 		}
-		gpio_set_function(tx_pin, GPIO_FUNC_UART);
+		gpio_set_function(tx_pin, UART_FUNCSEL_NUM(tx_pin));
 		uart->tx_pin = tx_pin;
 	}
 
 	if(rx_pin != UART_PIN_NO_CHANGE) {
 		if(uart->rx_pin != UART_PIN_DEFAULT) {
 			gpio_set_function(uart->rx_pin, GPIO_FUNC_NULL);
 		}
-		gpio_set_function(rx_pin, GPIO_FUNC_UART);
+		gpio_set_function(rx_pin, UART_FUNCSEL_NUM(rx_pin));
 		uart->rx_pin = rx_pin;
 	}
 

Sming/Arch/Rp2040/Components/libc/src/heap.cpp

@@ -0,0 +1,58 @@
+/*
+ * heap.c
+ */
+
+#include "include/heap.h"
+#include <malloc.h>
+#include <cstdlib>
+#include <new>
+
+extern "C" uint32_t system_get_free_heap_size(void)
+{
+	// These are set by linker
+	extern char __end__;
+	extern char __StackLimit;
+	uint32_t maxHeap = (uint32_t)&__StackLimit - (uint32_t)&__end__;
+	struct mallinfo m = mallinfo();
+	return maxHeap - m.uordblks;
+}
+
+void* operator new(size_t size)
+{
+	return malloc(size);
+}
+
+void* operator new(size_t size, const std::nothrow_t&)
+{
+	return malloc(size);
+}
+
+void* operator new[](size_t size)
+{
+	return malloc(size);
+}
+
+void* operator new[](size_t size, const std::nothrow_t&)
+{
+	return malloc(size);
+}
+
+void operator delete(void* ptr)
+{
+	free(ptr);
+}
+
+void operator delete[](void* ptr)
+{
+	free(ptr);
+}
+
+void operator delete(void* ptr, size_t)
+{
+	free(ptr);
+}
+
+void operator delete[](void* ptr, size_t)
+{
+	free(ptr);
+}

Sming/Arch/Rp2040/Components/libc/src/include/sys/pgmspace.h

@@ -21,7 +21,11 @@ extern "C" {
 /**
  * @brief Simple check to determine if a pointer refers to flash memory
  */
+#ifdef XIP_END
+#define isFlashPtr(ptr) ((uint32_t)(ptr) >= XIP_BASE && (uint32_t)(ptr) < XIP_END)
+#else
 #define isFlashPtr(ptr) ((uint32_t)(ptr) >= XIP_MAIN_BASE && (uint32_t)(ptr) < XIP_NOALLOC_BASE)
+#endif
 
 #define PROGMEM STORE_ATTR ICACHE_RODATA_ATTR
 #define PROGMEM_PSTR PROGMEM

Sming/Arch/Rp2040/Components/picotool/README.rst

@@ -3,4 +3,10 @@ Picotool
 
 Picotool is a tool for inspecting RP2040 binaries, and interacting with RP2040 devices when they are in BOOTSEL mode.
 
-Note for full documentation see https://rptl.io/pico-get-started Appendix B.
+See https://rptl.io/pico-get-started Appendix B for an introduction to this tool.
+
+Sming builds picotool from source and uses it to read back flash memory with build targets such as ``make readpart``.
+
+The tool can be invoked directly like this::
+
+    make picotool CMD="info -a"

Sming/Arch/Rp2040/Components/picotool/component.mk

@@ -33,10 +33,49 @@ $(COMPONENT_RULE)$(PICOTOOL):
 	$(Q) mkdir -p $(@D)
 	$(Q) cd $(@D) && $(CMAKE) $(PICOTOOL_CMAKE_OPTIONS) $(PICOTOOL_SRC) && $(MAKE)
 
+##@Flashing
+
+.PHONY: picotool
+picotool: ##Pass options to picotool, e.g. `make picotool -- help`
+	$(Q) $(PICOTOOL) $(CMD)
+
+comma := ,
+XIP_BASE := 0x10000000
+
+define CalcHex
+$$(printf "0x%x" $$(( $1 )))
+endef
+
+define RangeStart
+$(call CalcHex,$(XIP_BASE) + $(firstword $(subst $(comma), ,$1)))
+endef
+
+define RangeEnd
+$(call CalcHex,$(XIP_BASE) + $(firstword $(subst $(comma), ,$1)) + $(word 2,$(subst $(comma), ,$1)))
+endef
+
+# Read flash memory into file
+# $1 -> `Offset,Size` chunk
+# $2 -> Output filename
+define ReadFlash
+	$(info ReadFlash $1,$2)
+	$(Q) $(PICOTOOL) save -r $(call RangeStart,$1) $(call RangeEnd,$1) $2 -t bin
+endef
 
 # Read flash manufacturer ID and determine actual size
 define ReadFlashID
 	$(info ReadFlashID)
-	$(Q) $(PICOTOOL) info -a $(TARGET_BIN)
-	# $(PICOTOOL) help info
- endef
+	$(Q) $(PICOTOOL) info -a
+endef
+
+# Erase a region of Flash
+# $1 -> Offset,Size
+define EraseFlashRegion
+	$(info EraseFlashRegion $1)
+	$(Q) $(PICOTOOL) erase -r $(call RangeStart,$1) $(call RangeEnd,$1)
+endef
+
+# Erase flash memory contents
+define EraseFlash
+	$(Q) $(PICOTOOL) erase -a
+endef

Sming/Arch/Rp2040/Components/picotool/picotool.patch

@@ -0,0 +1,28 @@
+diff --git a/lib/whereami/whereami.c b/lib/whereami/whereami.c
+index d052e14..940736e 100644
+--- a/lib/whereami/whereami.c
++++ b/lib/whereami/whereami.c
+@@ -60,8 +60,9 @@ extern "C" {
+ #if defined(_MSC_VER)
+ #pragma warning(push, 3)
+ #endif
++#undef _WIN32_WINNT
++#define _WIN32_WINNT _WIN32_WINNT_WINXP
+ #include <windows.h>
+-#include <intrin.h>
+ #if defined(_MSC_VER)
+ #pragma warning(pop)
+ #endif
+diff --git a/picoboot_connection/picoboot_connection.c b/picoboot_connection/picoboot_connection.c
+index 265608c..e487714 100644
+--- a/picoboot_connection/picoboot_connection.c
++++ b/picoboot_connection/picoboot_connection.c
+@@ -9,6 +9,8 @@
+ #include <stdbool.h>
+ #include <inttypes.h>
+
++#define static_assert _Static_assert
++
+ #include "picoboot_connection.h"
+ #include "boot/bootrom_constants.h"
+ #include "pico/stdio_usb/reset_interface.h"