From 014a3172fab42de423517ed5a1ad7da59152aedf Mon Sep 17 00:00:00 2001 From: Benjamin Bruun Date: Fri, 26 Jul 2024 21:20:50 +0200 Subject: [PATCH 1/8] feat: bump nrf sdk version from 2.6.1 to 2.7.0 --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 5223cec..0bfb915 100644 --- a/west.yml +++ b/west.yml @@ -5,7 +5,7 @@ manifest: projects: - name: sdk-nrf path: nrf - revision: v2.6.1 + revision: v2.7.0 remote: nrfconnect import: true self: From 02d0a3535e523dc1b6e676e7afc250caa43b87db Mon Sep 17 00:00:00 2001 From: Benjamin Bruun Date: Wed, 23 Oct 2024 15:35:44 +0200 Subject: [PATCH 2/8] ci: docker image version bump to 0.26.18 --- .github/workflows/softsim-zephyr-rtos-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/softsim-zephyr-rtos-ci.yml b/.github/workflows/softsim-zephyr-rtos-ci.yml index b9016be..380e9ab 100644 --- a/.github/workflows/softsim-zephyr-rtos-ci.yml +++ b/.github/workflows/softsim-zephyr-rtos-ci.yml @@ -14,7 +14,7 @@ jobs: build-in-zyphyr-ci-container: runs-on: ubuntu-22.04 timeout-minutes: 60 - container: ghcr.io/zephyrproject-rtos/ci:v0.26.14 + container: ghcr.io/zephyrproject-rtos/ci:v0.26.18 env: CMAKE_PREFIX_PATH: /opt/toolchains From 21166f6b66cc36ab551375305d562d747615cea1 Mon Sep 17 00:00:00 2001 From: Benjamin Bruun Date: Wed, 23 Oct 2024 15:39:23 +0200 Subject: [PATCH 3/8] ci: bump version ubuntu host from 22.04 LTS to 24.04 LTS --- .github/workflows/softsim-zephyr-rtos-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/softsim-zephyr-rtos-ci.yml b/.github/workflows/softsim-zephyr-rtos-ci.yml index 380e9ab..95f7f65 100644 --- a/.github/workflows/softsim-zephyr-rtos-ci.yml +++ b/.github/workflows/softsim-zephyr-rtos-ci.yml @@ -12,7 +12,7 @@ concurrency: jobs: build-in-zyphyr-ci-container: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 container: ghcr.io/zephyrproject-rtos/ci:v0.26.18 env: From 7145612a554bab23e0be94b9a86fc220620a905d Mon Sep 17 00:00:00 2001 From: Benjamin Bruun Date: Wed, 4 Dec 2024 10:50:46 +0100 Subject: [PATCH 4/8] ci: force sysbuild for github action update board names to the new standard --- .github/workflows/softsim-zephyr-rtos-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/softsim-zephyr-rtos-ci.yml b/.github/workflows/softsim-zephyr-rtos-ci.yml index 95f7f65..5138168 100644 --- a/.github/workflows/softsim-zephyr-rtos-ci.yml +++ b/.github/workflows/softsim-zephyr-rtos-ci.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: - board: [nrf9160dk_nrf9160_ns, nrf9161dk_nrf9161_ns, nrf9151dk_nrf9151_ns, thingy91_nrf9160_ns, actinius_icarus_ns] + board: [nrf9160dk/nrf9160/ns, nrf9161dk/nrf9161/ns, nrf9151dk/nrf9151/ns, thingy91/nrf9160/ns, actinius/icarus/ns] steps: - name: Initialize workspace @@ -31,12 +31,12 @@ jobs: - name: Build firmware of static profile sample working-directory: modules/lib/onomondo-softsim/samples/softsim_static_profile run: | - west build --pristine=always --board ${{ matrix.board }} + west build --sysbuild --pristine=always --board ${{ matrix.board }} - name: Build firmware of external profile sample working-directory: modules/lib/onomondo-softsim/samples/softsim_external_profile run: | - west build --pristine=always --board ${{ matrix.board }} + west build --sysbuild --pristine=always --board ${{ matrix.board }} - name: Archive SoftSIM External Profile Build uses: actions/upload-artifact@v4 From 939d92b50a1927e40ef13f217ce3da52df593adb Mon Sep 17 00:00:00 2001 From: Benjamin Bruun Date: Wed, 11 Dec 2024 10:36:47 +0100 Subject: [PATCH 5/8] ci: lets limit the amount of custom targets while developing --- .github/workflows/softsim-zephyr-rtos-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/softsim-zephyr-rtos-ci.yml b/.github/workflows/softsim-zephyr-rtos-ci.yml index 5138168..c4602fa 100644 --- a/.github/workflows/softsim-zephyr-rtos-ci.yml +++ b/.github/workflows/softsim-zephyr-rtos-ci.yml @@ -20,7 +20,8 @@ jobs: strategy: matrix: - board: [nrf9160dk/nrf9160/ns, nrf9161dk/nrf9161/ns, nrf9151dk/nrf9151/ns, thingy91/nrf9160/ns, actinius/icarus/ns] + board: [nrf9160dk/nrf9160/ns, nrf9161dk/nrf9161/ns, nrf9151dk/nrf9151/ns] + # board: [nrf9160dk/nrf9160/ns, nrf9161dk/nrf9161/ns, nrf9151dk/nrf9151/ns, thingy91/nrf9160/ns, actinius/icarus/ns] steps: - name: Initialize workspace From d49f771b08f50e6aed34f7842cf8b609a21ff91a Mon Sep 17 00:00:00 2001 From: Benjamin Bruun Date: Fri, 3 Jan 2025 14:34:43 +0100 Subject: [PATCH 6/8] docs: update readme to match the new hardware model --- README.md | 16 +++++++--------- zephyr/module.yml | 3 ++- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 0ba3351..f696503 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,11 @@ # Onomondo SoftSIM for Nordic nRF91 Series > [!IMPORTANT] -> This repository is currently supporting nRF Connect SDK v2.5.1 to v2.6.2. +> This repository is currently transitioning to Zephyr Sysbuild > -> The repository is not yet ported to default sysbuild, introduced in nRF Connect SDK v2.7.0. +> Please ensure that West is configured accordingly or that you build the project using the --sysbuild argument. > -> To build the samples with nRF Connect SDK v2.7.0, use the build option --no-sysbuild -> -> Feel free to contribute to this repository if you have already done the migration to sysbuild. +> Feel free to raise an issue or contribute to this repository if you experience any issue with the migration to sysbuild. The Onomondo SoftSIM is an [Open Source](https://github.com/onomondo/onomondo-uicc) C based UICC implementation, allowing new and innovative cellular device designs to see the light of day in the ever-growing landscape of IoT! @@ -28,7 +26,7 @@ west update Getting started with the external profile sample ``` cd modules/lib/onomondo-softsim/samples/softsim_external_profile -west build -b nrf9151dk_nrf9151_ns +west build -b nrf9151dk/nrf9151/ns west flash ``` @@ -140,7 +138,7 @@ Which results in: For most samples and applications, it's sufficient to build by executing the following command: ```_ -west build -b nrf9151dk_nrf9151_ns -- "-DOVERLAY_CONFIG=$PATH_TO_ONOMONDO_SOFTSIM/overlay-softsim.conf" +west build -b nrf9151dk/nrf9151/ns -- "-DOVERLAY_CONFIG=$PATH_TO_ONOMONDO_SOFTSIM/overlay-softsim.conf" ``` Where `PATH_TO_ONOMONDO_SOFTSIM` is the path of the downloaded Onomondo SoftSIM repository, for example `$HOME/ncs/nrf-softsim-dev`. @@ -148,7 +146,7 @@ Where `PATH_TO_ONOMONDO_SOFTSIM` is the path of the downloaded Onomondo SoftSIM SoftSIM is relying on some default data in the storage partition. This section of the flash can be generated and flashed manually (see steps below) or, as we recommend, automatically included by `CONFIG_SOFTSIM_BUNDLE_TEMPLATE_HEX=y` Manually generating SoftSIM profile template data: -1. After building the application, generate the application-specific template profile. `west build -b nrf9151dk_nrf9151_ns -t onomondo_softsim_template` +1. After building the application, generate the application-specific template profile. `west build -b nrf9151dk/nrf9151/ns -t onomondo_softsim_template` 2. Flash the application-specific template profile. `west flash --hex-file build/onomondo-softsim/template.hex` If the partition table of the application changes, for example due to another partition changing size, the template profile must be rebuilt and flashed again. @@ -162,7 +160,7 @@ Some applications will fail to link with error `zephyr/zephyr_pre0.elf uses VFP the application directory. The application can then be built like this: ``` -west build -b nrf9151dk_nrf9151_ns -- "-DOVERLAY_CONFIG=$PATH_TO_ONOMONDO_SOFTSIM/overlay-softsim.conf;overlay-softsim.conf" +west build -b nrf9151dk/nrf9151/ns -- "-DOVERLAY_CONFIG=$PATH_TO_ONOMONDO_SOFTSIM/overlay-softsim.conf;overlay-softsim.conf" ``` #### Note diff --git a/zephyr/module.yml b/zephyr/module.yml index b343a3b..9d5290d 100644 --- a/zephyr/module.yml +++ b/zephyr/module.yml @@ -1,4 +1,5 @@ name: softsim + build: cmake: . kconfig: ./Kconfig @@ -6,4 +7,4 @@ build: - trusted-firmware-m samples: - - samples \ No newline at end of file + - samples From cdf5e3ce95a7d707a9e42e25b4e5392be5e7e5eb Mon Sep 17 00:00:00 2001 From: Benjamin Bruun Date: Fri, 3 Jan 2025 15:08:20 +0100 Subject: [PATCH 7/8] ci: revert github actions host version bump found in another pr --- .github/workflows/softsim-zephyr-rtos-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/softsim-zephyr-rtos-ci.yml b/.github/workflows/softsim-zephyr-rtos-ci.yml index c4602fa..6ee2e57 100644 --- a/.github/workflows/softsim-zephyr-rtos-ci.yml +++ b/.github/workflows/softsim-zephyr-rtos-ci.yml @@ -12,7 +12,7 @@ concurrency: jobs: build-in-zyphyr-ci-container: - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 timeout-minutes: 60 container: ghcr.io/zephyrproject-rtos/ci:v0.26.18 env: From 1e74eb4e03f40b2ef9423ffb05cc01a72017d51d Mon Sep 17 00:00:00 2001 From: Benjamin Bruun Date: Fri, 3 Jan 2025 15:22:41 +0100 Subject: [PATCH 8/8] fix: better readable kconfig options in kconfig gui --- Kconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Kconfig b/Kconfig index 8f5ac8d..c786be3 100644 --- a/Kconfig +++ b/Kconfig @@ -1,3 +1,5 @@ +menu "Onomondo SoftSIM Options" + config SOFTSIM bool "SoftSIM" depends on NVS @@ -37,6 +39,7 @@ config SOFTSIM_BUNDLE_TEMPLATE_HEX endif #SOFTSIM +endmenu module = SOFTSIM module-str = Onomondo-SoftSIM