diff options
| author | Tom Rini <trini@konsulko.com> | 2023-03-13 15:36:52 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-03-13 15:36:52 -0400 |
| commit | 2684aad483f57fba10c245cf56614880e9f4657e (patch) | |
| tree | 50d264f36cd5417e9af5e3b7ed5800f34b8c1320 /cmd/cls.c | |
| parent | bcf343146ff365a88481b9a80920ed146c6dee5b (diff) | |
| parent | 61a621054194216eefc1a6f5af0a63aa265bbaef (diff) | |
Merge tag 'efi-next-20230313' of https://source.denx.de/u-boot/custodians/u-boot-efi into next
Pull request efi-next-20230313
UEFI:
* Improve graphics support in EFI app
Others:
* x86: Add a few more items to bdinfo
* video: Remove duplicate cursor-positioning function
* video: Clear the vidconsole rather than the video
Diffstat (limited to 'cmd/cls.c')
| -rw-r--r-- | cmd/cls.c | 20 |
1 files changed, 15 insertions, 5 deletions
@@ -8,7 +8,7 @@ #include <common.h> #include <command.h> #include <dm.h> -#include <video.h> +#include <video_console.h> #define CSI "\x1b[" @@ -17,14 +17,24 @@ static int do_video_clear(struct cmd_tbl *cmdtp, int flag, int argc, { __maybe_unused struct udevice *dev; - /* Send clear screen and home */ + /* + * Send clear screen and home + * + * FIXME(Heinrich Schuchardt <xypron.glpk@gmx.de>): This should go + * through an API and only be written to serial terminals, not video + * displays + */ printf(CSI "2J" CSI "1;1H"); - if (IS_ENABLED(CONFIG_VIDEO) && !IS_ENABLED(CONFIG_VIDEO_ANSI)) { - if (uclass_first_device_err(UCLASS_VIDEO, &dev)) + if (IS_ENABLED(CONFIG_VIDEO_ANSI)) + return 0; + + if (IS_ENABLED(CONFIG_VIDEO)) { + if (uclass_first_device_err(UCLASS_VIDEO_CONSOLE, &dev)) return CMD_RET_FAILURE; - if (video_clear(dev)) + if (vidconsole_clear_and_reset(dev)) return CMD_RET_FAILURE; } + return CMD_RET_SUCCESS; } |