Update for SDK 2.1.1-develop, GCC 14.3, Newlib 4.5 (#68)

* Update for SDK 2.1.1-develop

* Update GH CI to use Makefile tags for sources

* MacOS again deprecated, move xcode version up

* Mac X86 update for Makefile versions

* Window CI use Makefile revs

* Apply OpenOCD patches in CI

* List applied patches in CI

* GCC14.3 and Newlib 4.5

* Newlib 4.5 needs new compile option

Author: earlephilhower

.github/workflows/build-macos-arm.yml

@@ -12,25 +12,29 @@ jobs:
 
     - uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: '14.3.1'
+        xcode-version: '15.1.0'
 
     - name: Build Picotool
       run: |
         uname -a
         brew update
         brew install bash libtool automake libusb hidapi cmake
 
+        sdktag=$(grep PICOSDK_BRANCH Makefile | head -1 | awk '{print $3}')
+        picotooltag=$(grep PICOTOOL_BRANCH Makefile | head -1 | awk '{print $3}')
+        echo SDK=$sdktag PICOTOOL=$picotooltag
+
         # Get the SDK ready
         git clone https://github.com/raspberrypi/pico-sdk.git
         cd pico-sdk
-        git checkout 2.0.0
+        git checkout $sdktag
         git submodule update --init
         cd ..
 
         # Check out this branch
         git clone https://github.com/raspberrypi/picotool.git
         cd picotool
-        git checkout 2.0.0
+        git checkout $picotooltag
         export gitrev=$(git rev-parse --short HEAD)
         export pioarch=darwin_arm64
         export piotup=aarch64-apple-darwin20.4
@@ -69,12 +73,21 @@ jobs:
         uname -a
         brew update
         brew install bash libtool automake libusb hidapi
+        openocdtag=$(grep OPENOCD_BRANCH Makefile | head -1 | awk '{print $3}')
+        echo OPENOCD=$openocdtag
         git clone https://github.com/raspberrypi/openocd.git
         pushd openocd
-        git checkout sdk-2.0.0
+        git checkout $openocdtag
         export gitrev=$(git rev-parse --short HEAD)
         export pioarch=darwin_arm64
         export piotup=aarch64-apple-darwin20.4
+
+        # Apply patches
+        for p in ../patches/openocd-*.patch; do
+            echo PATCH: Applying $p
+            patch -s -p1 < $p
+        done
+
         # Remove TEXI warning
         grep -v raggedright doc/openocd.texi > p2
         mv p2 doc/openocd.texi

.github/workflows/build-macos.yml

@@ -20,17 +20,21 @@ jobs:
         brew update
         brew install bash libtool automake libusb hidapi cmake
 
+        sdktag=$(grep PICOSDK_BRANCH Makefile | head -1 | awk '{print $3}')
+        picotooltag=$(grep PICOTOOL_BRANCH Makefile | head -1 | awk '{print $3}')
+        echo SDK=$sdktag PICOTOOL=$picotooltag
+
         # Get the SDK ready
         git clone https://github.com/raspberrypi/pico-sdk.git
         cd pico-sdk
-        git checkout 2.0.0
+        git checkout $sdktag
         git submodule update --init
         cd ..
 
         # Check out this branch
         git clone https://github.com/raspberrypi/picotool.git
         cd picotool
-        git checkout 2.0.0
+        git checkout $picotooltag
         export gitrev=$(git rev-parse --short HEAD)
         export pioarch=darwin_x86_64
         export piotup=x86_64-apple-darwin20.4
@@ -70,12 +74,19 @@ jobs:
         uname -a
         brew update
         brew install bash libtool automake libusb hidapi
+        openocdtag=$(grep OPENOCD_BRANCH Makefile | head -1 | awk '{print $3}')
+        echo OPENOCD=$openocdtag
         git clone https://github.com/raspberrypi/openocd.git
         pushd openocd
-        git checkout sdk-2.0.0
+        git checkout $openocdtag
         export gitrev=$(git rev-parse --short HEAD)
         export pioarch=darwin_x86_64
         export piotup=x86_64-apple-darwin20.4
+        # Apply patches
+        for p in ../patches/openocd-*.patch; do
+            echo PATCH: Applying $p
+            patch -s -p1 < $p
+        done
         # Remove TEXI warning
         grep -v raggedright doc/openocd.texi > p2
         mv p2 doc/openocd.texi

.github/workflows/build-windows.yml

@@ -14,12 +14,19 @@ jobs:
           - { sys: mingw64, env: x86_64 }
           - { sys: mingw32, env: i686 }
     steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: false
     - uses: msys2/setup-msys2@v2
       with:
         msystem: ${{matrix.sys}}
         install: development mingw-w64-${{matrix.env}}-make mingw-w64-${{matrix.env}}-pkg-config mingw-w64-${{matrix.env}}-autotools texinfo mingw-w64-${{matrix.env}}-hidapi git mingw-w64-${{matrix.env}}-toolchain patch mingw-w64-${{matrix.env}}-cmake pkg-config zip
     - name: Build Picotool ${{matrix.env}}
       run: |
+        sdktag=$(grep PICOSDK_BRANCH Makefile | head -1 | awk '{print $3}')
+        picotooltag=$(grep PICOTOOL_BRANCH Makefile | head -1 | awk '{print $3}')
+        echo SDK=$sdktag PICOTOOL=$picotooltag
+
         # find D:/a/_temp/msys64/ -name libwinpthread* -print # D:/a/_temp/msys64/mingw32/bin/libwinpthread-1.dll D:/a/_temp/msys64/mingw32/lib/libwinpthread.a D:/a/_temp/msys64/mingw32/lib/libwinpthread.dll.a
         # find D:/a/_temp/msys64/ -name libhidapi* -print # D:/a/_temp/msys64/mingw32/lib/libhidapi.a D:/a/_temp/msys64/mingw32/lib/libhidapi.dll.a D:/a/_temp/msys64/mingw32/bin/libhidapi-0.dll
         pushd .
@@ -37,14 +44,14 @@ jobs:
         # Get the SDK ready
         git clone https://github.com/raspberrypi/pico-sdk.git
         cd pico-sdk
-        git checkout 2.0.0
+        git checkout $sdktag
         git submodule update --init
         cd ..
 
         # Check out this branch
         git clone https://github.com/raspberrypi/picotool.git
         cd picotool
-        git checkout 2.0.0
+        git checkout $picotooltag
         export gitrev=$(git rev-parse --short HEAD)
 
         # Make static-only binary
@@ -81,6 +88,8 @@ jobs:
 
     - name: Build OpenOCD ${{matrix.env}}
       run: |
+        openocdtag=$(grep OPENOCD_BRANCH Makefile | head -1 | awk '{print $3}')
+        echo OPENOCD=$openocdtag
         # Set up LibUSB
         export LIBUSB_ROOT=$PWD/libusb
         export LIBUSB1_CFLAGS=-I$PWD/libusb/include
@@ -89,8 +98,16 @@ jobs:
 
         git clone https://github.com/raspberrypi/openocd.git
         pushd openocd
-        git checkout sdk-2.0.0
+        git checkout $openocdtag
         export gitrev=$(git rev-parse --short HEAD)
+
+        # Apply patches
+        for p in ../patches/openocd-*.patch; do
+            echo PATCH: Applying $p
+            patch -s -p1 < $p
+        done
+
+        # Build!
         bash bootstrap
         ./configure --prefix=/tmp/openocd --enable-picoprobe --enable-cmsis-dap-v2 --enable-cmsis-dap \
                     --disable-dummy --disable-rshim --disable-ftdi  --disable-stlink --disable-ti-icdi \

Makefile

@@ -36,7 +36,7 @@ PLATFORMIO := ~/.platformio/penv/bin/platformio
 
 NEWLIB_DIR    := newlib
 NEWLIB_REPO   := git://sourceware.org/git/newlib-cygwin.git
-NEWLIB_BRANCH := newlib-4.3.0
+NEWLIB_BRANCH := newlib-4.5.0
 
 # Depending on the GCC version get proper branch and support libs
 GNUHTTP := https://gcc.gnu.org/pub/gcc/infrastructure
@@ -149,6 +149,15 @@ else ifeq ($(GCC), 14.2)
     BINUTILS_BRANCH := binutils-2_43_1
     BINUTILS_REPO := https://sourceware.org/git/binutils-gdb.git
     BINUTILS_DIR  := binutils-gdb-gnu
+else ifeq ($(GCC), 14.3)
+    ISL           := 0.18
+    GCC_BRANCH    := releases/gcc-14.3.0
+    GCC_PKGREL    := 140200
+    GCC_REPO      := https://gcc.gnu.org/git/gcc.git
+    GCC_DIR       := gcc-gnu
+    BINUTILS_BRANCH := binutils-2_43_1
+    BINUTILS_REPO := https://sourceware.org/git/binutils-gdb.git
+    BINUTILS_DIR  := binutils-gdb-gnu
 else
     $(error Need to specify a supported GCC version "GCC={9.3, 10.2, 10.3, 12.1}")
 endif
@@ -290,9 +299,11 @@ BLOBS = $(PWD)/blobs
 GMP_VER := 6.2.1
 
 # RPI stuff
-PICOSDK_BRANCH  := 2.0.0
+PICOSDK_BRANCH  := develop # 2.1.1
 OPENOCD_BRANCH  := sdk-2.0.0
-PICOTOOL_BRANCH := 2.0.0
+PICOTOOL_BRANCH := develop # 2.1.1
+MKLITTLEFS_BRANCH := 4.0.2
+LIBEXPAT_BRANCH := R_2_4_4
 
 # GCC et. al configure options
 #configure  = --prefix=$(call install,$(1))
@@ -327,6 +338,7 @@ CONFIGURENEWLIBCOM  = --with-newlib
 CONFIGURENEWLIBCOM += --disable-newlib-io-c99-formats
 CONFIGURENEWLIBCOM += --disable-newlib-supplied-syscalls
 CONFIGURENEWLIBCOM += --enable-newlib-nano-formatted-io
+CONFIGURENEWLIBCOM += --disable-newlib-wide-orient
 CONFIGURENEWLIBCOM += --enable-newlib-reent-small
 CONFIGURENEWLIBCOM += --disable-target-optspace
 CONFIGURENEWLIBCOM += --disable-option-checking
@@ -519,10 +531,11 @@ clean: .cleaninst.LINUX.clean .cleaninst.LINUX32.clean .cleaninst.WIN32.clean .c
 	(cd $(REPODIR)/$(GCC_DIR) && git reset --hard && git checkout $(GCC_BRANCH)) > $(call log,$@) 2>&1
 	(cd $(REPODIR)/$(BINUTILS_DIR) && git reset --hard && git checkout $(BINUTILS_BRANCH)) >> $(call log,$@) 2>&1
 	(cd $(REPODIR)/$(NEWLIB_DIR) && git reset --hard && git checkout $(NEWLIB_BRANCH)) >> $(call log,$@) 2>&1
+	(cd $(REPODIR)/pico-sdk && git reset --hard && git checkout $(PICOSDK_BRANCH)) && git submodule update --init --recursive >> $(call log,$@) 2>&1
 	(cd $(REPODIR)/openocd && git reset --hard && git checkout $(OPENOCD_BRANCH) && git submodule update --init --recursive) >> $(call log,$@) 2>&1
 	(cd $(REPODIR)/picotool && git reset --hard && git checkout $(PICOTOOL_BRANCH) && git submodule update --init --recursive) >> $(call log,$@) 2>&1
-	(cd $(REPODIR)/libexpat && git reset --hard && git checkout R_2_4_4 && git submodule update --init --recursive) >> $(call log,$@) 2>&1
-	(cd $(REPODIR)/pico-sdk && git reset --hard && git checkout $(PICOSDK_BRANCH)) >> $(call log,$@) 2>&1
+	(cd $(REPODIR)/libexpat && git reset --hard && git checkout $(LIBEXPAT_BRANCH) && git submodule update --init --recursive) >> $(call log,$@) 2>&1
+	(cd $(REPODIR)/mklittlefs && git reset --hard && git checkout $(MKLITTLEFS_BRANCH) && git submodule update --init --recursive) >> $(call log,$@) 2>&1
 	touch $@
 
 # Apply our patches

patches/openocd-vectreset.patch

@@ -0,0 +1,30 @@
+From 32f3168585c291273ab3cb27bb4805e95d8ea042 Mon Sep 17 00:00:00 2001
+From: "Earle F. Philhower, III" <earlephilhower@yahoo.com>
+Date: Thu, 6 Mar 2025 14:50:37 -0800
+Subject: [PATCH] Remove "VECTRESET is not supported" on RP2350
+
+The "cortex_m reset_config sysresetreq" setting in the
+RP2350.tcl script doesn't seem to set the value for core1,
+leading to warning messages during successful runs:
+````
+Warn : [rp2350.dap.core1] VECTRESET is not supported on this Cortex-M core, using SYSRESETREQ instead.
+Warn : [rp2350.dap.core1] Set 'cortex_m reset_config sysresetreq'.
+````
+
+Explicitly add the setting to the RP2350 config file to silence
+the warnings.
+
+Fixes #120
+---
+ tcl/target/rp2350.cfg | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tcl/target/rp2350.cfg b/tcl/target/rp2350.cfg
+index 104e8ecc4..f5285d855 100644
+--- a/tcl/target/rp2350.cfg
++++ b/tcl/target/rp2350.cfg
+@@ -77,3 +77,4 @@ if { $_BOTH_CORES } {
+ 
+ # srst does not exist; use SYSRESETREQ to perform a soft reset
+ cortex_m reset_config sysresetreq
++rp2350.dap.core1 cortex_m reset_config sysresetreq