Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

doc: nrf: app_dev: bootloaders_dfu: Add sysbuild image ID docs #18152

Merged
merged 1 commit into from
Oct 29, 2024

Conversation

nordicjm
Copy link
Contributor

Adds documentation describing this feature

@nordicjm nordicjm added CI-disable Disable CI for this PR doc only labels Oct 24, 2024
@github-actions github-actions bot added doc-required PR must not be merged without tech writer approval. changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Oct 24, 2024
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Oct 24, 2024

CI Information

To view the history of this post, clich the 'edited' button above
Build number: 6

Inputs:

Sources:

more details

Github labels

Enabled Name Description
ci-disabled Disable the ci execution
ci-all-test Run all of ci, no test spec filtering will be done
ci-force-downstream Force execution of downstream even if twister fails
ci-run-twister Force run twister
ci-run-zephyr-twister Force run zephyr twister
List of changed files detected by CI (0)

Outputs:

Toolchain

Version:
Build docker image:

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

  • ◻️ Toolchain
  • ◻️ Build twister
  • ◻️ Integration tests

Note: This message is automatically posted and updated by the CI

@nordicjm
Copy link
Contributor Author

@greg-fer would you be able to have a quick once over of this documentation? I've disabled the doc build as it requires a previous PR to be merged for the Kconfig options

@nordicjm nordicjm force-pushed the imageiddoc branch 3 times, most recently from def9e51 to eef2e3d Compare October 24, 2024 12:48
@NordicBuilder
Copy link
Contributor

You can find the documentation preview for this PR at this link. It will be updated about 10 minutes after the documentation build succeeds.

Note: This comment is automatically posted by the Documentation Publishing GitHub Action.

@nordicjm nordicjm marked this pull request as ready for review October 25, 2024 06:13
@nordicjm nordicjm requested a review from a team as a code owner October 25, 2024 06:13
@nordicjm nordicjm added this to the 2.8.0 milestone Oct 25, 2024
@nordicjm nordicjm removed the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Oct 25, 2024
doc/nrf/app_dev/bootloaders_dfu/sysbuild_image_ids.rst Outdated Show resolved Hide resolved
doc/nrf/app_dev/bootloaders_dfu/sysbuild_image_ids.rst Outdated Show resolved Hide resolved
doc/nrf/app_dev/bootloaders_dfu/sysbuild_image_ids.rst Outdated Show resolved Hide resolved
doc/nrf/app_dev/bootloaders_dfu/sysbuild_image_ids.rst Outdated Show resolved Hide resolved
doc/nrf/app_dev/bootloaders_dfu/sysbuild_image_ids.rst Outdated Show resolved Hide resolved
doc/nrf/app_dev/bootloaders_dfu/sysbuild_image_ids.rst Outdated Show resolved Hide resolved
doc/nrf/app_dev/bootloaders_dfu/sysbuild_image_ids.rst Outdated Show resolved Hide resolved
doc/nrf/app_dev/bootloaders_dfu/sysbuild_image_ids.rst Outdated Show resolved Hide resolved
doc/nrf/app_dev/bootloaders_dfu/sysbuild_image_ids.rst Outdated Show resolved Hide resolved
doc/nrf/app_dev/bootloaders_dfu/sysbuild_image_ids.rst Outdated Show resolved Hide resolved
@github-actions github-actions bot added the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Oct 28, 2024
@nordicjm nordicjm requested a review from annwoj October 28, 2024 12:18
@nordicjm nordicjm added backport v2.8-branch auto-create a PR with same commits to v2.8-branch and removed changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Oct 28, 2024
Copy link
Contributor

@greg-fer greg-fer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor nits, incl. for cross-linking.

Comment on lines +51 to +54

.. _sysbuild_assigned_images_ids_mcuboot_only:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
.. _sysbuild_assigned_images_ids_mcuboot_only:
See :ref:`configuring_kconfig` for information about how to configure these options.
.. _sysbuild_assigned_images_ids_mcuboot_only:

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

This setup supports features like shared secondary slots.
Currently, MCUboot uses this capability to update itself, which can be enabled with secure boot.
MCUboot then shares the main application's secondary slot for firmware updates.
However, it directly transfers the update to the designated MCUboot image slot, which is then booted by |NSIB|.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
However, it directly transfers the update to the designated MCUboot image slot, which is then booted by |NSIB|.
However, it directly transfers the update to the designated MCUboot image slot, which is then booted by :ref:`bootloader`.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

***********************************

When building with sysbuild, the image IDs are provided to the application through Kconfig values and can be used in the code as needed.
These image IDs are also used in |NCS| hooks for tasks such as nRF5340 network core updates, so no additional configuration is required.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this an allusion to https://docs.nordicsemi.com/bundle/ncs-latest/page/nrf/app_dev/device_guides/nrf53/serial_recovery.html ? Can we link there?

Suggested change
These image IDs are also used in |NCS| hooks for tasks such as nRF5340 network core updates, so no additional configuration is required.
These image IDs are also used in |NCS| hooks for various tasks (such as :ref:`nRF5340 network core updates <ug_nrf5340_serial_recovery>`), so no additional configuration is required.

or maybe to https://docs.nordicsemi.com/bundle/ncs-latest/page/nrf/app_dev/device_guides/nrf53/simultaneous_multi_image_dfu_nrf5340.html ? (In such case, the ref is ug_nrf5340_multi_image_dfu.)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed to second link

If the version in the update is lower than the current version, MCUboot will reject the update and not transfer it to the opposing secure boot firmware slot.

Additionally, make sure to load the correct update image onto the device.
If MCUboot is currently running from the s0 slot, then you must use the s1 update, and if it is running from the s1 slot, then you must use the s0 update.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
If MCUboot is currently running from the s0 slot, then you must use the s1 update, and if it is running from the s1 slot, then you must use the s0 update.
If MCUboot is currently running from the `s0` slot, then you must use the `s1` update, and if it is running from the `s1` slot, then you must use the `s0` update.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed, assuming these should have been ``

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, correct, ``.

Adds documentation describing this feature

Signed-off-by: Jamie McCrae <[email protected]>
@github-actions github-actions bot added the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Oct 29, 2024
@rlubos rlubos merged commit 3ab71f2 into nrfconnect:main Oct 29, 2024
13 checks passed
@nordicjm nordicjm deleted the imageiddoc branch November 6, 2024 07:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport v2.8-branch auto-create a PR with same commits to v2.8-branch changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. CI-disable Disable CI for this PR doc only doc-required PR must not be merged without tech writer approval.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants