firmware: ti_sci: Update ti_sci_msg_req_reboot to include domain

[pandora-u-boot.git] / cmd / terminal.c

diff --git a/cmd/terminal.c b/cmd/terminal.c
index 4b9c0b3..9e32a41 100644 (file)
--- a/cmd/terminal.c
+++ b/cmd/terminal.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2007 OpenMoko, Inc.
  * Written by Harald Welte <laforge@openmoko.org>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -13,7 +12,7 @@
 #include <stdio_dev.h>
 #include <serial.h>
 
-int do_terminal(cmd_tbl_t * cmd, int flag, int argc, char * const argv[])
+int do_terminal(struct cmd_tbl *cmd, int flag, int argc, char *const argv[])
 {
        int last_tilde = 0;
        struct stdio_dev *dev = NULL;
@@ -26,7 +25,9 @@ int do_terminal(cmd_tbl_t * 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");
 
@@ -34,8 +35,8 @@ int do_terminal(cmd_tbl_t * cmd, int flag, int argc, char * const argv[])
                int c;
 
                /* read from console and display on serial port */
-               if (stdio_devices[0]->tstc()) {
-                       c = stdio_devices[0]->getc();
+               if (stdio_devices[0]->tstc(stdio_devices[0])) {
+                       c = stdio_devices[0]->getc(stdio_devices[0]);
                        if (last_tilde == 1) {
                                if (c == '.') {
                                        putc(c);
@@ -44,7 +45,7 @@ int do_terminal(cmd_tbl_t * cmd, int flag, int argc, char * const argv[])
                                } else {
                                        last_tilde = 0;
                                        /* write the delayed tilde */
-                                       dev->putc('~');
+                                       dev->putc(dev, '~');
                                        /* fall-through to print current
                                         * character */
                                }
@@ -54,12 +55,12 @@ int do_terminal(cmd_tbl_t * cmd, int flag, int argc, char * const argv[])
                                puts("[u-boot]");
                                putc(c);
                        }
-                       dev->putc(c);
+                       dev->putc(dev, c);
                }
 
                /* read from serial port and display on console */
-               if (dev->tstc()) {
-                       c = dev->getc();
+               if (dev->tstc(dev)) {
+                       c = dev->getc(dev);
                        putc(c);
                }
        }