bump Golioth SDK to 0.21.0

This comes with Zephyr 4.2.1 and NCS 3.1.1.

Add a workaround that creates edt.pickle file based on empty dts source,
which is now expected by sysbuild trying to import it.

Pass '-a' flag to 'west blobs fetch ...' command, so that blobs licence is
auto-accepted.

Signed-off-by: Marcin Niestroj <m.niestroj@emb.dev>

Author: mniestroj

.github/workflows/build.yml

@@ -91,7 +91,7 @@ jobs:
 
       - name: Fetch Binary Blobs
         if: ${{ matrix.blobs }}
-        run: west blobs fetch ${{ matrix.blobs }}
+        run: west blobs fetch -a ${{ matrix.blobs }}
 
       - name: Build
         id: build

bsim_bin/CMakeLists.txt

@@ -14,7 +14,7 @@ find_package(Zephyr REQUIRED
     zephyr_module
     boards
     hwm_v2
-    soc_v2
+    soc
 )
 project(bsim_bin LANGUAGES)
 
@@ -27,3 +27,13 @@ foreach(dir ${BOARD_DIRECTORIES})
 endforeach()
 
 add_subdirectory(${ZEPHYR_BASE}/cmake/flash flash)
+
+set(gen_dts_edt ${ZEPHYR_BASE}/scripts/dts/gen_edt.py)
+execute_process(
+    COMMAND ${PYTHON_EXECUTABLE} ${gen_dts_edt}
+    --dts ${CMAKE_CURRENT_SOURCE_DIR}/empty.dts
+    --dtc-flags ""
+    --bindings-dirs ${CMAKE_CURRENT_SOURCE_DIR}
+    --dts-out ${CMAKE_CURRENT_BINARY_DIR}/zephyr/zephyr.dts
+    --edt-pickle-out ${CMAKE_CURRENT_BINARY_DIR}/zephyr/edt.pickle
+)

bsim_bin/empty.dts

@@ -0,0 +1,4 @@
+/dts-v1/;
+
+/ {
+};

gateway/socs/nrf9151_ns.conf

@@ -31,6 +31,7 @@ CONFIG_GOLIOTH_SAMPLE_NRF91_LTE_MONITOR=y
 # Disable options y-selected by NCS for no good reason
 CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED=n
 CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED=n
+CONFIG_MBEDTLS_PK_PARSE_EC_EXTENDED=n
 
 # MbedTLS configuration to support p-384 curve. These options
 # enable using the MbedTLS built-in support for operations not

gateway/socs/nrf9160_ns.conf

@@ -31,6 +31,7 @@ CONFIG_GOLIOTH_SAMPLE_NRF91_LTE_MONITOR=y
 # Disable options y-selected by NCS for no good reason
 CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED=n
 CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED=n
+CONFIG_MBEDTLS_PK_PARSE_EC_EXTENDED=n
 
 # MbedTLS configuration to support p-384 curve. These options
 # enable using the MbedTLS built-in support for operations not

west-ncs.yml

@@ -4,12 +4,12 @@ manifest:
   projects:
     - name: golioth
       path: modules/lib/golioth-firmware-sdk
-      revision: v0.20.0
+      revision: v0.21.0
       url: https://github.com/golioth/golioth-firmware-sdk.git
       import:
         file: west-ncs.yml
         name-allowlist:
-          - cmsis
+          - cmsis_6
           - hal_nordic
           - littlefs
           - mbedtls

west-zephyr.yml

@@ -4,12 +4,12 @@ manifest:
   projects:
     - name: golioth
       path: modules/lib/golioth-firmware-sdk
-      revision: v0.20.0
+      revision: v0.21.0
       url: https://github.com/golioth/golioth-firmware-sdk.git
       import:
         file: west-zephyr.yml
         name-allowlist:
-          - cmsis
+          - cmsis_6
           - hal_nordic
           - hal_nxp
           - littlefs

zephyr/patches.yml

@@ -1,102 +1,46 @@
 patches:
   - path: zephyr/zephyr/0001-drivers-net-nsos-support-nrf_bsim.patch
-    sha256sum: a3238fc52d954c6b133807d19e5f6d7c280aec43bea2260f6a99426ce9be3d00
+    sha256sum: 25ce052740bb44d2d575a7f3187817cf1f22aa41c6328982f0f1b3c4f8ad7593
     module: zephyr
     author: Marcin Niestroj
     email: m.niestroj@emb.dev
     date: 2025-01-14
     apply-command: >-
       bash -c 'if [ $(west config manifest.file) = "west-zephyr.yml" ]; then git am $@; fi' --
   - path: zephyr/zephyr/0002-boards-nrf_bsim-define-NSOS_IRQ-for-offloaded-socket.patch
