golioth · mniestroj · Oct 30, 2024 · Nov 1, 2024 · Nov 6, 2024 · Nov 6, 2024
diff --git a/.github/workflows/hil_test_zephyr.yml b/.github/workflows/hil_test_zephyr.yml
@@ -108,7 +108,7 @@ jobs:
 
           for test in $(ls modules/lib/golioth-firmware-sdk/tests/hil/tests)
           do
-            west build -p -b ${{ inputs.west_board }} \
+            west build --no-sysbuild -p -b ${{ inputs.west_board }} \
               modules/lib/golioth-firmware-sdk/tests/hil/platform/zephyr \
               -- $EXTRA_BUILD_ARGS -DGOLIOTH_HIL_TEST=$test
             mv build/zephyr/${{ inputs.binary_name }} \

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -365,6 +365,7 @@ jobs:
             manifest: .ci-west-zephyr.yml
             extra_twister_args: >-
               --west-flash="--dev-id=${!SNR_VAR}"
+              --west-runner jlink
             run_tests: true
 
           - hil_board: nrf52840dk

diff --git a/README.md b/README.md
@@ -81,9 +81,9 @@ each of the samples is also continously verified on target.
 | ESP32-S3-DevKitC-1   | ESP-IDF (v5.3.0)         |
 | ESP32-C3-DevKitM-1   | ESP-IDF (v5.3.0)         |
 | ESP32-DevKitC-WROVER | ESP-IDF (v5.3.0)         |
-| ESP32-DevKitC-WROVER | Zephyr (v3.7.0)          |
-| nRF52840 DK + ESP32  | Zephyr (v3.7.0)          |
-| MIMXRT1024-EVK       | Zephyr (v3.7.0)          |
-| RAK5010              | Zephyr (v3.7.0)          |
-| nRF9160 DK           | nRF Connect SDK (v2.7.0) |
+| ESP32-DevKitC-WROVER | Zephyr (v3.8.0)          |
+| nRF52840 DK + ESP32  | Zephyr (v3.8.0)          |
+| MIMXRT1024-EVK       | Zephyr (v3.8.0)          |
+| RAK5010              | Zephyr (v3.8.0)          |
+| nRF9160 DK           | nRF Connect SDK (v2.8.0) |
 | CY8CPROTO-062-4343W  | ModusToolbox (3.0.0)     |
diff --git a/examples/zephyr/certificate_provisioning/boards/nrf52840dk_nrf52840.conf b/examples/zephyr/certificate_provisioning/boards/nrf52840dk_nrf52840.conf
@@ -2,7 +2,6 @@
 CONFIG_WIFI=y
 CONFIG_WIFI_ESP_AT=y
 CONFIG_WIFI_ESP_AT_MDM_RX_BUF_COUNT=40
-CONFIG_WIFI_ESP_AT_PASSIVE_MODE=y
 CONFIG_WIFI_ESP_AT_CIPDINFO_USE=y
 CONFIG_WIFI_ESP_AT_DNS_USE=y
 
@@ -19,3 +18,6 @@ CONFIG_REBOOT=y
 
 CONFIG_NET_BUF_DATA_SIZE=256
 CONFIG_NET_PKT_TX_COUNT=10
+
+# DTLS handshake timeout
+CONFIG_NET_SOCKETS_CONNECT_TIMEOUT=30000
diff --git a/examples/zephyr/certificate_provisioning/boards/rak5010_nrf52840.conf b/examples/zephyr/certificate_provisioning/boards/rak5010_nrf52840.conf
@@ -21,6 +21,9 @@ CONFIG_NET_UDP=y
 CONFIG_NET_SOCKETS=y
 CONFIG_NET_CONTEXT_RCVTIMEO=y
 
+# DTLS handshake timeout
+CONFIG_NET_SOCKETS_CONNECT_TIMEOUT=30000
+
 # Modem driver
 CONFIG_MODEM=y
 CONFIG_MODEM_CELLULAR=y

diff --git a/examples/zephyr/common/Kconfig.defconfig b/examples/zephyr/common/Kconfig.defconfig
@@ -6,6 +6,15 @@
 
 if GOLIOTH_SAMPLE_COMMON
 
+if SOC_ESP32
+
+# Force ESP32 WiFi to use system heap
+config ESP_HEAP_RUNTIME
+	bool
+	default n
+
+endif # SOC_ESP32
+
 if DNS_RESOLVER
 
 config DNS_SERVER_IP_ADDRESSES
@@ -21,11 +30,6 @@ configdefault ZVFS_EVENTFD_MAX
 	default 14 if GOLIOTH_OTA
 	default 7
 
-configdefault EVENTFD_MAX
-	int
-	default 14 if GOLIOTH_OTA
-	default 7
-
 if LOG_BACKEND_GOLIOTH
 
 config LOG_PROCESS_THREAD_STACK_SIZE
@@ -115,11 +119,6 @@ configdefault ZVFS_OPEN_MAX
 	default 23 if GOLIOTH_OTA
 	default 16
 
-configdefault POSIX_MAX_FDS
-	int
-	default 23 if GOLIOTH_OTA
-	default 16
-
 config REBOOT
 	default y
 

