[opentitantool] Rescue erases other slot by default #25820
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
timothytrippel
approved these changes
Jan 9, 2025
The `--wait` flag to `opentitantool rescue firmware` can be used to control whether the new firmware should immediately boot, or whether the chip should remain in the rescue bootloader after the invocation terminates. The latter is useful if more rescue commands are expected, or if the caller wants to set up some monitoring, before releasing the newly flashed code to run. This CL does not change the behavior, but changes how the former "immadiate boot" case is implemented, in that it is done by an explicit reset pulse after finishing the flashing. This makes the logic simpler in preparation for the next CL, which introduces a second call to `rescue.update_firmware()`, which would not be possible unless `rescue.wait()` has been previously called. Change-Id: I37b9947d3c70791226eb47041bd70b7d7b31d9d4 Signed-off-by: Jes B. Klinke <[email protected]>
Add a default true flag `opentitantool rescue firmware --erase_other_slot true"` This can be used to control whether the content of the slot not being newly programmed should be left in place, or erased. The latter ensures that the newly "rescued" firmware is the one to boot, and is the default, opposite of the previous behavior. Signed-off-by: Jes B. Klinke <[email protected]> Change-Id: I6c2fc46553d63d86a87fa6dc17bd130e40152bb8
jesultra
added
CherryPick:earlgrey_es_sival
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin earlgrey_es_sival
git worktree add -d .worktree/backport-25820-to-earlgrey_es_sival origin/earlgrey_es_sival
cd .worktree/backport-25820-to-earlgrey_es_sival
git switch --create backport-25820-to-earlgrey_es_sival
git cherry-pick -x 9aefafbcd14b324ca492fc4d137bd7e5546d6eb8 7baa7540a522999b87e96db29fe061286bb8f47a |
|
Successfully created backport PR for |
github-actions
bot
added
the
Manually CherryPick
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.
Add a default true flag
opentitantool rescue firmware --erase_other_slot true"This can be used to control whether the content of the slot not being newly programmed should be left in place, or erased. The latter ensures that the newly "rescued" firmware is the one to boot, and is the default, opposite of the previous behavior.