Install pre-build risc-v gcc

* Bump-up SDK

Update
Pico SDK 2.1.1
Pico Tool 2.1.1
RTOS Kernel 11.2.0

* add the pico2_w to the testscript

Add the pico2_w for both architecture.

* add pico2_w_riscv test case

---------

Co-authored-by: Marco <maggo1404@users.noreply.github.com>

.github/workflows/sdk-ci.yml

@@ -19,8 +19,12 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       - name: Build SDK
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           load: true
@@ -28,7 +32,7 @@ jobs:
       - name: Test SDK
         run: bash ./test_sdk.sh ${{ env.TEST_TAG }}
       - name: Log into Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ github.actor }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
@@ -39,9 +43,10 @@ jobs:
           images: lukstep/raspberry-pi-pico-sdk
       - name: Push SDK image
         if: github.event_name == 'release' && github.event.action == 'published'
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64

Dockerfile

@@ -1,29 +1,49 @@
-FROM ubuntu:24.10 AS gcc_build
+FROM ubuntu:24.04
-
-# Build GCC RISC-V
-COPY ./install_gcc.sh /home/install_gcc.sh
-RUN bash /home/install_gcc.sh
-
-FROM ubuntu:24.10 as sdk_setup
 
 RUN apt-get update -y && \
     apt-get upgrade -y && \
     apt-get install --no-install-recommends -y \
-                       git \
+        build-essential \
-                       ca-certificates \
+        ca-certificates \
-                       python3 \
+        cmake \
-                       tar \
+        gcc-arm-none-eabi \
-                       build-essential \
+        git \
-                       gcc-arm-none-eabi \
+        libnewlib-arm-none-eabi \
-                       libnewlib-arm-none-eabi \
+        libstdc++-arm-none-eabi-newlib \
-                       libstdc++-arm-none-eabi-newlib \
+        python3 \
-                       cmake && \
+        tar \
+        wget && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
+# RISC-V toolchain
+ARG RISCV_VERSION=15.2.0-1
+ARG TARGETARCH
+
+RUN if [ "$TARGETARCH" = "arm64" ]; then \
+        ARCH=linux-arm64; \
+    elif [ "$TARGETARCH" = "amd64" ]; then \
+        ARCH=linux-x64; \
+    else \
+        echo "Unsupported arch: $TARGETARCH" && exit 1; \
+    fi && \
+    wget -q https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v${RISCV_VERSION}/xpack-riscv-none-elf-gcc-${RISCV_VERSION}-${ARCH}.tar.gz \
+        -O /tmp/riscv.tar.gz && \
+    tar -xzf /tmp/riscv.tar.gz -C /opt && \
+    rm /tmp/riscv.tar.gz
+
+# Add toolchain to PATH
+ENV PATH="/opt/xpack-riscv-none-elf-gcc-${RISCV_VERSION}/bin:${PATH}"
+
+RUN TOOLCHAIN=/opt/xpack-riscv-none-elf-gcc-${RISCV_VERSION}/bin && \
+    for f in $TOOLCHAIN/riscv-none-elf-*; do \
+        name=$(basename $f | sed 's/riscv-none-elf/riscv32-unknown-elf/'); \
+        ln -s $f /usr/local/bin/$name; \
+    done
+
 # Raspberry Pi Pico SDK
 ARG SDK_PATH=/usr/local/picosdk
-RUN git clone --depth 1 --branch 2.0.0 https://github.com/raspberrypi/pico-sdk $SDK_PATH && \
+RUN git clone --depth 1 --branch 2.1.1 https://github.com/raspberrypi/pico-sdk $SDK_PATH && \
     cd $SDK_PATH && \
     git submodule update --init
 
@@ -31,14 +51,14 @@ ENV PICO_SDK_PATH=$SDK_PATH
 
 # FreeRTOS
 ARG FREERTOS_PATH=/usr/local/freertos
-RUN git clone --depth 1 --branch V11.0.1 https://github.com/FreeRTOS/FreeRTOS-Kernel $FREERTOS_PATH && \
+RUN git clone --depth 1 --branch V11.2.0 https://github.com/FreeRTOS/FreeRTOS-Kernel $FREERTOS_PATH && \
     cd $FREERTOS_PATH && \
     git submodule update --init --recursive
 
 ENV FREERTOS_KERNEL_PATH=$FREERTOS_PATH
 
 # Picotool installation
-RUN git clone --depth 1 --branch 2.0.0 https://github.com/raspberrypi/picotool.git /home/picotool && \
+RUN git clone --depth 1 --branch 2.1.1 https://github.com/raspberrypi/picotool.git /home/picotool && \
     cd /home/picotool && \
     mkdir build && \
     cd build && \
@@ -46,8 +66,3 @@ RUN git clone --depth 1 --branch 2.0.0 https://github.com/raspberrypi/picotool.g
     make -j$(nproc) && \
     cmake --install . && \
     rm -rf /home/picotool
-
-# Install GCC RISC-V
-COPY --from=gcc_build /opt/riscv/gcc14-rp2350-no-zcmp /opt/riscv/gcc14-rp2350-no-zcmp
-ENV PATH="$PATH:/opt/riscv/gcc14-rp2350-no-zcmp/bin"
-

test_sdk.sh

@@ -9,7 +9,7 @@ if [[ -z $1 ]]; then
     echo "Please provide an SDK image you want to test"
 fi
 
-declare -a boards=("pico" "pico_w" "pico2" "pico2_riscv")
+declare -a boards=("pico" "pico_w" "pico2" "pico2_riscv" "pico2_w" "pico2_w_riscv")
 
 
 docker run -d -it --name pico-sdk --mount type=bind,source="${PWD}"/test_poject,target=/home/dev "$1"
@@ -20,6 +20,8 @@ do
     docker exec pico-sdk /bin/bash -c "rm -rf /home/dev/build"
     if [[ $board = pico2_riscv ]] ; then
         docker exec -i pico-sdk /bin/bash -c "cd /home/dev && mkdir build && cd build && cmake .. -DPICO_BOARD=pico2 -DPICO_PLATFORM=rp2350-riscv && make -j4"
+    elif [[ $board = pico2_w_riscv ]] ; then
+        docker exec -i pico-sdk /bin/bash -c "cd /home/dev && mkdir build && cd build && cmake .. -DPICO_BOARD=pico2_w -DPICO_PLATFORM=rp2350-riscv && make -j4"
     else
         docker exec -i pico-sdk /bin/bash -c "cd /home/dev && mkdir build && cd build && cmake .. -DPICO_BOARD=${board} && make -j4"
     fi