diff --git a/examples/zephyr/common/wifi.c b/examples/zephyr/common/wifi.c
@@ -333,7 +333,8 @@ static void wifi_disconnect(struct wifi_manager_data *wifi_mgmt)
 
 static void wifi_check_lower_up(struct wifi_manager_data *wifi_mgmt)
 {
-    if (net_if_flag_is_set(wifi_mgmt->iface, NET_IF_LOWER_UP))
+    if (IS_ENABLED(CONFIG_WIFI_ESP32) ||
+        net_if_flag_is_set(wifi_mgmt->iface, NET_IF_LOWER_UP))
     {
         wifi_event_notify(wifi_mgmt, WIFI_EVENT_LOWER_UP);
     }

diff --git a/examples/zephyr/fw_update/boards/nrf52840dk_nrf52840.conf b/examples/zephyr/fw_update/boards/nrf52840dk_nrf52840.conf
@@ -1,7 +1,6 @@
 CONFIG_WIFI=y
 CONFIG_WIFI_ESP_AT=y
 CONFIG_WIFI_ESP_AT_MDM_RX_BUF_COUNT=40
-CONFIG_WIFI_ESP_AT_PASSIVE_MODE=y
 CONFIG_WIFI_ESP_AT_CIPDINFO_USE=y
 CONFIG_WIFI_ESP_AT_DNS_USE=y
 

diff --git a/examples/zephyr/hello/boards/nrf52840dk_nrf52840.conf b/examples/zephyr/hello/boards/nrf52840dk_nrf52840.conf
@@ -1,7 +1,6 @@
 CONFIG_WIFI=y
 CONFIG_WIFI_ESP_AT=y
 CONFIG_WIFI_ESP_AT_MDM_RX_BUF_COUNT=40
-CONFIG_WIFI_ESP_AT_PASSIVE_MODE=y
 CONFIG_WIFI_ESP_AT_CIPDINFO_USE=y
 CONFIG_WIFI_ESP_AT_DNS_USE=y
 

diff --git a/examples/zephyr/lightdb/delete/boards/nrf52840dk_nrf52840.conf b/examples/zephyr/lightdb/delete/boards/nrf52840dk_nrf52840.conf
@@ -1,7 +1,6 @@
 CONFIG_WIFI=y
 CONFIG_WIFI_ESP_AT=y
 CONFIG_WIFI_ESP_AT_MDM_RX_BUF_COUNT=40
-CONFIG_WIFI_ESP_AT_PASSIVE_MODE=y
 CONFIG_WIFI_ESP_AT_CIPDINFO_USE=y
 CONFIG_WIFI_ESP_AT_DNS_USE=y
 

diff --git a/examples/zephyr/lightdb/get/boards/nrf52840dk_nrf52840.conf b/examples/zephyr/lightdb/get/boards/nrf52840dk_nrf52840.conf
@@ -1,7 +1,6 @@
 CONFIG_WIFI=y
 CONFIG_WIFI_ESP_AT=y
 CONFIG_WIFI_ESP_AT_MDM_RX_BUF_COUNT=40
-CONFIG_WIFI_ESP_AT_PASSIVE_MODE=y
 CONFIG_WIFI_ESP_AT_CIPDINFO_USE=y
 CONFIG_WIFI_ESP_AT_DNS_USE=y
 

diff --git a/examples/zephyr/lightdb/observe/boards/nrf52840dk_nrf52840.conf b/examples/zephyr/lightdb/observe/boards/nrf52840dk_nrf52840.conf
@@ -1,7 +1,6 @@
 CONFIG_WIFI=y
 CONFIG_WIFI_ESP_AT=y
 CONFIG_WIFI_ESP_AT_MDM_RX_BUF_COUNT=40
-CONFIG_WIFI_ESP_AT_PASSIVE_MODE=y
 CONFIG_WIFI_ESP_AT_CIPDINFO_USE=y
 CONFIG_WIFI_ESP_AT_DNS_USE=y
 

diff --git a/examples/zephyr/lightdb/set/boards/nrf52840dk_nrf52840.conf b/examples/zephyr/lightdb/set/boards/nrf52840dk_nrf52840.conf
@@ -1,7 +1,6 @@
 CONFIG_WIFI=y
 CONFIG_WIFI_ESP_AT=y
 CONFIG_WIFI_ESP_AT_MDM_RX_BUF_COUNT=40
-CONFIG_WIFI_ESP_AT_PASSIVE_MODE=y
 CONFIG_WIFI_ESP_AT_CIPDINFO_USE=y
 CONFIG_WIFI_ESP_AT_DNS_USE=y
 

diff --git a/examples/zephyr/logging/boards/nrf52840dk_nrf52840.conf b/examples/zephyr/logging/boards/nrf52840dk_nrf52840.conf
@@ -1,7 +1,6 @@
 CONFIG_WIFI=y
 CONFIG_WIFI_ESP_AT=y
 CONFIG_WIFI_ESP_AT_MDM_RX_BUF_COUNT=40
-CONFIG_WIFI_ESP_AT_PASSIVE_MODE=y
 CONFIG_WIFI_ESP_AT_CIPDINFO_USE=y
 CONFIG_WIFI_ESP_AT_DNS_USE=y
 

diff --git a/examples/zephyr/rpc/boards/nrf52840dk_nrf52840.conf b/examples/zephyr/rpc/boards/nrf52840dk_nrf52840.conf
@@ -1,7 +1,6 @@
 CONFIG_WIFI=y
 CONFIG_WIFI_ESP_AT=y
 CONFIG_WIFI_ESP_AT_MDM_RX_BUF_COUNT=40
-CONFIG_WIFI_ESP_AT_PASSIVE_MODE=y
 CONFIG_WIFI_ESP_AT_CIPDINFO_USE=y
 CONFIG_WIFI_ESP_AT_DNS_USE=y
 

diff --git a/examples/zephyr/settings/boards/nrf52840dk_nrf52840.conf b/examples/zephyr/settings/boards/nrf52840dk_nrf52840.conf
@@ -1,7 +1,6 @@
 CONFIG_WIFI=y
 CONFIG_WIFI_ESP_AT=y
 CONFIG_WIFI_ESP_AT_MDM_RX_BUF_COUNT=40
-CONFIG_WIFI_ESP_AT_PASSIVE_MODE=y
 CONFIG_WIFI_ESP_AT_CIPDINFO_USE=y
 CONFIG_WIFI_ESP_AT_DNS_USE=y
 

diff --git a/examples/zephyr/stream/boards/nrf52840dk_nrf52840.conf b/examples/zephyr/stream/boards/nrf52840dk_nrf52840.conf
@@ -1,7 +1,6 @@
 CONFIG_WIFI=y
 CONFIG_WIFI_ESP_AT=y
 CONFIG_WIFI_ESP_AT_MDM_RX_BUF_COUNT=40
-CONFIG_WIFI_ESP_AT_PASSIVE_MODE=y
 CONFIG_WIFI_ESP_AT_CIPDINFO_USE=y
 CONFIG_WIFI_ESP_AT_DNS_USE=y
 

diff --git a/port/zephyr/Kconfig b/port/zephyr/Kconfig
@@ -7,8 +7,7 @@ module-str = Golioth
 menuconfig GOLIOTH_FIRMWARE_SDK
 	bool "Golioth Firmware SDK"
 	select COAP
-	select ZVFS_EVENTFD if !ZEPHYR_NRF_MODULE
-	select EVENTFD if ZEPHYR_NRF_MODULE
+	select ZVFS_EVENTFD
 	select REBOOT if BOOTLOADER_MCUBOOT
 	select REQUIRES_FULL_LIBC
 	select MBEDTLS

diff --git a/tests/hil/platform/zephyr/CMakeLists.txt b/tests/hil/platform/zephyr/CMakeLists.txt
@@ -5,4 +5,6 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(test)
 
+zephyr_get(GOLIOTH_HIL_TEST)
+
 target_sources(app PRIVATE src/main.c ../../tests/${GOLIOTH_HIL_TEST}/test.c)
diff --git a/tests/hil/platform/zephyr/boards/nrf52840dk_nrf52840.conf b/tests/hil/platform/zephyr/boards/nrf52840dk_nrf52840.conf
@@ -1,7 +1,6 @@
 CONFIG_WIFI=y
 CONFIG_WIFI_ESP_AT=y
 CONFIG_WIFI_ESP_AT_MDM_RX_BUF_COUNT=40
-CONFIG_WIFI_ESP_AT_PASSIVE_MODE=y
 CONFIG_WIFI_ESP_AT_CIPDINFO_USE=y
 CONFIG_WIFI_ESP_AT_DNS_USE=y
 

diff --git a/tests/hil/platform/zephyr/boards/nrf9160dk_nrf9160_ns.conf b/tests/hil/platform/zephyr/boards/nrf9160dk_nrf9160_ns.conf
@@ -29,6 +29,12 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED=n
 CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED=n
 
+# MbedTLS configuration to support p-384 curve. These options
+# enable using the MbedTLS built-in support for operations not
+# supported by the default nRF Oberon crypto backend
+CONFIG_NORDIC_SECURITY_BACKEND=n
+CONFIG_MBEDTLS_LEGACY_CRYPTO_C=y
+
 # Generate MCUboot compatible images
 CONFIG_BOOTLOADER_MCUBOOT=y
 

diff --git a/west-ncs.yml b/west-ncs.yml
@@ -1,7 +1,7 @@
 manifest:
   projects:
     - name: nrf
-      revision: v2.7.0
+      revision: v2.8.0-rc2
       url: http://github.com/nrfconnect/sdk-nrf
       import: true
 

diff --git a/west-zephyr.yml b/west-zephyr.yml
@@ -1,7 +1,7 @@
 manifest:
   projects:
     - name: zephyr
-      revision: v3.7.0
+      revision: v4.0.0-rc3
       url: https://github.com/zephyrproject-rtos/zephyr
       west-commands: scripts/west-commands.yml
       import: true