Add support for three pairs of image slots #59724
Merged
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
zephyrbot
added
manifest
manifest-mcuboot
DNM
|
The following west manifest projects have been modified in this Pull Request:
Note: This message is automatically posted and updated by the Manifest GitHub Action. |
de-nordic
force-pushed
the
three-images
branch
4 times, most recently
from
dd74649
to
830d934
Compare
zephyrbot
added
Release Notes
nordicjm
previously approved these changes
Aug 14, 2023
| #elif (CONFIG_MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER > 1) | ||
| /* For more than one application image slot2 and slot3 are required. */ | ||
| #define ADD_SLOT_2_CONDITION 1 | ||
| #define ADD_SLOT_3_CONDITION 1 | ||
| #if CONFIG_MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER == 3 | ||
| #define ADD_SLOT_4_CONDITION 1 |
There was a problem hiding this comment.
A long term future goal should be to remove all of this and have "metadata" specified somehow, a main application might have 2 slots in the primary image, or actually might only have 1 slot, but might then have mismatched slots in other images, maybe 1 slot for an image for another device or core, maybe 2 slots for something else, but we need some way to have the freedom and flexibility to have odd or equal number of slots per image.
And to have it generated so we don't need to update this file each time a new slot/image is added
de-nordic
force-pushed
the
three-images
branch
from
830d934
to
a8bd7bb
Compare
de-nordic
force-pushed
the
three-images
branch
2 times, most recently
from
6c75302
to
a3c5ad3
Compare
de-nordic
force-pushed
the
three-images
branch
from
ae601bd
to
e79c817
Compare
de-nordic
force-pushed
the
three-images
branch
from
e79c817
to
94f391b
Compare
de-nordic
force-pushed
the
three-images
branch
from
94f391b
to
4989dc7
Compare
nordicjm
previously approved these changes
Sep 11, 2023
MarekPieta
suggested changes
Sep 11, 2023
de-nordic
force-pushed
the
three-images
branch
2 times, most recently
from
9750e6f
to
7680cce
Compare
MarekPieta
suggested changes
Sep 14, 2023
de-nordic
force-pushed
the
three-images
branch
from
7680cce
to
56911ed
Compare
The commit adds support for uploading images to secondary slots of three images. Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
de-nordic
force-pushed
the
three-images
branch
from
56911ed
to
a717dd2
Compare
de-nordic
added a commit
to de-nordic/sdk-zephyr
that referenced
this pull request
Sep 14, 2023
…guration The commit adds support for uploading images to secondary slots of three images. Upstream PR: zephyrproject-rtos/zephyr#59724 Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
MarekPieta
approved these changes
Sep 14, 2023
nordicjm
approved these changes
Sep 15, 2023
nordicjm
pushed a commit
to nordicjm/sdk-zephyr
that referenced
this pull request
Sep 15, 2023
…guration The commit adds support for uploading images to secondary slots of three images. Upstream PR: zephyrproject-rtos/zephyr#59724 Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
de-nordic
added a commit
to de-nordic/sdk-zephyr
that referenced
this pull request
Sep 21, 2023
…guration The commit adds support for uploading images to secondary slots of three images. Upstream PR: zephyrproject-rtos/zephyr#59724 (cherry picked from commit a717dd20f3f54bf59d806974714e079f7fdb80bc) Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
carlescufi
pushed a commit
to nrfconnect/sdk-zephyr
that referenced
this pull request
Sep 22, 2023
…guration The commit adds support for uploading images to secondary slots of three images. Upstream PR: zephyrproject-rtos/zephyr#59724 (cherry picked from commit a717dd20f3f54bf59d806974714e079f7fdb80bc) Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
carlescufi
approved these changes
Sep 22, 2023
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.
[DNM] [DNM] Currently the mcu-tools/mcuboot and Zephyr fork are out of sync because there is something circularly
broken... the west manifest here brings the mcu-tools/mcuboot commit with changes taken from Zephyr fork, for this thing to just compile and work, but until both things are fixed merging of this PR will not be possible.
Support for three pairs of image slots.
This PR mainly contains configuration of slots as the main job, that did the change possible, is done via PR #61342.
Set to DNM due to dependency on other PR in review.
Update 2023-08-17 16:01 UTC
Fixed compliance issues
Update 2023-08-18 17:55 UTC
Update of base PR.
Update 2023-08-24 10:30 UTC
Update from base and main.
Update 2023-09-08 16:05 UTC
Rebase from main.