-    sha256sum: 91b8c959d6b784878ea6b86a59ce034212f5829887990b08d522d0e728942069
+    sha256sum: 13916913dc7f11cd4d5d3ef875da739818e90fac8847f2ce244f3f6705c03149
     module: zephyr
     author: Marcin Niestroj
     email: m.niestroj@emb.dev
     date: 2025-01-14
     apply-command: >-
       bash -c 'if [ $(west config manifest.file) = "west-zephyr.yml" ]; then git am $@; fi' --
-  - path: zephyr/zephyr/0003-native_simulator-Get-latest-from-upstream.patch
-    sha256sum: 35a68f88aeaf5243e43265ab9e030f5638c5e1a1f9d7991ee81019930a36823b
-    module: zephyr
-    author: Alberto Escolar Piedras
-    email: alberto.escolar.piedras@nordicsemi.no
-    date: 2025-02-18
-    apply-command: >-
-      bash -c 'if [ $(west config manifest.file) = "west-zephyr.yml" ]; then git am $@; fi' --
-  - path: zephyr/zephyr/0004-native_simulator-Get-latest-from-upstream.patch
-    sha256sum: 202abed48a60c80abc9b6be6688fbf93d519c8ee14675a60551e248040e39fe4
-    module: zephyr
-    author: Alberto Escolar Piedras
-    email: alberto.escolar.piedras@nordicsemi.no
-    date: 2025-02-24
-    apply-command: >-
-      bash -c 'if [ $(west config manifest.file) = "west-zephyr.yml" ]; then git am $@; fi' --
-  - path: zephyr/zephyr/0005-native-posix-arch-Add-option-to-enable-building-of-n.patch
-    sha256sum: 8fcbec6fecf97778aa0571b347b2e488182057975823d5ae4743739c542e5554
-    module: zephyr
-    author: Alberto Escolar Piedras
-    email: alberto.escolar.piedras@nordicsemi.no
-    date: 2025-02-24
-    apply-command: >-
-      bash -c 'if [ $(west config manifest.file) = "west-zephyr.yml" ]; then git am $@; fi' --
-  - path: zephyr/zephyr/0006-native_simulator-Get-latest-from-upstream.patch
-    sha256sum: e366d91d21a89db3e0021b81e5852b7b13ba2e61c3db5a0451d254b65867f754
-    module: zephyr
-    author: Alberto Escolar Piedras
-    email: alberto.escolar.piedras@nordicsemi.no
-    date: 2025-02-26
-    apply-command: >-
-      bash -c 'if [ $(west config manifest.file) = "west-zephyr.yml" ]; then git am $@; fi' --
-  - path: zephyr/zephyr/0007-Bluetooth-userchan-Support-other-libCs.patch
-    sha256sum: ce7c0f0c92a4d5e6ff77c1cb83c6351b083e36c2b15c524362fa7053769b985a
-    module: zephyr
-    author: Alberto Escolar Piedras
-    email: alberto.escolar.piedras@nordicsemi.no
-    date: 2025-02-26
-    apply-command: >-
-      bash -c 'if [ $(west config manifest.file) = "west-zephyr.yml" ]; then git am $@; fi' --
-  - path: zephyr/zephyr/0008-board-native_sim-BT-userchan-now-supports-picolibc.patch
-    sha256sum: 4b3afebc6a97cbb1908f3672168f5ed659285add32db831f2f1c6e92c316c3ee
-    module: zephyr
-    author: Alberto Escolar Piedras
-    email: alberto.escolar.piedras@nordicsemi.no
-    date: 2025-02-26
-    apply-command: >-
-      bash -c 'if [ $(west config manifest.file) = "west-zephyr.yml" ]; then git am $@; fi' --
-  - path: zephyr/zephyr/0009-drivers-nsos-Use-native-simulator-errno-conversion.patch
-    sha256sum: a4bd24f61846f0c4b9848e1a6cb0233720d867c47ffb1abdc99c9eaf262dd11b
-    module: zephyr
-    author: Alberto Escolar Piedras
-    email: alberto.escolar.piedras@nordicsemi.no
-    date: 2025-02-24
-    apply-command: >-
-      bash -c 'if [ $(west config manifest.file) = "west-zephyr.yml" ]; then git am $@; fi' --
-  - path: zephyr/zephyr/0010-nsi-move-nsos_fcntl-to-more-generic-nsi_fcntl.patch
-    sha256sum: 01a73074a3e673ee5618a10edb366f6bead53ff06b552fecd86c9e8323884fdc
+  - path: zephyr/zephyr/0003-nsi-move-nsos_fcntl-to-more-generic-nsi_fcntl.patch
+    sha256sum: 0830899d226a3b7cd1f7b002b8cd746857a41f2a19ee899bfc5cf15773f296c5
     module: zephyr
     author: Marcin Niestroj
     email: m.niestroj@emb.dev
     date: 2025-08-05
     apply-command: >-
       bash -c 'if [ $(west config manifest.file) = "west-zephyr.yml" ]; then git am $@; fi' --
