Merge pull request #37 from darkxst/4.4.0

Bump GeckoSDK for 4.4.0

.devcontainer/devcontainer.json

@@ -2,10 +2,10 @@
 // README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-dockerfile
 {
 	"name": "Silabs Firmware Builder",
-	"image": "ghcr.io/darkxst/silabs-firmware-builder:4.3.2",
+	"image": "ghcr.io/darkxst/silabs-firmware-builder:4.4.0",
 
     "containerEnv": {
-        "GECKO_SDK_VERSION": "v4.3.2"
+        "GECKO_SDK_VERSION": "v4.4.0"
     }
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	// "features": {},

.github/workflows/build.yaml

@@ -16,7 +16,7 @@ on:
   workflow_dispatch:
 
 env:
-  sdk_version: 4.3.2
+  sdk_version: 4.4.0
 
 jobs:
   build-container:
@@ -26,8 +26,8 @@ jobs:
       packages: write
     outputs:
       sdk_version: ${{ env.sdk_version }}
-      ot_version: 2.3.2.0
-      ezsp_version: 7.3.2.0
+      ot_version: 2.4.0.0
+      ezsp_version: 7.4.0.0
     steps:
       - uses: actions/[email protected]
       - name: Log in to the GitHub container registry
@@ -85,6 +85,7 @@ jobs:
       components: ${{ matrix.components }}
       configuration: ${{ matrix.configuration }}
       patchpath: "EmberZNet/${{ matrix.name }}"
+      slcp_yaml_changes: ${{ matrix.slcp_yaml_changes }}
       extra_c_defs: ${{ matrix.extra_c_defs }}
       sdk_version: ${{ needs.build-container.outputs.sdk_version}}
       metadata_fw_type: "ncp-uart-hw"
@@ -115,9 +116,11 @@ jobs:
       project_name: "rcp-uart-802154"
       device: ${{ matrix.device }}
       components: ${{ matrix.components }}
+      without_components: ${{ matrix.without_components }}
       configuration: ${{ matrix.configuration }}
       patchpath: "RCPMultiPAN/${{ matrix.name }}"
       sdkpatchpath: "RCPMultiPAN/GeckoSDK"
+      slcp_yaml_changes: ${{ matrix.slcp_yaml_changes }}
       extra_c_defs: ${{ matrix.extra_c_defs }}
       sdk_version: ${{ needs.build-container.outputs.sdk_version}}
       baudrate: ${{ matrix.baudrate }}
@@ -154,7 +157,7 @@ jobs:
       sdk_version: ${{ needs.build-container.outputs.sdk_version}}
       metadata_fw_type: "ot-rcp"
       baudrate: ${{ matrix.baudrate }}
-      metadata_extra: "{ \"ot_rcp_version\": \"SL-OPENTHREAD/2.3.2.0_GitHub-e6df00dd6\" }"
+      metadata_extra: "{ \"ot_rcp_version\": \"SL-OPENTHREAD/2.4.0.0_GitHub-7074a43e4\" }"
 
   collect_artifacts:
     name: download and publish all artifacts

.github/workflows/silabs-firmware-build.yaml

@@ -21,6 +21,9 @@ on:
       components:
         required: false
         type: string
+      without_components:
+        required: false
+        type: string
       configuration:
         required: false
         type: string
@@ -43,6 +46,9 @@ on:
         required: false
         default: "null"
         type: string
+      slcp_yaml_changes:
+        required: false
+        type: string
 
 jobs:
   firmware-build:
@@ -59,10 +65,24 @@ jobs:
       - name: Adjust permission
         shell: bash
         run: chown builder .
+
+      - name: Link SDK extensions
+        shell: bash
+        run: |
+          # XXX: slc-cli does not actually work when the extensions aren't in the SDK!
+          ln -s $PWD/gecko_sdk_extensions /gecko_sdk/extension
+
+      - name: Trust SDK extensions
+        run: |
+          for ext in /gecko_sdk/extension/*/; do
+            slc signature trust --extension-path="$ext"
+          done
+
       - name: Generate Firmware Project
         run: |
           slc generate \
               --with="${{ inputs.device }},${{ inputs.components }}" \
+              --without="${{ inputs.without_components }}" \
               --project-file="${{ inputs.project_file }}" \
               --export-destination=${{ inputs.firmware_name }} \
               --copy-proj-sources --copy-sdk-sources --new-project --force \
@@ -94,6 +114,12 @@ jobs:
               patch -p1 < $patch
           done
 
+      - name: Patch SLCP project file
+        if: "${{ inputs.slcp_yaml_changes != '' }}"
+        run: |
+          cd ${{ inputs.firmware_name }}
+          yq --in-place --yaml-output '${{ inputs.slcp_yaml_changes }}' "${{ inputs.project_name }}.slcp"
+
       - name: Build Firmware
         run: |
           cd ${{ inputs.firmware_name }}

.gitignore

@@ -0,0 +1 @@
+.DS_Store

Dockerfile

@@ -10,12 +10,14 @@ RUN \
        git \
        git-lfs \
        jq \
+       yq \
        libgl1 \
        make \
        default-jre-headless \
        patch \
        python3 \
-       unzip
+       unzip \
+       xz-utils
 
 # Install Simplicity Commander (unfortunately no stable URL available, this
 # is known to be working with Commander_linux_x86_64_1v15p0b1306.tar.bz).
@@ -36,17 +38,17 @@ RUN \
 
 ENV PATH="$PATH:/opt/slc_cli"
 
-ARG GCC_ARM_VERSION="10.3-2021.10"
+ARG GCC_ARM_VERSION="12.2.rel1"
 
 # Install ARM GCC embedded toolchain
 RUN \
-    curl -O https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/${GCC_ARM_VERSION}/gcc-arm-none-eabi-${GCC_ARM_VERSION}-x86_64-linux.tar.bz2 \
-    && tar -C /opt -xjf gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2 \
-    && rm gcc-arm-none-eabi-${GCC_ARM_VERSION}-x86_64-linux.tar.bz2
+    curl -O https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/${GCC_ARM_VERSION}/binrel/arm-gnu-toolchain-${GCC_ARM_VERSION}-x86_64-arm-none-eabi.tar.xz \
+    && tar -C /opt -xJf arm-gnu-toolchain-${GCC_ARM_VERSION}-x86_64-arm-none-eabi.tar.xz \
+    && rm arm-gnu-toolchain-${GCC_ARM_VERSION}-x86_64-arm-none-eabi.tar.xz
 
-ENV PATH="$PATH:/opt/gcc-arm-none-eabi-${GCC_ARM_VERSION}/bin"
+ENV PATH="$PATH:/opt/arm-gnu-toolchain-${GCC_ARM_VERSION}-x86_64-arm-none-eabi/bin"
 
-ARG GECKO_SDK_VERSION="v4.3.2"
+ARG GECKO_SDK_VERSION="v4.4.0"
 
 RUN \
     git clone --depth 1 -b ${GECKO_SDK_VERSION} \
@@ -69,5 +71,5 @@ RUN \
            --sdk="/gecko_sdk/" \
     && slc signature trust --sdk "/gecko_sdk/" \
     && slc configuration \
-           --gcc-toolchain="/opt/gcc-arm-none-eabi-${GCC_ARM_VERSION}/"
+           --gcc-toolchain="/opt/arm-gnu-toolchain-${GCC_ARM_VERSION}-x86_64-arm-none-eabi/"