diff --git a/.github/workflows/softsim-zephyr-rtos-ci.yml b/.github/workflows/softsim-zephyr-rtos-ci.yml index 431681f..6f0d105 100644 --- a/.github/workflows/softsim-zephyr-rtos-ci.yml +++ b/.github/workflows/softsim-zephyr-rtos-ci.yml @@ -22,7 +22,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: # Initialize a Zephyr West workspace in its default format @@ -44,12 +45,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 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 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/west.yml b/west.yml index faf9473..0bfb915 100644 --- a/west.yml +++ b/west.yml @@ -5,7 +5,7 @@ manifest: projects: - name: sdk-nrf path: nrf - revision: v2.6.2 + revision: v2.7.0 remote: nrfconnect import: true self: 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