-  - path: zephyr/zephyr/0011-nsi-fcntl-add-O_CREAT-and-O_TRUNC.patch
-    sha256sum: e1d77d84f84fb7904559b083270875c73e2d38f6567503eb5a7ca580c5397682
+  - path: zephyr/zephyr/0004-nsi-fcntl-add-O_CREAT-and-O_TRUNC.patch
+    sha256sum: dd53fd69065fa432a38a53176778a529ec7cf89b5823c42fd7fa1fcedfb1fd23
     module: zephyr
     author: Marcin Niestroj
     email: m.niestroj@emb.dev
     date: 2025-08-14
     apply-command: >-
       bash -c 'if [ $(west config manifest.file) = "west-zephyr.yml" ]; then git am $@; fi' --
-  - path: zephyr/zephyr/0012-subsys-fs-nsim_mount-new-FS-for-mounting-host-filesy.patch
-    sha256sum: ddad24efe17347947fe86d0e5b000e343c907b2e8dcfe526a0d36c7d0d99983e
+  - path: zephyr/zephyr/0005-subsys-fs-nsim_mount-new-FS-for-mounting-host-filesy.patch
+    sha256sum: 7380f056216807ca15d220233e38b3b407c0b1fb825e5b4794ae6c926b13e4f0
     module: zephyr
     author: Marcin Niestroj
     email: m.niestroj@emb.dev
     date: 2025-08-14
     apply-command: >-
       bash -c 'if [ $(west config manifest.file) = "west-zephyr.yml" ]; then git am $@; fi' --
-  - path: zephyr/zephyr/0013-tests-fs-nsim_mount-add-basic-tests-for-implemented-.patch
-    sha256sum: 17d5c28831de1b2218aea89cb343f0e36822cc2419f5b60b94d6f57a428b67e7
+  - path: zephyr/zephyr/0006-tests-fs-nsim_mount-add-basic-tests-for-implemented-.patch
+    sha256sum: 5117af152443b7d703e7c8b0fafa76a1d3cf34e5077b1587fbe09583129bbaad
     module: zephyr
     author: Marcin Niestroj
     email: m.niestroj@emb.dev

zephyr/patches/zephyr/zephyr/0001-drivers-net-nsos-support-nrf_bsim.patch

@@ -1,4 +1,4 @@
-From 51b9444d0c08601efd996e854f22367564801cfe Mon Sep 17 00:00:00 2001
+From 073a10f50ff7275970471af29f27b6ba5c4b17b5 Mon Sep 17 00:00:00 2001
 From: Marcin Niestroj <m.niestroj@emb.dev>
 Date: Tue, 14 Jan 2025 16:53:03 +0100
 Subject: [PATCH] drivers: net: nsos: support nrf_bsim
@@ -14,10 +14,10 @@ Signed-off-by: Marcin Niestroj <m.niestroj@emb.dev>
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/net/nsos_adapt.c b/drivers/net/nsos_adapt.c
-index af98caaa4c1..7909a1655e6 100644
+index d1631efc651..9e908982e38 100644
 --- a/drivers/net/nsos_adapt.c
 +++ b/drivers/net/nsos_adapt.c
-@@ -1078,7 +1078,11 @@ static void nsos_adapt_poll_triggered(void)
+@@ -1164,7 +1164,11 @@ static void nsos_adapt_poll_triggered(void)
  	}
 
  	if (ret > 0) {
@@ -30,5 +30,5 @@ index af98caaa4c1..7909a1655e6 100644
  	} else {
  		nsos_adapt_poll_time = nsi_hws_get_time() + NSOS_EPOLL_WAIT_INTERVAL;
 -- 
-2.48.1
+2.51.0
 

zephyr/patches/zephyr/zephyr/0002-boards-nrf_bsim-define-NSOS_IRQ-for-offloaded-socket.patch

@@ -1,4 +1,4 @@
-From 2c56ec7effb568b9963826d25e7b3c91dd7a415d Mon Sep 17 00:00:00 2001
+From dacb35a6427d1f177bada3e10cea8162af5c0757 Mon Sep 17 00:00:00 2001
 From: Marcin Niestroj <m.niestroj@emb.dev>
 Date: Tue, 14 Jan 2025 17:02:25 +0100
 Subject: [PATCH] boards: nrf_bsim: define NSOS_IRQ for offloaded sockets
@@ -52,5 +52,5 @@ index e0b1cb60a59..a99916ec2cf 100644
  #define FLASH_PAGE_MAX_CNT		256UL
 
 -- 
-2.48.1
+2.51.0