diff options
| author | Heinrich Schuchardt <heinrich.schuchardt@canonical.com> | 2023-04-01 12:20:34 +0200 |
|---|---|---|
| committer | Heinrich Schuchardt <heinrich.schuchardt@canonical.com> | 2023-04-08 07:50:43 +0200 |
| commit | d9d07d751e0f41d009051e8c25e2d5d9cf7ca41c (patch) | |
| tree | dcc0b98ea831c5e7f37435ff993da9e7cc1c9c52 | |
| parent | 6fc4fc38ac4d11ac53b4d539588d216d107f7703 (diff) | |
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>
| -rw-r--r-- | cmd/console.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/cmd/console.c b/cmd/console.c index 620a961cdef..58c2cf1c894 100644 --- 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; |