diff --git a/.github/scripts/zephyr-4.x/zephyr-test.sh b/.github/scripts/zephyr-4.x/zephyr-test.sh index fa0e827d4d..9c31d0e767 100755 --- a/.github/scripts/zephyr-4.x/zephyr-test.sh +++ b/.github/scripts/zephyr-4.x/zephyr-test.sh @@ -70,9 +70,12 @@ select_docker_image() { local minor="${ver#*.}" minor="${minor%%.*}" - if [[ "$major" -ge 4 && "$minor" -ge 2 ]]; then - # Zephyr 4.2+ needs SDK 0.17.x (v0.28.7 image) - echo "${GHCR}:v0.28.7" + if [[ "$major" -ge 4 && "$minor" -ge 4 ]]; then + # Zephyr 4.4+ needs SDK 1.x (v0.29.2 image) + echo "${GHCR}:v0.29.2" + elif [[ "$major" -ge 4 && "$minor" -ge 2 ]]; then + # Zephyr 4.2+ needs SDK 0.17.x (v0.28.8 image) + echo "${GHCR}:v0.28.8" elif [[ "$major" -ge 4 ]]; then # Zephyr 4.0-4.1 needs SDK 0.17.0 (v0.27.4 image; v0.26.18/v0.28.7 picolibc is incompatible) echo "${GHCR}:v0.27.4" diff --git a/.github/workflows/zephyr-4.x.yml b/.github/workflows/zephyr-4.x.yml index afbbde5ebf..ab023a8f42 100644 --- a/.github/workflows/zephyr-4.x.yml +++ b/.github/workflows/zephyr-4.x.yml @@ -22,7 +22,7 @@ jobs: strategy: fail-fast: false matrix: - zephyr-ref: [ v4.1.0, v4.3.0 ] + zephyr-ref: [ v4.1.0, v4.3.0, v4.4.0 ] board: [ native_sim, frdm_rw612/rw612 ] sample: [ wolfssl_tls_sock, wolfssl_test, wolfssl_benchmark ] extra-conf: [ '', external_libc.conf ] diff --git a/wolfssl/test.h b/wolfssl/test.h index 291a05480c..97454e1702 100644 --- a/wolfssl/test.h +++ b/wolfssl/test.h @@ -203,6 +203,7 @@ #include #include #include + #include #endif #else #include diff --git a/wolfssl/wolfio.h b/wolfssl/wolfio.h index eb609235d7..bb13897477 100644 --- a/wolfssl/wolfio.h +++ b/wolfssl/wolfio.h @@ -191,7 +191,7 @@ #endif #if KERNEL_VERSION_NUMBER >= 0x30100 #include - #ifdef CONFIG_POSIX_API + #if defined(CONFIG_POSIX_API) && KERNEL_VERSION_NUMBER < 0x40400 #include #endif #else diff --git a/zephyr/samples/wolfssl_tls_sock/prj.conf b/zephyr/samples/wolfssl_tls_sock/prj.conf index e48f28362c..998475f52f 100644 --- a/zephyr/samples/wolfssl_tls_sock/prj.conf +++ b/zephyr/samples/wolfssl_tls_sock/prj.conf @@ -2,7 +2,7 @@ CONFIG_MAIN_STACK_SIZE=16384 CONFIG_ENTROPY_GENERATOR=y CONFIG_INIT_STACKS=y -CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=8192 +CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=131072 # Networking config CONFIG_NETWORKING=y