diff options
| author | Tom Rini <[email protected]> | 2022-11-24 16:31:02 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-11-24 16:31:02 -0500 |
| commit | 27c415ae8b743710e412ef408b52894af68141c6 (patch) | |
| tree | b09a8071fab5ac92f89efd6dcc0c039524121ca4 /cmd | |
| parent | d5d9f325791dc6fa3f2b564062cb109db89b0917 (diff) | |
| parent | 2fdc4c0c49ed8624322c856c82bb15e4536e25a3 (diff) | |
Merge branch '2022-11-23-assorted-fixes'
- Small ubifs updates, mkenvimage fix, ast2600 ram updates, update CI to
make git happier, spelling fix in K3 code and fix dependencies in
CMD_CLS
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/Kconfig | 2 | ||||
| -rw-r--r-- | cmd/ubifs.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index 1092fb9c914..79848cc6ab2 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1959,7 +1959,7 @@ config CMD_CONITRACE config CMD_CLS bool "Enable clear screen command 'cls'" - default y if LCD || DM_VIDEO + default y if LCD || VIDEO help Enable the 'cls' command which clears the screen contents on video frame buffer. diff --git a/cmd/ubifs.c b/cmd/ubifs.c index 7a620c5e21d..6a01d0988a2 100644 --- a/cmd/ubifs.c +++ b/cmd/ubifs.c @@ -33,7 +33,7 @@ int cmd_ubifs_mount(char *vol_name) ret = uboot_ubifs_mount(vol_name); if (ret) - return -1; + return CMD_RET_FAILURE; ubifs_mounted = 1; @@ -62,7 +62,7 @@ int cmd_ubifs_umount(void) { if (ubifs_initialized == 0) { printf("No UBIFS volume mounted!\n"); - return -1; + return CMD_RET_FAILURE; } uboot_ubifs_umount(); @@ -89,7 +89,7 @@ static int do_ubifs_ls(struct cmd_tbl *cmdtp, int flag, int argc, if (!ubifs_mounted) { printf("UBIFS not mounted, use ubifsmount to mount volume first!\n"); - return -1; + return CMD_RET_FAILURE; } if (argc == 2) @@ -116,7 +116,7 @@ static int do_ubifs_load(struct cmd_tbl *cmdtp, int flag, int argc, if (!ubifs_mounted) { printf("UBIFS not mounted, use ubifs mount to mount volume first!\n"); - return -1; + return CMD_RET_FAILURE; } if (argc < 3) |