Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

provide for non-console recovery uart #1576

Conversation

brian-level
Copy link

@brian-level brian-level commented Jan 13, 2023

In some situations such as having multiple CPUs where one can upgrade another, it is nice to allow for a second UART to use mcuboot serial recovery while (for example) keeping the console on the first.

This change allows someone to specify a recovery UART to use other than chosen zephyr-console by adding to a device tree as in the examples below

chosen {
mcuboot-recovery-uart=&uart1;
};

If not specified, the chosen zephyr-console uart will be used

@d3zd3z d3zd3z added the 1.10.0 Release 1.10.0 label Feb 14, 2023
@d3zd3z d3zd3z added this to the 1.10.0 milestone Feb 14, 2023
boot/zephyr/serial_adapter.c Outdated Show resolved Hide resolved
boot/zephyr/serial_adapter.c Outdated Show resolved Hide resolved
Copy link
Member

@d3zd3z d3zd3z left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The commits will need a sign-off-by line, and I recommend configuring git so that your email has your full name, rather than a shortened handle. You'll need to do an interactive rebase, and use git commit --amend --reset-author to fix the author, once you have changed the git configuration.

@brian-level
Copy link
Author

brian-level commented Feb 22, 2023 via email

@kmeinhar
Copy link

This is very similar to this PR #1155 right?

@d3zd3z
Copy link
Member

d3zd3z commented Feb 28, 2023

My email doesn't have my full name, it is just what it is.

It is set within git, and the username can be set to whatever you want. As far as adding the signed off by, that can be done by either inserting the text into the commit message manually, or passing -s to the git commit command (possibly with --amend to update the top commit).

@d3zd3z
Copy link
Member

d3zd3z commented Feb 28, 2023

This is very similar to this PR #1155 right?

@de-nordic can you take a look at this?

@de-nordic
Copy link
Collaborator

This is very similar to this PR #1155 right?

@de-nordic can you take a look at this?

I would rather go with #1155, because I do not want to introduce MCUboot chosen, while this is Zephyr specific code, and we have the chosen for MCUmgr anyway. If we want to have the MCUboot chosen, it should be used as override for zephyr chosen.

@d3zd3z d3zd3z removed the 1.10.0 Release 1.10.0 label Mar 14, 2023
@d3zd3z d3zd3z removed this from the 1.10.0 milestone Mar 14, 2023
@de-nordic
Copy link
Collaborator

#1155 went in, is this PR still relevant?

@de-nordic
Copy link
Collaborator

@brian-level Ping regarding #1576 (comment).
If lack of response till Jul 3, the PR will be closed.

@brian-level
Copy link
Author

#1155 works for me, even though it seems silly that it uses "zephyr" specific since this has nothing to do with zephyr

@brian-level brian-level deleted the bdd/allow-non-console-recovery-uart branch June 21, 2023 11:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants