From 0287fda07feb7ea611b39718e194e07fe74b5c54 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Tue, 10 Sep 2024 07:34:22 +0200 Subject: [PATCH 1/2] docs: firmware: rename remaining board names for Zephyr 3.7 This is a followup to commit 7e243cefe0b7 ("firmware: fw_update: change board name to for Zephyr 3.7") with more board renames. Signed-off-by: Marcin Niestroj --- docs/_partials-common/build-fw-nrf91.md | 6 +++--- .../firmware-upgrade/fw-update-zephyr.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/_partials-common/build-fw-nrf91.md b/docs/_partials-common/build-fw-nrf91.md index 45fd4162..158619a5 100644 --- a/docs/_partials-common/build-fw-nrf91.md +++ b/docs/_partials-common/build-fw-nrf91.md @@ -13,7 +13,7 @@ values={[ ```console cd ~/golioth-ncs-workspace/zephyr -west build -p auto -b nrf9160dk_nrf9160_ns samples/basic/minimal +west build -p auto -b nrf9160dk/nrf9160/ns samples/basic/minimal ``` @@ -21,7 +21,7 @@ west build -p auto -b nrf9160dk_nrf9160_ns samples/basic/minimal ```console cd ~/golioth-ncs-workspace/zephyr -west build -p auto -b nrf9160dk_nrf9160_ns samples/basic/minimal +west build -p auto -b nrf9160dk/nrf9160/ns samples/basic/minimal ``` @@ -29,7 +29,7 @@ west build -p auto -b nrf9160dk_nrf9160_ns samples/basic/minimal ```console cd %HOMEPATH%\golioth-ncs-workspace\zephyr -west build -p auto -b nrf9160dk_nrf9160_ns samples\basic\minimal +west build -p auto -b nrf9160dk/nrf9160/ns samples\basic\minimal ``` diff --git a/docs/firmware/golioth-firmware-sdk/firmware-upgrade/fw-update-zephyr.md b/docs/firmware/golioth-firmware-sdk/firmware-upgrade/fw-update-zephyr.md index a5114d54..a3c11f41 100644 --- a/docs/firmware/golioth-firmware-sdk/firmware-upgrade/fw-update-zephyr.md +++ b/docs/firmware/golioth-firmware-sdk/firmware-upgrade/fw-update-zephyr.md @@ -83,7 +83,7 @@ CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION="1.2.4" Then build the application a second time. ```console -west build -b nrf9160dk_nrf9160_ns examples/zephyr/fw_update +west build -b nrf9160dk/nrf9160/ns examples/zephyr/fw_update ``` :::note From 0fba83382e2fa27ad489f06a85ae6acc7f752357 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Tue, 10 Sep 2024 07:37:44 +0200 Subject: [PATCH 2/2] docs: firmware: use --sysbuild for nrf9160dk fw_update builds Using sysbuild is now recommended with new NCS versions, as the old multi-image build system got deprecated. The resulting application upgrade file (app_update.bin) is still the same as in old NCS. Signed-off-by: Marcin Niestroj --- .../firmware-upgrade/fw-update-zephyr.md | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/docs/firmware/golioth-firmware-sdk/firmware-upgrade/fw-update-zephyr.md b/docs/firmware/golioth-firmware-sdk/firmware-upgrade/fw-update-zephyr.md index a3c11f41..b11868ef 100644 --- a/docs/firmware/golioth-firmware-sdk/firmware-upgrade/fw-update-zephyr.md +++ b/docs/firmware/golioth-firmware-sdk/firmware-upgrade/fw-update-zephyr.md @@ -51,25 +51,13 @@ Console](https://console.golioth.io). ### 2. Initial build and flash ```console -west build -b nrf9160dk/nrf9160/ns examples/zephyr/fw_update +west build -b nrf9160dk/nrf9160/ns --sysbuild examples/zephyr/fw_update west flash ``` By default this will build and run version `v1.2.3` firmware on the Nordic nRF9160 development kit. -:::tip Building for other devices - -The Nordic version of Zephyr (NCS) uses a slightly different build command from -upstream Zephyr. For non-Nordic boards the build command should also use the -`--sysbuild` flag: - -```console -# Example build command for NXP i.MX RT1024 Evaluation Kit -west build -b mimxrt1024_evk --sysbuild examples/zephyr/fw_update -west flash -``` - ::: ### 3. Rebuild firmware with new version number @@ -83,7 +71,7 @@ CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION="1.2.4" Then build the application a second time. ```console -west build -b nrf9160dk/nrf9160/ns examples/zephyr/fw_update +west build -b nrf9160dk/nrf9160/ns --sysbuild examples/zephyr/fw_update ``` :::note