Update picotool and implement missing make targets

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"

Sming/Arch/Rp2040/Components/sming-arch/component.mk

@@ -12,6 +12,7 @@ COMPONENT_DEPENDS := \
 	libc \
 	rp2040 \
 	uf2 \
+	picotool \
 	driver \
 	gdbstub \
 	spi_flash

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

@@ -22,13 +22,6 @@ else
 Uf2Conv = $(PYTHON) $(UF2CONV_PY) $(if $V,--verbose) $1
 endif
 
-
-# Read flash manufacturer ID and determine actual size
-define ReadFlashID
-	$(info Reading Flash ID)
-	$(call Uf2Conv,--list --verbose)
-endef
-
 # Write file contents to Flash
 # $1 -> List of `Offset=File` chunks
 define WriteFlash
@@ -46,23 +39,3 @@ define VerifyFlash
 		$(info ** NOT IMPLEMENTED **)
 	)
 endef
-
-# Read flash memory into file
-# $1 -> `Offset,Size` chunk
-# $2 -> Output filename
-define ReadFlash
-	$(info ReadFlash $1,$2)
-	$(info ** NOT IMPLEMENTED **)
-endef
-
-# Erase a region of Flash
-# $1 -> Offset,Size
-define EraseFlashRegion
-	$(info EraseFlashRegion $1)
-	$(info ** NOT IMPLEMENTED **)
-endef
-
-# Erase flash memory contents
-define EraseFlash
-	$(info ** NOT IMPLEMENTED **)
-endef