Upmerge 25-03-2024 #305
Merged
Upmerge 25-03-2024 #305
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Currently imgtool --verify fails for hex files with: Invalid image magic; is this an MCUboot image? Added support for hex files by converting hex to bin using IntelHex::tobinstr(). Reusing image.load() needs a bit of rework, maybe a common load method will be done in the future, Signed-off-by: Lucian Zala <zala.lucian@gmail.com>
Fix "align" possible script error, caused by #1833. Set default value for the align parameter. Signed-off-by: Andrej Butok <andrey.butok@nxp.com>
Adds default Kconfig configuration that allows to build MCUboot for NRF54L. Currently this configuration turns off WDT and FPROTECT, which is TODO to fix. Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no> Signed-off-by: Mateusz Michalek <mateusz.michalek@nordicsemi.no>
In multi image swap validation of images could fail due to headers being incorrectly re-read from storage. Fixes #1768 Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
Renamed the DK config file to proper name. Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
The defines have been taken from the Zephyr flash_map.h but as they are provided there for MCUboot only, they can be just defined here. Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
Match version with what is now used in upstream Mynewt. Also add ARM CMSIS which is now taken from original repo. Signed-off-by: Szymon Janc <szymon.janc@codecoup.pl>
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.15.4 to 1.16.2. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](sparklemotion/nokogiri@v1.15.4...v1.16.2) --- updated-dependencies: - dependency-name: nokogiri dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
Updates board names as per hwmv2 Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Removes configuration for boards that have not been in zephyr for a long time Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Renames configuration files for board names that have changed with hwmv2 Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Updates board names as per hwmv2 Signed-off-by: David Leach <david.leach@nxp.com> Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Update FAMILY reference as needed. Signed-off-by: Sylvio Alves <sylvio.alves@espressif.com>
Updates a Kconfig that was renamed Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
CONFIG_FPROTECT is defined only in NRF repository, it should not be added here. Signed-off-by: Grzegorz Chwierut <grzegorz.chwierut@nordicsemi.no>
Fixes an issue with the estimated size calculation which wrongly used the maximum align size for some multiplications, this would mean that in some instances the estimated maximum image size was smaller than the actual allowed size Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
There have been duplicate functions: boot_verify_dependencies boot_verify_slot_dependencies boot_verify_slot_dependency with, very similar internals, scattered around unit. The commit have moved them on top and squashed where possible. Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
MX25UM flash on rd_rw612_bga is very large (8MB), so we must increase the number of max sectors when targeting this board with MCUboot Signed-off-by: Daniel DeGrasse <daniel.degrasse@nxp.com>
Fixes an issue whereby the instruction and data caches being disabled before booting code had bit-rotted and no longer worked, adds a new Kconfig that allows this option to be turned off if wanted. Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Adds a note on the fix for zephyr cache support Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
gmarull
force-pushed
the
upmerge-25032024
branch
from
d41ed65 to
2e01684
Compare
de-nordic
approved these changes
Apr 11, 2024
gchwier
reviewed
Apr 16, 2024
gmarull
force-pushed
the
upmerge-25032024
branch
from
ced0f20 to
8812551
Compare
nvlsianpu
approved these changes
Apr 29, 2024
This reverts commit 622b84c. Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
…lot" This reverts commit 3b0eac8. Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
This reverts commit d3f55fe. Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
…_sysflash.h" This reverts commit f013888. Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
This reverts commit 22ed9fb. Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
This reverts commit f577000. Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
This reverts commit 5cf8423. Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
…ate multi-image" This reverts commit f82a032. Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
…fig" This reverts commit 6a9b75f. Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
This reverts commit 27fc8d7. Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
This reverts commit 4d7e568. Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
Regular upmerge. Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
Seems multi-image dependencies are not supported for multi-image in NCS yet. This is a workaround which reverts some lines to restore previous MCUboot behavior, so that Immutable bootloader + MCUBoot type builds will work. Ref. NCSDK-8681 Signed-off-by: Sigvart Hovland <sigvart.hovland@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 e02925a) Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
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> Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no> (cherry picked from commit 5932630) (cherry picked from commit 6024d0a) Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no> Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
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 Ref. NCSDK-23305 Signed-off-by: Sigvart Hovland <sigvart.hovland@nordicsemi.no> Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no> (cherry picked from commit 03af90f) (cherry picked from commit 0d43674) (cherry picked from commit b4464ad) Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no> Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
The commit modifies pm_sysflash.h to add support for three application images. Ref. NCSDK-19223 Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no> Signed-off-by: Sigvart Hovland <sigvart.hovland@nordicsemi.no> (cherry picked from commit 77c7e25) (cherry picked from commit d700515) (cherry picked from commit 7b87633) Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no> Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
Added procedure which clean-up content of all the secondary slot which contains valid header but couldn't be assigned to any of supported primary images. This behavior is needed when configuration allows to use one secondary slot for collecting image for multiple primary slots. Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no> (cherry picked from commit ed3a0c2) Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no> Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
FPROTECT is not suppored yet for nrf54l15. Signed-off-by: Grzegorz Chwierut <grzegorz.chwierut@nordicsemi.no> Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
gmarull
force-pushed
the
upmerge-25032024
branch
from
8812551 to
0b5810d
Compare
|
reapplying in #311 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.