Backport 26528 ([opentitanlib] Refactor rescue protocol creation) #29004
+249
−151
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
Signed-off-by: Chris Frantz <[email protected]> (cherry picked from commit 8aa221b)
pamaury
force-pushed
the
backport_26528
branch
from
e38c522 to
2c82d76
Compare
Signed-off-by: Chris Frantz <[email protected]> (cherry picked from commit 0ce26d6)
Signed-off-by: Chris Frantz <[email protected]> (cherry picked from commit 373fdcc)
pamaury
force-pushed
the
backport_26528
branch
from
2c82d76 to
4bd869b
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Backport #26528. Quite a few conflicts, but the only divergence which is really problematic is the following diff from #26258:
if self.wait { rescue.set_speed(prev_baudrate)?; } else { - uart.set_baudrate(prev_baudrate)?; + // FIXME: restore speed + //uart.set_baudrate(prev_baudrate)?; } } Ok(None)Indeed, this particular if branch does not exist on master, having been removed in #25820. Furthermore, this FIXME comment is also gone on earlgrey_1.0.0, removed in #26728. Therefore I decided to not pick up that change.