Merge git://git.denx.de/u-boot-marvell

[J-u-boot.git] / common / cmd_console.c

diff --git a/common/cmd_console.c b/common/cmd_console.c
index 912234b4fa06924cc63fab93e50fe6d67fa64a22..93dc5050567d972364355ff924756445982c7227 100644 (file)
--- a/common/cmd_console.c
+++ b/common/cmd_console.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -26,21 +10,22 @@
  */
 #include <common.h>
 #include <command.h>
-#include <devices.h>
-
-#if (CONFIG_COMMANDS & CFG_CMD_CONSOLE)
+#include <stdio_dev.h>
 
 extern void _do_coninfo (void);
-int do_coninfo (cmd_tbl_t * cmd, int flag, int argc, char *argv[])
+static int do_coninfo(cmd_tbl_t *cmd, int flag, int argc, char * const argv[])
 {
-       int i, l;
+       int l;
+       struct list_head *list = stdio_get_list();
+       struct list_head *pos;
+       struct stdio_dev *dev;
 
        /* Scan for valid output and input devices */
 
-       printf ("List of available devices:\n");
+       puts ("List of available devices:\n");
 
-       for (i = 1; i <= ListNumItems (devlist); i++) {
-               device_t *dev = ListGetPtrToItem (devlist, i);
+       list_for_each(pos, list) {
+               dev = list_entry(pos, struct stdio_dev, list);
 
                printf ("%-8s %08x %c%c%c ",
                        dev->name,
@@ -64,8 +49,6 @@ int do_coninfo (cmd_tbl_t * cmd, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        coninfo,        3,      1,      do_coninfo,
-       "coninfo - print console devices and informations\n",
+       "print console devices and information",
        ""
 );
-
-#endif /* CFG_CMD_CONSOLE */