Test new OpenOCD version

Use rpi-common OpenOCD branch

Author: will-v-pi

.github/workflows/build.yml

@@ -7,7 +7,7 @@ permissions:
 
 env:
   SKIP_RISCV: 1
-  SKIP_OPENOCD: 1
+  SKIP_OPENOCD: 0
 
 jobs:
   build_windows:

build_linux.sh

@@ -7,7 +7,7 @@ SKIP_RISCV=${SKIP_RISCV-0}
 SKIP_OPENOCD=${SKIP_OPENOCD-0}
 
 # Install prerequisites
-sudo apt install -y jq cmake libtool automake libusb-1.0-0-dev libhidapi-dev libftdi1-dev
+sudo apt install -y jq cmake libtool automake libusb-1.0-0-dev libhidapi-dev libftdi1-dev libjim-dev
 # RISC-V prerequisites
 sudo apt install -y autoconf automake autotools-dev curl python3 python3-pip libmpc-dev libmpfr-dev libgmp-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc zlib1g-dev ninja-build git cmake libglib2.0-dev libslirp-dev
 # RPi Only prerequisites
@@ -35,14 +35,18 @@ do
 
     echo "${href} ${tree} ${filename} ${extension} ${repodir}"
     rm -rf "${repodir}"
-    git clone -b "${tree}" --depth=1 -c advice.detachedHead=false "${href}" "${repodir}" 
+    git clone -b "${tree}" --depth=1 -c advice.detachedHead=false "${href}" "${repodir}"
+    submodules=$(echo "$repo" | jq -r .submodules)
+    if [[ "$submodules" == "true" ]]; then
+        git -C "${repodir}" submodule update --init --depth=1
+    fi
 done < <(echo "$repos")
 
 
 cd $builddir
 if [[ "$SKIP_OPENOCD" != 1 ]]; then
     if ! ../packages/linux/openocd/build-openocd.sh; then
-        echo "OpenOCD Build failed"
+        echo "::error title=openocd-fail-${suffix}::OpenOCD Build Failed on Linux $(uname -m)"
         SKIP_OPENOCD=1
     fi
 fi

build_macos.sh

@@ -7,8 +7,8 @@ SKIP_RISCV=${SKIP_RISCV-0}
 SKIP_OPENOCD=${SKIP_OPENOCD-0}
 
 # Install prerequisites
-arch -x86_64 /usr/local/bin/brew install jq libtool libusb automake hidapi --quiet
-arch -arm64 /opt/homebrew/bin/brew install jq libtool libusb automake hidapi --quiet
+arch -x86_64 /usr/local/bin/brew install jq libtool libusb automake hidapi jimtcl --quiet
+arch -arm64 /opt/homebrew/bin/brew install jq libtool libusb automake hidapi jimtcl --quiet
 # RISC-V prerequisites
 echo "Listing local"
 ls /usr/local/bin
@@ -42,14 +42,18 @@ do
 
     echo "${href} ${tree} ${filename} ${extension} ${repodir}"
     rm -rf "${repodir}"
-    git clone -b "${tree}" --depth=1 -c advice.detachedHead=false "${href}" "${repodir}" 
+    git clone -b "${tree}" --depth=1 -c advice.detachedHead=false "${href}" "${repodir}"
+    submodules=$(echo "$repo" | jq -r .submodules)
+    if [[ "$submodules" == "true" ]]; then
+        git -C "${repodir}" submodule update --init --depth=1
+    fi
 done < <(echo "$repos")
 
 
 cd $builddir
 if [[ "$SKIP_OPENOCD" != 1 ]] && [[ $(uname -m) == 'arm64' ]]; then
     if ! ../packages/macos/openocd/build-openocd.sh; then
-        echo "OpenOCD Build failed"
+        echo "::error title=openocd-fail-macos::OpenOCD Build Failed on macOS"
         SKIP_OPENOCD=1
     fi
 fi

config/repositories.json

@@ -10,7 +10,8 @@
     },
     {
       "href": "https://github.com/raspberrypi/openocd.git",
-      "tree": "sdk-2.0.0"
+      "tree": "rpi-common",
+      "submodules": true
     },
     {
       "href": "https://github.com/riscv/riscv-gnu-toolchain.git",

packages/linux/openocd/build-openocd.sh

@@ -6,11 +6,10 @@ export CFLAGS=-static
 export LDFLAGS=-static
 
 cd openocd
-sed -i -e 's/uint /unsigned int /g' ./src/flash/nor/rp2040.c
 ./bootstrap
 ./configure --disable-werror
 make clean
-make -j$(nproc)
+make
 INSTALLDIR="$PWD/../openocd-install/usr/local/bin"
 rm -rf "$PWD/../openocd-install"
 DESTDIR="$PWD/../openocd-install" make install

packages/macos/openocd/build-openocd.sh

@@ -3,13 +3,13 @@
 set -euo pipefail
 
 cd openocd
-sed -i -e 's/uint /unsigned int /g' ./src/flash/nor/rp2040.c
+
 ./bootstrap
 # See https://github.com/raspberrypi/openocd/issues/30
 # ./configure --disable-werror CAPSTONE_CFLAGS="$(pkg-config capstone --cflags | sed s/.capstone\$//)"
 ./configure --disable-werror
 make clean
-make -j$(nproc)
+make
 INSTALLDIR="$PWD/../openocd-install/usr/local/bin"
 rm -rf "$PWD/../openocd-install"
 DESTDIR="$PWD/../openocd-install" make install
@@ -22,4 +22,8 @@ libhidpath=($(otool -L $INSTALLDIR/openocd | grep libhidapi))
 echo ${libhidpath[0]}
 cp "${libhidpath[0]}" $INSTALLDIR/libhidapi.dylib
 install_name_tool -change "${libhidpath[0]}" @loader_path/libhidapi.dylib $INSTALLDIR/openocd
+libjimpath=($(otool -L $INSTALLDIR/openocd | grep libjim))
+echo ${libjimpath[0]}
+cp "${libjimpath[0]}" $INSTALLDIR/libjim0.83.dylib
+install_name_tool -change "${libjimpath[0]}" @loader_path/libjim0.83.dylib $INSTALLDIR/openocd
 install_name_tool -add_rpath @loader_path/ $INSTALLDIR/openocd

packages/windows/openocd/build-openocd.sh

@@ -6,11 +6,11 @@ BUILDDIR=$(pwd)
 INSTALLDIR="openocd-install"
 
 cd openocd
-sed -i -e 's/uint /unsigned int /g' ./src/flash/nor/rp2040.c
+
 ./bootstrap
-./configure --disable-werror
+./configure --disable-werror --enable-internal-jimtcl
 make clean
-make -j$(nproc)
+make
 DESTDIR="$BUILDDIR/$INSTALLDIR" make install
 
 cd "$BUILDDIR/$INSTALLDIR/${MSYSTEM,,}/bin"