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

[DNM] Upmerge 20231208 #290

Closed
wants to merge 114 commits into from
Closed

Commits on Aug 29, 2023

  1. zephyr: Fix boot serial extensions

    Fixes building the bootloader with serial recovery mode and boot
    serial extensions enabled due to changes in Zephyr's MCUmgr file
    and naming changes.
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm authored and de-nordic committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    e188dbb View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2023

  1. Add Espressif build status badge

    Add new badge to easily check build status for Espressif CI.
    
    Signed-off-by: Fabio Utzig <utzig@apache.org>
    utzig committed Sep 2, 2023
    Configuration menu
    Copy the full SHA
    0d2772c View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2023

  1. docs: espressif: fix formatting of markdown

    Fix documentation issues for the rendering of the Espressif README
    page. No content is changed with this commit, but formatting and
    line breaks are set to approximately 100 columns.
    
    Signed-off-by: Fabio Utzig <utzig@apache.org>
    utzig authored and almir-okato committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    b58962f View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2023

  1. docs: update github-pages and deps versions

    Update to versions matching: https://pages.github.com/versions/
    
    Signed-off-by: Fabio Utzig <utzig@apache.org>
    utzig committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    54fd52d View commit details
    Browse the repository at this point in the history
  2. docs: add jemoji plugin

    This plugin enables jekyll to display emojis; the version added matches
    current on github-pages (https://pages.github.com/versions/)
    
    Signed-off-by: Fabio Utzig <utzig@apache.org>
    utzig committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    b688ef7 View commit details
    Browse the repository at this point in the history
  3. docs: add webrick dependency

    webrick needs to be installed for ruby versions >3, which should ease
    local testing for someone running newer versions. This is compatible
    with running on ruby 2.7.4, the version used on github pages.
    
    Signed-off-by: Fabio Utzig <utzig@apache.org>
    utzig committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    f0ad026 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2023

  1. zephyr: Fix build for non-arm archs

    Guards the inclusion of cmsis_core header for
    ARM targets only.
    
    Fixes #1799
    
    Signed-off-by: Lucas Tamborrino <lucas.tamborrino@espressif.com>
    LucasTambor authored and nordicjm committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    9bf7ce8 View commit details
    Browse the repository at this point in the history
  2. zephyr: Provide third image cases for direct image upload

    The commit adds missing support for direct upload of third
    image slots.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    0035c33 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2023

  1. boot: zephyr: use indication LED also in timeout based recovery

    This adds support for indication LED option (MCUBOOT_INDICATION_LED) in
    the timeout based recovery. Configured LED will be enabled when entering
    the recovery and disabled after selected timeout (if no mcumgr command
    was received).
    
    Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
    pepe2k authored and nordicjm committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    3790f5f View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2023

  1. boot_serial: Fix missing point if using snprintf

    Adds missing point in version when snprintf is used
    
    Signed-off-by: Benjamin Bigler <benjamin.bigler@securiton.ch>
    biglben authored and nordicjm committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    480b97f View commit details
    Browse the repository at this point in the history
  2. espressif: use minimal libc as default for ESP32 boards

    Make MINIMAL_LIBC as default for MCUboot app build instead
    of picolibc. Footprint is lower and no need to
    MULTLTHREADING enabled for SoC build.
    
    Signed-off-by: Sylvio Alves <sylvio.alves@espressif.com>
    sylvioalves authored and almir-okato committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    b847a33 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2023

  1. boot_serial: Fix include

    Fixes an include which is needed for multiple options by just
    always including it, and fixing the path so it can be included.
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm authored and de-nordic committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    5c5222f View commit details
    Browse the repository at this point in the history
  2. zephyr: Fall back to minimal C library

    Changes back to the minimal C library instead of picolibc to
    reduce flash usage
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    8f8fbf9 View commit details
    Browse the repository at this point in the history
  3. bootutil: PSA Crypto ECDSA enablement

    This commit enables ECDSA signature verification using
    PSA Crypto API.
    
    Signed-off-by: Roland Mikhel <roland.mikhel@arm.com>
    Change-Id: I51c7aadba03348f335e89d9252e70c09f8787f30
    Roland Mikhel authored and davidvincze committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    274547c View commit details
    Browse the repository at this point in the history
  4. sim: PSA Crypto ECDSA enablement

    This commit enables ECDSA signature verification using
    PSA Crypto API.
    
    Signed-off-by: Roland Mikhel <roland.mikhel@arm.com>
    Change-Id: I33f559ecdd59b1ce41c6a2d5f315212300d585e3
    Roland Mikhel authored and davidvincze committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    5899fac View commit details
    Browse the repository at this point in the history
  5. bootutil: Replace hash with SHA384 when P384 is used

    Currently all the hashing functionality is done with SHA256
    but if we would like to use ECDSA-P384 that requires SHA384
    as the hashing algorithm, but MCUboot is using SHA256
    for image hashing and public key hashing. This commit modifies
    the hashing operations to use SHA384 thus SHA256 can be omitted
    which is beneficial from a code size standpoint.
    
    Signed-off-by: Roland Mikhel <roland.mikhel@arm.com>
    Change-Id: I59230f76f88e0b42ad6383b2c9b71b73f33d7dd7
    Roland Mikhel authored and davidvincze committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    03c9ad0 View commit details
    Browse the repository at this point in the history
  6. sim: Replace hash with SHA384 when P384 is used

    Currently all the hashing functionality is done with SHA256
    but if we would like to use ECDSA-P384 that requires SHA384
    as the hashing algorithm. However, MCUboot is using SHA256
    for image hashing and public key hashing. This commit modifies
    the hashing operations to use SHA384 thus SHA256 can be omitted
    which is beneficial from a code size standpoint.
    
    Signed-off-by: Roland Mikhel <roland.mikhel@arm.com>
    Change-Id: I364eefe334e4fe6668b8a3b97991b5dbb0c80104
    Roland Mikhel authored and davidvincze committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    fb5507b View commit details
    Browse the repository at this point in the history
  7. ci: Add test cases for ECDSA using PSA Crypto

    Add ECDSA verification tests to the CI using the PSA Crypto API
    
    Signed-off-by: Roland Mikhel <roland.mikhel@arm.com>
    Change-Id: I904c8929f355ec791ff28ac7c3e0ca3832b2403d
    Roland Mikhel authored and davidvincze committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    5c00da4 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. boot_serial: Fix issue with queued commands

    Fixes an issue whereby multiple commands are received and some
    are still being processed. This generally arises when a response
    takes a long time (e.g. when image decryption is required),
    duplicate commands will now send multiple responses but avoids
    the bug of future commands being sent to which previous responses
    are received.
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm authored and nvlsianpu committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    6ba46c0 View commit details
    Browse the repository at this point in the history
  2. docs: release: Add note on boot_serial duplicate command fix

    Adds a note about a fix for boot_serial duplicate commands
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm authored and nvlsianpu committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    5f30562 View commit details
    Browse the repository at this point in the history
  3. boot_serial: Fix issues with single slot mode/encrypted images

    Fixes 2 issues, one whereby multiple slots were checked despite
    operating in single slot mode, and another whereby decrypted
    images would not appear on serial recovery image listing, due
    to assuming that the images were still encrypted.
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    c7aa2c0 View commit details
    Browse the repository at this point in the history
  4. docs: release: Add note on bs image list fixes

    Adds a note on fixes with boot serial image listing
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    736234c View commit details
    Browse the repository at this point in the history
  5. espressif: update secure boot and flash encryption

    Adjust secure boot and flash encryption after IDF v5.x updates.
    It also allows to enable secure boot on ESP32-C2.
    
    Signed-off-by: Almir Okato <almir.okato@espressif.com>
    almir-okato committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    db2024e View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2023

  1. bootutil/crypto: Do not include import key with PSA

    This fixes a build error when PSA Crypto API is being used
    as it has no need for bootutil_import_key but it's included
    currently since it's allowed to have both Mbed TLS and PSA defined.
    
    Signed-off-by: Roland Mikhel <roland.mikhel@arm.com>
    Change-Id: If38d3011fc4fa2d317f8be65df9e231d7d57dcbf
    Roland Mikhel authored and davidvincze committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    9bef51c View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2023

  1. zephyr: Add shared data support

    Adds the ability to share mcuboot configuration with the
    application using Zephyr's retention subsystem.
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    4da5101 View commit details
    Browse the repository at this point in the history
  2. docs: Add note on addition of zephyr retention shared boot info

    Adds a note that Zephyr can now use the retention subsystem to
    share information with applications about MCUboot's configuration.
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    6c8c76f View commit details
    Browse the repository at this point in the history
  3. bootutil: Add mode for XIP with revert

    Adds a new define if bootloader in built in direct-XIP with revert
    mode
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm authored and de-nordic committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    8d0b35a View commit details
    Browse the repository at this point in the history
  4. bootutil: Add shared data support for XIP with revert mode

    Adds support for sharing the direct-XIP MCUboot mode with revert
    to applications using shared data
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm authored and de-nordic committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    50f8b5f View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2023

  1. zephyr: Allow user-defined boot serial extensions

    This allows for out-of-tree modules to define their own boot serial
    functions by using iterable sections.
    Note that this also removes the custom img list command, which was
    not used in-tree.
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    268433e View commit details
    Browse the repository at this point in the history
  2. docs: release: Add note on boot serial extension rework

    Adds a note on the reworked boot serial extensions features which
    now allows modules to add handlers
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    ae2aeed View commit details
    Browse the repository at this point in the history
  3. bootutil: Show error if flash area open fails

    Shows an error if a particular flash area fails to open
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    2929a97 View commit details
    Browse the repository at this point in the history
  4. docs: release: Add note on panicking if flash device open fails

    Adds a note that flash open failing will cause the bootloader to
    panic and now prints a verbose error out when this happens
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    bf8cf46 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2023

  1. docs: Update release notes for 2.0.0-rc1

    Collect release notes, and add a bit about the API change.
    
    Signed-off-by: David Brown <david.brown@linaro.org>
    d3zd3z committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    62e2b4d View commit details
    Browse the repository at this point in the history
  2. scripts: imgtool: update to 2.0.0-rc1 release

    Update the version of imgtool.  This should auto-publish when
    released.
    
    Signed-off-by: David Brown <david.brown@linaro.org>
    d3zd3z committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    6a6de4b View commit details
    Browse the repository at this point in the history
  3. Update zephyr version files for 2.0.0-rc1

    Update for the rc1 release.
    
    Signed-off-by: David Brown <david.brown@linaro.org>
    d3zd3z committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    4fe28b3 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2023

  1. bootutil: Disable MCUBOOT_BOOT_MAX_ALIGN assert for non-swap modes

    - Assert should be checked only for SWAP update modes.
    - Allow platforms with page size >32 Bytes (e.g. LPC) to use
      MCUBoot, at least for non-SWAP update modes.
    
    Signed-off-by: Andrej Butok <andrey.butok@nxp.com>
    butok authored and nordicjm committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    13767d0 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2023

  1. boot: zephyr: add support for LPC55Sxx

    Add configuration for LPC55Sxx to MCUBoot.
    It supports the upgrade only mode.
    
    Signed-off-by: Andrej Butok <andrey.butok@nxp.com>
    butok authored and nordicjm committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    9b92ee9 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2023

  1. espressif: allow the use of a different toolchain for building

    TOOLCHAIN_BIN_DIR can be defined for a different toolchain use.
    
    Signed-off-by: Almir Okato <almir.okato@espressif.com>
    almir-okato committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    d3819c9 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2023

  1. Update version files for 2.0.0

    Update documentation and version tags for final 2.0.0 release.
    
    Signed-off-by: David Brown <david.brown@linaro.org>
    d3zd3z committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    e0bdcde View commit details
    Browse the repository at this point in the history
  2. mynewt: update to release 2.0.0

    Update Mynewt metadata for v2.0.0 release.
    
    Signed-off-by: Fabio Utzig <utzig@apache.org>
    Signed-off-by: David Brown <david.brown@linaro.org>
    utzig authored and d3zd3z committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    304fd41 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2023

  1. readme: update for next dev release

    Bump version described in README to a development version of the next release.
    
    Signed-off-by: David Brown <david.brown@linaro.org>
    d3zd3z committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    301d565 View commit details
    Browse the repository at this point in the history
  2. imgtool: make "align" command line parameter optional

    Align parameter should be optional:
    - it has a default value.
    - it is not used for non-swap update modes.
    
    Signed-off-by: Andrej Butok <andrey.butok@nxp.com>
    butok authored and d3zd3z committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    25b7c7a View commit details
    Browse the repository at this point in the history
  3. samples: zephyr: Use the default MCUBoot PEM key file.

    Use the default MCUBoot PEM key file in hello-world project settings.
    Without it the application is not verified by MCUBoot.
    
    Signed-off-by: Andrej Butok <andrey.butok@nxp.com>
    butok authored and d3zd3z committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    2b924da View commit details
    Browse the repository at this point in the history
  4. zephyr: Remove deprecated ZEPHYR_TRY_MASS_ERASE option

    This option was deprecated 8 months ago, remove it.
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    4a1effb View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2023

  1. boot: zephyr: serial_adapter: Fail if USB CDC enabled with console

    This prevents MCUboot from successfully building if console and
    serial recovery (USB CDC) are both enabled and they both point to
    the same device
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    822b6cb View commit details
    Browse the repository at this point in the history
  2. boot: zephyr: serial_adapter: Add error if main thread not preemptible

    Adds a build failure if the main thread priority is not preemptible
    and USB CDC ACM serial recovery is used, this is because if this is
    the case, USB events will never be able to be processed and serial
    recovery cannot ever enumerate
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    d5c963c View commit details
    Browse the repository at this point in the history
  3. boot: zephyr: Fix USB configs

    Fixes USB configurations so that they build out of the box, this
    previously falsely built successfully but would not run
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    0a8bbbf View commit details
    Browse the repository at this point in the history
  4. boot: zephyr: board: various: Remove size optimisation

    This value is now the default, remove explicitly setting it for
    some boards
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    013c9e7 View commit details
    Browse the repository at this point in the history
  5. boot_serial: Fix missing response if echo command disabled

    Fixes an issue whereby when an echo command is sent in serial
    recovery mode, if it is disabled, there would just be no response
    at all, which is invalid operation
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    e9fccef View commit details
    Browse the repository at this point in the history
  6. doc: imgtool: update align description

    Update the --align option values.
    Add its description.
    Delete [required], as it is optional now.
    
    Signed-off-by: Andrej Butok <andrey.butok@nxp.com>
    butok authored and nordicjm committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    6c4f7b4 View commit details
    Browse the repository at this point in the history
  7. docs: release: Add notes on Zephyr USB fixes and boot serial echo

    Adds 3 notes, 2 for zephyr USB CDC ACM fixes and 1 for a boot
    serial echo fix
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    0c0470e View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2023

  1. boot: zephyr: add support for lpcxpresso55s28

    Add default configuration for lpcxpresso55s28.
    
    Signed-off-by: Andrej Butok <andrey.butok@nxp.com>
    butok authored and nordicjm committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    cd82f8b View commit details
    Browse the repository at this point in the history
  2. zephyr: kconfig: Prevent MBEDTLS selection when tinycrypt is used

    Prevents an issue which occurs when the MCUboot configuration is
    changed which then selects multiple conflicting symbols
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    47b3436 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2023

  1. boot: zephyr: add support for mimxrt101x_evk

    Add default configuration for mimxrt1010_evk and mimxrt1015_evk.
    
    Signed-off-by: Andrej Butok <andrey.butok@nxp.com>
    butok authored and nordicjm committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    3f0b89d View commit details
    Browse the repository at this point in the history
  2. boot: boot_serial: Fix single slot encrypted image list

    Fixes an issue whereby MCUboot is configured in single application
    slot mode with serial recovery with encryption and an encrypted
    image has been loaded, if valid this will have been decrypted, so
    should not be treated as encrypted
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    5e6cffb View commit details
    Browse the repository at this point in the history
  3. zephyr: Move IO functions out of main to separate file

    Moves IO functions into a separate file to allow reuse
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    433b848 View commit details
    Browse the repository at this point in the history
  4. zephyr: Add firmware loader MCUboot operation style

    Adds a new operation style in which the secondary slot has an
    image which is used to update the primary image only.
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    215345f View commit details
    Browse the repository at this point in the history
  5. docs: release: Add note on firmware loader mode

    Adds a note on the new firmware loader operation type
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    05d1194 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. scripts: add missing pyyaml dependency

    `pyyaml` is a dependency introduced in `imgtool dumpinfo`
    
    Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
    samueltardieu authored and nordicjm committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    ab99fe2 View commit details
    Browse the repository at this point in the history
  2. boot: zephyr: add support for mimxrt1040_evk

    Add default configuration for mimxrt1040_evk.
    
    Signed-off-by: Andrej Butok <andrey.butok@nxp.com>
    butok authored and nordicjm committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    c43a20f View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2023

  1. zephyr: rename 'led_init()' to 'io_led_init()'

    This fixes below warning when building with 'MCUBOOT_INDICATION_LED'
    enabled:
    
      mcuboot/boot/zephyr/main.c:410:5:
        warning: implicit declaration of function 'led_init';
                 did you mean 'io_led_init'? [-Wimplicit-function-declaration]
          410 |     led_init();
              |     ^~~~~~~~
              |     io_led_init
    
    Fixes: 433b848 ("zephyr: Move IO functions out of main to separate file")
    Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
    pepe2k authored and nordicjm committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    d99154f View commit details
    Browse the repository at this point in the history
  2. zephyr: io: include 'bootutil_log.h' and declare log module membership

    This fixes below error when building with 'MCUBOOT_INDICATION_LED' and
    'LOG' enabled:
    
      In file included from zephyr/include/zephyr/logging/log.h:11,
                       from zephyr/include/zephyr/usb/usb_device.h:43,
                       from bootloader/mcuboot/boot/zephyr/io.c:26:
      mcuboot/boot/zephyr/io.c: In function 'io_led_init':
      zephyr/include/zephyr/logging/log_core.h:151:20: error:
        '__log_level' undeclared (first use in this function)
        151 |         (_level <= __log_level) &&                                          \
            |                    ^~~~~~~~~~~
    
    Fixes: 433b848 ("zephyr: Move IO functions out of main to separate file")
    Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
    pepe2k authored and nordicjm committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    8c6c670 View commit details
    Browse the repository at this point in the history
  3. zephyr: io: add 'io_led_set()'

    The static declaration of 'led0' was moved to 'io.c' which broke
    building with the 'MCUBOOT_INDICATION_LED' enabled:
    
      mcuboot/boot/zephyr/main.c:380:22: error:
        'led0' undeclared (first use in this function)
          380 |     gpio_pin_set_dt(&led0, 1);
              |                      ^~~~
    
    This adds simple function 'io_led_set()' for changing LED's value.
    
    Fixes: 433b848 ("zephyr: Move IO functions out of main to separate file")
    Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
    pepe2k authored and nordicjm committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    2a74a2b View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. zephyr: sysflash: Fix if condition for zephyr applications

    Fixes an issue when sysflash is included by zephyr (non-mcuboot)
    applications
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    a88e229 View commit details
    Browse the repository at this point in the history
  2. zephyr: firmware/single_loader: Fix compile warning

    Fixes an issue of an unused function calling an undefined function
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    nordicjm committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    2129973 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. Revert "[nrf noup] boards: thingy53: disable GPIO ISR support"

    This reverts commit adab597.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    c5d4f7b View commit details
    Browse the repository at this point in the history
  2. Revert "[nrf noup] crypto: ecdsa: Fix shared crypto MCUBoot EXT_ABI"

    This reverts commit 2891664.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    877be0c View commit details
    Browse the repository at this point in the history
  3. Revert "[nrf noup] loader: Add firmware version check downgrade preve…

    …ntion"
    
    This reverts commit 4d9859a.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    1b9a2ad View commit details
    Browse the repository at this point in the history
  4. Revert "[nrf noup] boot: zephyr: Boot even if EXT_ABI is not provided"

    This reverts commit 01f17eb.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    9de47c0 View commit details
    Browse the repository at this point in the history
  5. Revert "[nrf noup] sysflash: pm_sysflash: Fix incorrect define exclud…

    …e for NSIB"
    
    This reverts commit 862bca5.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    b046f52 View commit details
    Browse the repository at this point in the history
  6. Revert "[nrf noup] zephyr: Add RAM flash configuration to cache for s…

    …ysbuild"
    
    This reverts commit 9cd1de1.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    3d53618 View commit details
    Browse the repository at this point in the history
  7. Revert "[nrf fromtree] bootutil: Add shared data support for XIP with…

    … revert mode"
    
    This reverts commit eb1ff87.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    61d9ba8 View commit details
    Browse the repository at this point in the history
  8. Revert "[nrf fromtree] bootutil: Add mode for XIP with revert"

    This reverts commit c15589e.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    57c2d47 View commit details
    Browse the repository at this point in the history
  9. Revert "[nrf fromtree] boot_serial: Fix include"

    This reverts commit ec0aa5f.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    ce8da0f View commit details
    Browse the repository at this point in the history
  10. Revert "[nrf fromtree] zephyr: Fall back to minimal C library"

    This reverts commit 1e6532a.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    d5a5e6d View commit details
    Browse the repository at this point in the history
  11. Revert "[nrf fromtree] zephyr: Fix boot serial extensions"

    This reverts commit 100ea3d.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    18a6972 View commit details
    Browse the repository at this point in the history
  12. Revert "[nrf noup] booutil: loader: Do not check reset vector for XIP…

    … image"
    
    This reverts commit 4fe70b6.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    1478f7e View commit details
    Browse the repository at this point in the history
  13. Revert "[nrf noup] zephyr: Add support for three images"

    This reverts commit 5822244.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    462c56b View commit details
    Browse the repository at this point in the history
  14. Revert "[nrf noup] booutil: loader: Fixup for NSIB and multi-image"

    This reverts commit 745cf4e.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    50c51f7 View commit details
    Browse the repository at this point in the history
  15. Revert "[nrf noup] zephyr: Move partition manager definitions to pm_s…

    …ysflash.h"
    
    This reverts commit 0383b7c.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    ef0171c View commit details
    Browse the repository at this point in the history
  16. Revert "[nrf noup] booutil: loader: Add support for NSIB and multi-im…

    …age"
    
    This reverts commit b518e13.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    d12a734 View commit details
    Browse the repository at this point in the history
  17. Revert "[nrf fromtree] zephyr: Provide third image cases for direct i…

    …mage upload"
    
    This reverts commit a0c919b.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    06e56e0 View commit details
    Browse the repository at this point in the history
  18. Revert "[nrf noup] boot: zephyr: Add ifdef protection for RAM locking"

    This reverts commit 52997e1.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    bddbcf3 View commit details
    Browse the repository at this point in the history
  19. Revert "[nrf noup] bootutil: Fix missing PCD define check"

    This reverts commit 815fa3a.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    e36f811 View commit details
    Browse the repository at this point in the history
  20. Revert "[nrf noup] Fix path variables"

    This reverts commit 5777337.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    939cab4 View commit details
    Browse the repository at this point in the history
  21. Revert "[nrf noup] bootloader: mcuboot: Fix wrong use of if defined"

    This reverts commit 09bad48.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    8dc8d61 View commit details
    Browse the repository at this point in the history
  22. Revert "[nrf noup] loader: Fix reading reset addr to support ext flash"

    This reverts commit 48ad055.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    9db6377 View commit details
    Browse the repository at this point in the history
  23. Revert "[nrf noup] zephyr: Clean up non-secure RAM if enabled"

    This reverts commit a47c9c4.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    ddb5250 View commit details
    Browse the repository at this point in the history
  24. Revert "[nrf noup] do_boot: clean peripherals state before boot"

    This reverts commit 1f14ccb.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    b616e1c View commit details
    Browse the repository at this point in the history
  25. Revert "[nrf noup] boot: nrf53-specific customizations"

    This reverts commit 0030544.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    b103d4d View commit details
    Browse the repository at this point in the history
  26. Revert "[nrf noup] treewide: add NCS partition manager support"

    This reverts commit 16fd63c.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    c03575e View commit details
    Browse the repository at this point in the history
  27. Revert "[nrf noup] Restore default RTC user channel count"

    This reverts commit 8ba5c7f.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    a33a13f View commit details
    Browse the repository at this point in the history
  28. [nrf mergeup] Merge upstream up to commit 2129973

    Update sdk-mcuboot with the latest code from Zephyr fork of MCUboot.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    032b26b View commit details
    Browse the repository at this point in the history
  29. [nrf noup] Restore default RTC user channel count

    The default value of CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT
    for nRF52 SOCs has been changed from 0 to 3, but it makes
    MCUBoot get stuck on erasing flash pages when swapping two
    images. Restore the previous value until the RTC issue is
    resolved (see NCSDK-14427)
    
    Signed-off-by: Damian Krolik <damian.krolik@nordicsemi.no>
    Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    (cherry picked from commit f5559b7)
    (cherry picked from commit 36c37c0)
    (cherry picked from commit 0e3ab1b)
    (cherry picked from commit 8ba5c7f)
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    Damian-Nordic authored and de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    53c1009 View commit details
    Browse the repository at this point in the history
  30. [nrf noup] treewide: add NCS partition manager support

    Partition Manager is an nRF Connect SDK component which uses yaml
    files to resolve flash partition placement with a holistic view of the
    device.
    
    This component's MCUboot portions began life as upstream mcuboot
    PR#430. This added support for being built as a sub image from the
    downstream Nordic patch set for a zephyr multi image build
    system (mcuboot 430 was combined with effor submitted to upstream
    zephyr as PR#13672, which was ultimately reworked after being rejected
    for mainline at the ELCE 2019 conference in Lyon).
    
    It has since evolved over time. This is the version that will go into
    NCS v1.3. It features:
    
    - page size aligned partitions for all partitions used by mcuboot.
    - image swaps without scratch partitions
    
    Add support for configurations where there exists two primary slots
    but only one secondary slot, which is shared. These two primary slots
    are the regular application and B1. B1 can be either S0 or S1
    depending on the state of the device.
    
    Decide where an upgrade should be stored by looking at the vector
    table.
    
    Provide update candidates for both s0 and s1. These candidates must be
    signed with mcuboot after being signed by b0.
    
    Additional notes:
    
    - we make update.hex without trailer data
    
      This is needed for serial recovery to work using hex files.
      Prior to this the update.hex got TLV data at the end of the
      partition, which caused many blank pages to be included,
      which made it hard to use in a serial recovery scheme.
    
      Instead, make update.hex without TLV data at the end,
      and provide a new file test_update.hex which contains
      the TLV data, and can be directly flashed to test the
      upgrade procedure.
    
    - we use a function for signing the application as future-proofing
      for when other components must be signed as well
    
    - this includes an update to single image applications that enables
      support for partition manager; when single image DFU is used, a
      scratch partition is not needed.
    
    - In NCS, image 1 primary slot is the upgrade bank for mcuboot (IE S0 or
      S1 depending on the active slot). It is not required that this slot
      contains any valid data.
    
    - The nRF boards all have a single flash page size, and partition
      manager deals with the size of the update partitions and so on, so we
      must skip a boot_slots_compatible() check to avoid getting an error.
    
    - There is no need to verify the target when using partition manager.
    
    - We lock mcuboot using fprotect before jumping, to enable the secure
      boot property of the system.
    
    - Call fw_info_ext_api_provide() before booting if EXT_API_PROVIDE
      EXT_API is enabled. This is relevant only when the immutable
      bootloader has booted mcuboot.
    
    Signed-off-by: Håkon Øye Amundsen <haakon.amundsen@nordicsemi.no>
    Signed-off-by: Øyvind Rønningstad <oyvind.ronningstad@nordicsemi.no>
    Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
    Signed-off-by: Sigvart Hovland <sigvart.m@gmail.com>
    Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
    Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
    Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
    Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
    Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
    Signed-off-by: Emil Obalski <emil.obalski@nordicsemi.no>
    Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
    Signed-off-by: Pawel Dunaj <pawel.dunaj@nordicsemi.no>
    Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
    Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
    Signed-off-by: Vidar Berg <vidar.berg@nordicsemi.no>
    Signed-off-by: Draus, Sebastian <sebastian.draus@nordicsemi.no>
    Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
    Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
    (cherry picked from commit ed5f069)
    (cherry picked from commit d2cac70)
    (cherry picked from commit 1630628)
    (cherry picked from commit 349361e)
    (cherry picked from commit 16fd63c)
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    SebastianBoe authored and de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    fab404a View commit details
    Browse the repository at this point in the history
  31. [nrf noup] boot: nrf53-specific customizations

    - Add network core bootloader implementation
    
      Enables network core updates of nrf53 using MCUBoot by identifying
      images through their start addresses. Also implements the control and
      transfer using the PCD module.
    
    - Add support for multi image DFU using partition manager.
    
    - Add check for netcore addr if NSIB is enabled so netcore updates works
    
    - boot: zephyr: move thingy53_nrf5340_cpuapp.conf downstream
    
      Moved the board configuration for Thingy:53 Application Core to the
      nRF Connect SDK MCUboot downstream repository. The configuration file
      contains references to the Kconfig modules that are only available in
      the nRF Connect SDK. The current configuration is set up to work in the
      nRF Connect SDK environment and cannot be used upstream.
    
    - pm: enable ram flash partition using common flag
    
      This patch makes mcuboot_primary_1 ram-flash partition
      selectable using CONFIG_NRF53_MCUBOOT_PRIMARY_1_RAM_FLASH
      property. This is needed since CONFIG_NRF53_MULTI_IMAGE_UPDATE
      become not only configuration which requires that partition.
    
    - MCUBoot configures USB CDC by its own. There is no need for
      BOARD_SERIAL_BACKEND_CDC_ACM option to configure anything which is
      later overwritten anyway.
    
      Jira: NCSDK-18596
    
    Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
    Signed-off-by: Emil Obalski <emil.obalski@nordicsemi.no>
    Signed-off-by: Håkon Øye Amundsen <haakon.amundsen@nordicsemi.no>
    Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
    Signed-off-by: Kamil Piszczek <Kamil.Piszczek@nordicsemi.no>
    Signed-off-by: Ole Sæther <ole.saether@nordicsemi.no>
    Signed-off-by: Sigvart Hovland <sigvart.hovland@nordicsemi.no>
    Signed-off-by: Simon Iversen <simon.iversen@nordicsemi.no>
    Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
    Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
    Signed-off-by: Mateusz Kapala <mateusz.kapala@nordicsemi.no>
    (cherry picked from commit b96bed8)
    (cherry picked from commit 4302a91)
    (cherry picked from commit e52481a)
    (cherry picked from commit 8642c39)
    (cherry picked from commit 0030544)
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    sigvartmh authored and de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    1ead686 View commit details
    Browse the repository at this point in the history
  32. [nrf noup] do_boot: clean peripherals state before boot

    Do some cleanup of nRF peripherals. This is necessary since Zephyr
    doesn't have any driver deinitialization functionality, and we'd like
    to leave peripherals in a more predictable state before booting the
    Zephyr image. This should be re-worked when the zephyr driver model
    allows us to deinitialize devices cleanly before jumping to the
    chain-loaded image.
    
    Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
    Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
    Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
    Signed-off-by: Øyvind Rønningstad <oyvind.ronningstad@nordicsemi.no>
    Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
    Signed-off-by: Håkon Øye Amundsen <haakon.amundsen@nordicsemi.no>
    Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
    Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
    Signed-off-by: Trond Einar Snekvik <Trond.Einar.Snekvik@nordicsemi.no>
    Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    (cherry picked from commit 0a4da3a)
    (cherry picked from commit e56136a)
    (cherry picked from commit 05405d4)
    (cherry picked from commit 0eacb35)
    (cherry picked from commit 1f14ccb)
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    nvlsianpu authored and de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    7489b10 View commit details
    Browse the repository at this point in the history
  33. [nrf noup] zephyr: Clean up non-secure RAM if enabled

    To ensure that MCUBoot does not leak keys or other material through
    memory to non-secure side we clear the memory before jumping to the next
    image.
    
    Signed-off-by: Sigvart Hovland <sigvart.hovland@nordicsemi.no>
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    (cherry picked from commit ff95e7b)
    (cherry picked from commit d584ea0)
    (cherry picked from commit 2394b5b)
    (cherry picked from commit 3266b99)
    (cherry picked from commit a47c9c4)
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    sigvartmh authored and de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    4a6f6e0 View commit details
    Browse the repository at this point in the history
  34. [nrf noup] loader: Fix reading reset addr to support ext flash

    When mcuboot_secondary is on external flash, the image header cannot
    dircetly be accessed via secondary_fa->fa_off. Instead the provided
    function boot_img_hdr() is used now.
    Additionally a similar issue is present when trying to read the address
    of the reset handler. For this flash_area_read() is used now.
    
    With this patch is possible to have the update partiton
    mcuboot_secondary on external flash and update a updatable
    bootloader (mcuboot) in s0 and/or s1.
    
    Signed-off-by: Christian Taedcke <christian.taedcke@lemonbeat.com>
    Signed-off-by: Ole Sæther <ole.saether@nordicsemi.no>
    Signed-off-by: Sigvart Hovland <sigvart.hovland@nordicsemi.no>
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    (cherry picked from commit d6c6170)
    (cherry picked from commit 4d30b55)
    (cherry picked from commit 7af56df)
    (cherry picked from commit a49b83e)
    (cherry picked from commit 48ad055)
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    chrta authored and de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    352f95e View commit details
    Browse the repository at this point in the history
  35. [nrf noup] bootloader: mcuboot: Fix wrong use of if defined

    The file nrf_cleanup.c has
    "#if defined(USE_PARTITION_MANAGER)"
    Which is true even if USE_PARTITION_MANAGER=n.
    This must be changed to "#if USE_PARTITION_MANAGER" for correct
    behaviour.
    
    Ref: NCSIDB-987
    
    Signed-off-by: Ole Sæther <ole.saether@nordicsemi.no>
    (cherry picked from commit 823fd36)
    (cherry picked from commit 09bad48)
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    osaether authored and de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    c987bd0 View commit details
    Browse the repository at this point in the history
  36. [nrf noup] Fix path variables

    Fixes path variables to use the proper Zephyr module variables
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    (cherry picked from commit fecfb1e)
    (cherry picked from commit 5777337)
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    nordicjm authored and de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    4a34302 View commit details
    Browse the repository at this point in the history
  37. [nrf noup] bootutil: Fix missing PCD define check

    Fixes a missing PCD define check, an image might have the
    network core partition layout set but if PCD support is not
    enabled then it should not assume that PCD support is part
    of mcuboot.
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    (cherry picked from commit 71ec266)
    (cherry picked from commit 815fa3a)
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    nordicjm authored and de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    c052378 View commit details
    Browse the repository at this point in the history
  38. [nrf noup] boot: zephyr: Add ifdef protection for RAM locking

    This adds an ifdef check so that RAM is only protected if PCD is
    enabled, whereas previously this would cause a build failure.
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    (cherry picked from commit 4ec411c)
    (cherry picked from commit 52997e1)
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    nordicjm authored and de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    c0ec158 View commit details
    Browse the repository at this point in the history
  39. [nrf noup] booutil: loader: Add support for NSIB and multi-image

    This adds support for using both NSIB and the multi-image configuration
    in MCUboot. Before this was not possible due to upgradable bootloader
    support through NSIB was using the `UPDATEABLE_IMAGE_NUMBER`
    configuration to update the updateable bootloader.
    
    In this commit we change from using `FLASH_AREA_IMAGE_PRIMARY` to get
    the flash area ID to using the bootloader state where we set the flash
    area ID of the free updatable bootloader slot if the image is intended
    for this slot.
    
    Ref. NCSDK-19223
    
    Signed-off-by: Sigvart Hovland <sigvart.hovland@nordicsemi.no>
    (cherry picked from commit 8fe7070)
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    (cherry picked from commit 037f4da)
    (cherry picked from commit b518e13)
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    sigvartmh authored and de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    08575cc View commit details
    Browse the repository at this point in the history
  40. [nrf noup] zephyr: Move partition manager definitions to pm_sysflash.h

    Making sysflash.h and pm_sysflash.h more readable.
    
    (cherry picked from commit eafdae9)
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    (cherry picked from commit 99001d0)
    (cherry picked from commit 0383b7c)
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    d44b986 View commit details
    Browse the repository at this point in the history
  41. [nrf noup] booutil: loader: Fixup for NSIB and multi-image

    Commit 8fe7070 broke bootloader updates
    for nRF91 and non-multi image builds. This commit is fixing this by
    restoring the previous functionality and `ifdef` out the new logic
    needed for multi-image.
    
    Ref. NCSDK-23305
    
    Signed-off-by: Sigvart Hovland <sigvart.hovland@nordicsemi.no>
    (cherry picked from commit 7429a98)
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    (cherry picked from commit 8c5b560)
    (cherry picked from commit 745cf4e)
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    sigvartmh authored and de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    d9732b8 View commit details
    Browse the repository at this point in the history
  42. [nrf noup] zephyr: Add support for three images

    The commit modifies pm_sysflash.h to add support for three
    application images.
    
    (cherry picked from commit 8fba4db)
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    (cherry picked from commit a7f6ccb)
    (cherry picked from commit 5822244)
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    7ce6393 View commit details
    Browse the repository at this point in the history
  43. [nrf noup] booutil: loader: Do not check reset vector for XIP image

    The XIP image, 2, does not have reset vector.
    
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    (cherry picked from commit 568d62c)
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    (cherry picked from commit c6349b9)
    (cherry picked from commit 4fe70b6)
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    e8b06a8 View commit details
    Browse the repository at this point in the history
  44. [nrf noup] zephyr: Add RAM flash configuration to cache for sysbuild

    Puts the flash simulation configurtion into cache variables that can
    be used by other applications and CMake code to know specifics on
    the simulated flash details
    
    Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
    (cherry picked from commit c28768e)
    (cherry picked from commit 9cd1de1)
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    nordicjm authored and de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    8809c85 View commit details
    Browse the repository at this point in the history
  45. [nrf noup] sysflash: pm_sysflash: Fix incorrect define exclude for NSIB

    A mismatch in defines was made for `_image_1_primary_slot_id` resulting
    in some configurations not working. This fixes that the linker variable
    is exposed for mcuboot so that it knows which slot is running an which
    slot a bootloader upgrade is to be put into.
    
    Ref. NCSDK-19223
    
    Signed-off-by: Sigvart Hovland <sigvart.hovland@nordicsemi.no>
    (cherry picked from commit 1f38eb8)
    (cherry picked from commit 862bca5)
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    sigvartmh authored and de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    4d68fd4 View commit details
    Browse the repository at this point in the history
  46. [nrf noup] boot: zephyr: Boot even if EXT_ABI is not provided

    This removes the `return;` to ensure that the application is booted even
    if EXT_ABI is not provided to the application because it does not
    include `FW_INFO`.
    
    Added a bit more description to the error messages when FW_INFO is not
    found and EXT_ABI is not able to be provided to the next image.
    
    Ref. NCSDK-24132
    
    Signed-off-by: Sigvart Hovland <sigvart.hovland@nordicsemi.no>
    (cherry picked from commit b80046d)
    (cherry picked from commit 01f17eb)
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    sigvartmh authored and de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    fec6987 View commit details
    Browse the repository at this point in the history
  47. [nrf noup] loader: Add firmware version check downgrade prevention

    For nRF53, the only existing version number metadata is stored in the
    `firmware_info` structure in the network core. This utilizes PCD to read
    out the version number and compares it against the version number found
    in the secondary slot for the network core.
    
    Ref. NCSDK-21379
    
    Signed-off-by: Sigvart Hovland <sigvart.hovland@nordicsemi.no>
    (cherry picked from commit 1b6571d)
    (cherry picked from commit 4d9859a)
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    sigvartmh authored and de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    5b59dbf View commit details
    Browse the repository at this point in the history
  48. [nrf noup] crypto: ecdsa: Fix shared crypto MCUBoot EXT_ABI

    After the upmerge using external crypto from NSIB in MCUBoot resulted in
    build failures. This commit fixes the build failures but also fixes a
    change in the API call which resulted in `-102` error when calling the
    verify function.
    
    Ref. NCSDK-23994
    
    Signed-off-by: Sigvart Hovland <sigvart.hovland@nordicsemi.no>
    (cherry picked from commit dc0b692)
    (cherry picked from commit 2891664)
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    sigvartmh authored and de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    691f405 View commit details
    Browse the repository at this point in the history
  49. [nrf noup] boards: thingy53: disable GPIO ISR support

    Change disables GPIO interrupt support in Zephyr GPIO driver,
    which is not obligatory for MCUboot.
    This is needed to reduce memory footprint.
    
    Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
    (cherry picked from commit adab597)
    Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
    nika-nordic authored and de-nordic committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    75eae0e View commit details
    Browse the repository at this point in the history