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

mgmt/mcumgr/grp/img: Cherry-pick MCUboot direct XIP support #1260

Closed
wants to merge 8 commits into from

Commits on Aug 4, 2023

  1. [nrf fromlist] mgmt/mcumgr/grp/img: Add img_mgmt_get_next_boot_slot

    The commit adds functions:
     img_mgmt_get_next_boot_slot
     img_mgmt_get_opposite_slot
    
    to simplify obtaining information on next boot slot.
    
    Upstream PR: zephyrproject-rtos/zephyr#58803
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic authored and MarekPieta committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    8975350 View commit details
    Browse the repository at this point in the history
  2. [nrf fromlist] mgmt/MCUmgr/grp/img: Switch to using img_mgmt_get_next…

    …_boot_slot
    
    The commit modifies image list command operations to use
    img_mgmt_get_next_boot_slot instead of directly relying of
    MCUboot flags.
    The function is now used, also, by img_mgmt_slot_in_use to
    figure out whether queried slot is in use.
    
    Upstream PR: zephyrproject-rtos/zephyr#58803
    
    Added missing declaration of int32_t ret_rc for the image status hook.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic authored and MarekPieta committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    73a6cdd View commit details
    Browse the repository at this point in the history
  3. [nrf fromlist] mcboot: Add CONFIG_MCUBOOT_BOOTUTIL_LIB_FOR_DIRECT_XIP

    The Kconfig option allows to configure bootutil to work with
    MCUboot compiled for DirectXIP with revert.
    Enabling this option is required to modify boot_set_next behaviour
    so that setting application images for test and confirming,
    int DirectXIP-revert mode, would be possible from application.
    
    Upstream PR: zephyrproject-rtos/zephyr#58803
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic authored and MarekPieta committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    cf6d1e6 View commit details
    Browse the repository at this point in the history
  4. [nrf fromlist] mgmt/MCUmgr/grp/img: Add support for DirectXIP with re…

    …vert
    
    The commit adds support for uploading image to board with MCUboot
    configured wiht DirectXIP with revert.
    It allows to set uploaded image either for test or as permanent
    boot application, until never image gets confirmed.
    Note that in DirectXIP with revert MCUboot will remove image
    that has not been set for test nor confirmed and MCUmgr does not
    set either mode unless image has the mode set within uploaded
    binary.
    The commit adds Kconfig option
    CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP_WITH_REVERT
    that enabled the new mode of operation within MCUmgr.
    
    Upstream PR: zephyrproject-rtos/zephyr#58803
    
    Added missing declaration of int32_t ret_rc for the image status hook.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic authored and MarekPieta committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    7f659d2 View commit details
    Browse the repository at this point in the history
  5. [nrf fromlist] samples/mcumgr/smp_svr: Build for DirectXIP with revert.

    Adds sample build for
     CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP_WITH_REVERT=y
    
    Upstream PR: zephyrproject-rtos/zephyr#58803
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic authored and MarekPieta committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    453a4bd View commit details
    Browse the repository at this point in the history
  6. [nrf fromlist] doc/services/device_mgmt: Bootloader info request defi…

    …nition
    
    Specification for MCUmgr OS group command allowing to query
    for bootloader information.
    
    Upstream PR: zephyrproject-rtos/zephyr#57797
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic authored and MarekPieta committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    a235192 View commit details
    Browse the repository at this point in the history
  7. [nrf fromlist] mgmt/MCUmgr/grp/os: Add booloader info support

    Adds command allowing to query information on bootloader.
    In this case support is provided to query MCUboot information.
    
    Upstream PR: zephyrproject-rtos/zephyr#57797
    
    Manually changed from zcbor_int32_decode to zcbor_tstr_decode in
    os_mgmt_bootloader_info.
    
    Manually changed != to == to fix query comparison in
    os_mgmt_bootloader_info.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic authored and MarekPieta committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    2a07bad View commit details
    Browse the repository at this point in the history
  8. [nrf fromlist] doc/services/device_mgmt: Document MCUboot parameters …

    …query
    
    Provide information on supported MCUboot parameters query by MCUmgr
    group OS.
    
    Upstream PR: zephyrproject-rtos/zephyr#57797
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic authored and MarekPieta committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    3ae799b View commit details
    Browse the repository at this point in the history