cmd: consider multiplexing in coninfo

If console multiplexing in enabled (CONFIG_CONSOLE_MUX=y), the output of
the coninfo command should show the file association (stdin, stderr,
stdout) for all devices not only the default ones.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/cmd/console.c b/cmd/console.c
index 620a961cdefbaa3f188b9761c49b01ac0357b712..58c2cf1c8943e177bc47201c39073b03d17b00d9 100644 (file)
--- a/cmd/console.c
+++ b/cmd/console.c
@@ -9,6 +9,7 @@
  */
 #include <common.h>
 #include <command.h>
+#include <iomux.h>
 #include <stdio_dev.h>
 
 extern void _do_coninfo (void);
@@ -33,9 +34,15 @@ static int do_coninfo(struct cmd_tbl *cmd, int flag, int argc,
                       (dev->flags & DEV_FLAGS_OUTPUT) ? "O" : "");
 
                for (l = 0; l < MAX_FILES; l++) {
-                       if (stdio_devices[l] == dev) {
-                               printf("|   |-- %s\n", stdio_names[l]);
+                       if (CONFIG_IS_ENABLED(CONSOLE_MUX)) {
+                               if (iomux_match_device(console_devices[l],
+                                                      cd_count[l], dev) >= 0)
+                                       printf("|   |-- %s\n", stdio_names[l]);
+                       } else {
+                               if (stdio_devices[l] == dev)
+                                       printf("|   |-- %s\n", stdio_names[l]);
                        }
+
                }
        }
        return 0;