| Message ID | 20210310113924.4632-3-ashe@kivikakk.ee |
|---|---|
| State | Accepted |
| Commit | ac3821430e0e2dc6ddb766950b0098c67d4969d3 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | terminal: get this compiling again | expand |
On Wed, 10 Mar 2021 at 04:39, Asherah Connor <ashe@kivikakk.ee> wrote: > > serial_reinit_all() is only available if CONFIG_SERIAL is defined (i.e. > !CONFIG_DM_SERIAL). > > Signed-off-by: Asherah Connor <ashe@kivikakk.ee> > > --- > > cmd/terminal.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On Wed, Mar 10, 2021 at 10:39:24PM +1100, Asherah Connor wrote: > serial_reinit_all() is only available if CONFIG_SERIAL is defined (i.e. > !CONFIG_DM_SERIAL). > > Signed-off-by: Asherah Connor <ashe@kivikakk.ee> > Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks!
diff --git a/cmd/terminal.c b/cmd/terminal.c index 733701e059..9e32a4191e 100644 --- a/cmd/terminal.c +++ b/cmd/terminal.c @@ -25,7 +25,9 @@ int do_terminal(struct cmd_tbl *cmd, int flag, int argc, char *const argv[]) if (!dev) return -1; - serial_reinit_all(); + if (IS_ENABLED(CONFIG_SERIAL)) + serial_reinit_all(); + printf("Entering terminal mode for port %s\n", dev->name); puts("Use '~.' to leave the terminal and get back to u-boot\n");
serial_reinit_all() is only available if CONFIG_SERIAL is defined (i.e. !CONFIG_DM_SERIAL). Signed-off-by: Asherah Connor <ashe@kivikakk.ee> --- cmd/terminal.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)