diff options
| author | Tom Rini <trini@konsulko.com> | 2022-03-14 17:40:36 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-03-14 17:40:36 -0400 |
| commit | 2abf048ab7b835787d6627423559832f2b18f253 (patch) | |
| tree | afed2c3a11ae600fec9b55ef8c50d5133b65ba87 /cmd | |
| parent | 7b958ede8c795501717b972b67473ea4cdc09b45 (diff) | |
| parent | c149bf41404e34014e37de32fac332892b11bd4a (diff) | |
| download | u-boot-2abf048ab7b835787d6627423559832f2b18f253.tar.gz | |
Merge tag 'v2022.04-rc4' into next
Prepare v2022.04-rc4
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/cls.c | 10 | ||||
| -rw-r--r-- | cmd/pwm.c | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/cmd/cls.c b/cmd/cls.c index eab4e6993bb..bdeb49786d4 100644 --- a/cmd/cls.c +++ b/cmd/cls.c @@ -11,17 +11,23 @@ #include <lcd.h> #include <video.h> +#define CSI "\x1b[" + static int do_video_clear(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { -#if defined(CONFIG_DM_VIDEO) - struct udevice *dev; + __maybe_unused struct udevice *dev; + /* Send clear screen and home */ + printf(CSI "2J" CSI "1;1H"); +#if defined(CONFIG_DM_VIDEO) +#if !defined(CONFIG_VIDEO_ANSI) if (uclass_first_device_err(UCLASS_VIDEO, &dev)) return CMD_RET_FAILURE; if (video_clear(dev)) return CMD_RET_FAILURE; +#endif #elif defined(CONFIG_CFB_CONSOLE) video_clear(); #elif defined(CONFIG_LCD) diff --git a/cmd/pwm.c b/cmd/pwm.c index 7947e61aeed..7e82955239f 100644 --- a/cmd/pwm.c +++ b/cmd/pwm.c @@ -111,5 +111,5 @@ U_BOOT_CMD(pwm, 6, 0, do_pwm, "invert <pwm_dev_num> <channel> <polarity> - invert polarity\n" "pwm config <pwm_dev_num> <channel> <period_ns> <duty_ns> - config PWM\n" "pwm enable <pwm_dev_num> <channel> - enable PWM output\n" - "pwm disable <pwm_dev_num> <channel> - eisable PWM output\n" + "pwm disable <pwm_dev_num> <channel> - disable PWM output\n" "Note: All input values are in decimal"); |