diff options
| author | Tom Rini <trini@konsulko.com> | 2023-04-09 11:08:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-04-09 11:08:39 -0400 |
| commit | 7daa8dd59bc8455a43cdd2d0e34206e406e5cdcc (patch) | |
| tree | 975875173c54134724ee81a05773d69795c3e924 /cmd | |
| parent | fa6f458c679f55edd11e8e34f209d4a0e01bf7bc (diff) | |
| parent | d9d07d751e0f41d009051e8c25e2d5d9cf7ca41c (diff) | |
Merge tag 'efi-2023-07-rc1' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2023-07-rc1
Documentation:
* man-page for coninfo command
* documentation style
* switch settings for boot modes on AM62 SK
UEFI:
* avoid using deprecated HandleProtocol()
* set static attribute for non-exported functions and variables
Diffstat (limited to 'cmd')
| -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 620a961cde..58c2cf1c89 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; |