From a57f942d9c4b932846f73fb8f7894ddde374922e Mon Sep 17 00:00:00 2001 From: Daniele Lacamera Date: Mon, 9 Mar 2026 23:06:56 +0100 Subject: [PATCH] Update CI to m33mu 1.8, remove jump-table workaround --- .github/workflows/stm32h563-m33mu.yml | 9 +++------ tools/scripts/run-m33mu-ci-in-container.sh | 4 ---- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/stm32h563-m33mu.yml b/.github/workflows/stm32h563-m33mu.yml index 22837bc..725cf0e 100644 --- a/.github/workflows/stm32h563-m33mu.yml +++ b/.github/workflows/stm32h563-m33mu.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 20 container: - image: ghcr.io/danielinux/m33mu-ci:1.7 + image: ghcr.io/danielinux/m33mu-ci:1.8 options: --privileged steps: @@ -114,7 +114,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 container: - image: ghcr.io/danielinux/m33mu-ci:1.7 + image: ghcr.io/danielinux/m33mu-ci:1.8 options: --privileged steps: @@ -142,7 +142,6 @@ jobs: WOLFSSL_ROOT=../../../../wolfssl \ ENABLE_HTTPS=1 ENABLE_MQTT_BROKER=1 ENABLE_SSH=1 \ WOLFSSL_SP_NO_ASM=1 \ - EXTRA_CFLAGS_WOLFSSL='-fno-jump-tables -fno-tree-switch-conversion' \ CC=arm-none-eabi-gcc OBJCOPY=arm-none-eabi-objcopy - name: Run m33mu + DHCP + full test @@ -324,7 +323,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 25 container: - image: ghcr.io/danielinux/m33mu-ci:1.7 + image: ghcr.io/danielinux/m33mu-ci:1.8 options: --privileged steps: @@ -348,11 +347,9 @@ jobs: set -euo pipefail make -C src/port/stm32h563 clean TZEN=0 ENABLE_HTTPS=1 \ WOLFSSL_SP_NO_ASM=1 \ - EXTRA_CFLAGS_WOLFSSL='-fno-jump-tables -fno-tree-switch-conversion' \ CC=arm-none-eabi-gcc OBJCOPY=arm-none-eabi-objcopy make -C src/port/stm32h563 TZEN=0 ENABLE_HTTPS=1 \ WOLFSSL_SP_NO_ASM=1 \ - EXTRA_CFLAGS_WOLFSSL='-fno-jump-tables -fno-tree-switch-conversion' \ CC=arm-none-eabi-gcc OBJCOPY=arm-none-eabi-objcopy strings src/port/stm32h563/app.bin | grep "Initializing HTTPS server" > /dev/null diff --git a/tools/scripts/run-m33mu-ci-in-container.sh b/tools/scripts/run-m33mu-ci-in-container.sh index 0dc8b3e..2d248e9 100755 --- a/tools/scripts/run-m33mu-ci-in-container.sh +++ b/tools/scripts/run-m33mu-ci-in-container.sh @@ -50,7 +50,6 @@ build_full() { WOLFSSL_ROOT=../../../../wolfssl \ ENABLE_HTTPS=1 ENABLE_MQTT_BROKER=1 ENABLE_SSH=1 \ WOLFSSL_SP_NO_ASM=1 \ - EXTRA_CFLAGS_WOLFSSL='-fno-jump-tables -fno-tree-switch-conversion' \ CC=arm-none-eabi-gcc OBJCOPY=arm-none-eabi-objcopy } @@ -58,11 +57,9 @@ build_https_tls13() { ensure_repo wolfssl https://github.com/wolfSSL/wolfssl.git make -C src/port/stm32h563 clean TZEN=0 ENABLE_HTTPS=1 \ WOLFSSL_SP_NO_ASM=1 \ - EXTRA_CFLAGS_WOLFSSL='-fno-jump-tables -fno-tree-switch-conversion' \ CC=arm-none-eabi-gcc OBJCOPY=arm-none-eabi-objcopy make -C src/port/stm32h563 TZEN=0 ENABLE_HTTPS=1 \ WOLFSSL_SP_NO_ASM=1 \ - EXTRA_CFLAGS_WOLFSSL='-fno-jump-tables -fno-tree-switch-conversion' \ CC=arm-none-eabi-gcc OBJCOPY=arm-none-eabi-objcopy strings src/port/stm32h563/app.bin | grep -q "Initializing HTTPS server" } @@ -72,7 +69,6 @@ build_ssh_tzen() { ensure_repo wolfssh https://github.com/wolfSSL/wolfssh.git make -C src/port/stm32h563 clean make -C src/port/stm32h563 TZEN=0 ENABLE_SSH=1 \ - EXTRA_CFLAGS_WOLFSSL='-fno-jump-tables -fno-tree-switch-conversion' \ CC=arm-none-eabi-gcc OBJCOPY=arm-none-eabi-objcopy strings src/port/stm32h563/app.bin | grep -q "Initializing SSH server" }