bootutil: swap-scratch: Fix conflicts after support of device without erase #2255
Conversation
This file contains hidden or 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
Before the PR mcu-tools#2206 fixing issues in the swap-scratch logic when the trailer is larger than the last sector was merged, the PR mcu-tools#2114 was reverted (see mcu-tools#2211). This changes made by mcu-tools#2211 were then reapplied (see mcu-tools#2216) after mcu-tools#2206 was merged, leading to some conflicts: a call to swap_erase_trailer_sectors was moved by mcu-tools#2206 but the old call to that function was added back by mcu-tools#2216 and a new call to swap_erase_trailer_sectors was added by mcu-tools#2206 but not converted to a call to swap_scramble_trailer_sectors by mcu-tools#2216. Signed-off-by: Thomas Altenbach <[email protected]>
taltenbach
force-pushed
the
fix/swap-scratch-device-wo-erase-merge-conflict
branch
from
f803fe6 to
5fe92ec
Compare
de-nordic
approved these changes
Apr 8, 2025
nordicjm
approved these changes
Apr 9, 2025
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.
Before the PR #2206 fixing issues in the swap-scratch logic when the trailer is larger than the last sector was merged, the PR #2114 was reverted (see #2211). This changes made by #2211 were then reapplied (see #2216) after #2206 was merged, leading to some conflicts: a call to
swap_erase_trailer_sectorswas moved by #2206 but the old call to that function was added back by #2216 and a new call toswap_erase_trailer_sectorswas added by #2206 but not converted to a call to swap_scramble_trailer_sectors by #2216.