mirror of
https://github.com/wolfSSL/wolfssl.git
synced 2026-07-05 03:30:49 +02:00
Fixes for Zephyr 4.4
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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 ]
|
||||
|
||||
@@ -203,6 +203,7 @@
|
||||
#include <zephyr/posix/netdb.h>
|
||||
#include <zephyr/posix/sys/socket.h>
|
||||
#include <zephyr/posix/sys/select.h>
|
||||
#include <zephyr/posix/arpa/inet.h>
|
||||
#endif
|
||||
#else
|
||||
#include <net/socket.h>
|
||||
|
||||
+1
-1
@@ -191,7 +191,7 @@
|
||||
#endif
|
||||
#if KERNEL_VERSION_NUMBER >= 0x30100
|
||||
#include <zephyr/net/socket.h>
|
||||
#ifdef CONFIG_POSIX_API
|
||||
#if defined(CONFIG_POSIX_API) && KERNEL_VERSION_NUMBER < 0x40400
|
||||
#include <zephyr/posix/sys/socket.h>
|
||||
#endif
|
||||
#else
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user