[U-Boot] [PATCH 1/2] various cmd_* files: remove the command name from the help message

removed the command name from the help message as it is already printed. for cmd_mmc also rewrote the message a little bit
Signed-off-by: Frans Meulenbroeks fransmeulenbroeks@gmail.com --- common/cmd_cramfs.c | 4 ++-- common/cmd_dataflash_mmc_mux.c | 2 +- common/cmd_mgdisk.c | 2 +- common/cmd_mmc.c | 4 +++- 4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/common/cmd_cramfs.c b/common/cmd_cramfs.c index ab10450..8c86dc5 100644 --- a/common/cmd_cramfs.c +++ b/common/cmd_cramfs.c @@ -199,14 +199,14 @@ int do_cramfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) /***************************************************/ U_BOOT_CMD( cramfsload, 3, 0, do_cramfs_load, - "cramfsload\t- load binary file from a filesystem image", + "load binary file from a filesystem image", "[ off ] [ filename ]\n" " - load binary file from address 'cramfsaddr'\n" " with offset 'off'\n" ); U_BOOT_CMD( cramfsls, 2, 1, do_cramfs_ls, - "cramfsls\t- list files in a directory (default /)", + "list files in a directory (default /)", "[ directory ]\n" " - list files in a directory.\n" ); diff --git a/common/cmd_dataflash_mmc_mux.c b/common/cmd_dataflash_mmc_mux.c index de4e676..cfa1101 100644 --- a/common/cmd_dataflash_mmc_mux.c +++ b/common/cmd_dataflash_mmc_mux.c @@ -59,7 +59,7 @@ static int mmc_nspi (const char *s)
U_BOOT_CMD( dataflash_mmc_mux, 2, 1, do_dataflash_mmc_mux, - "dataflash_mmc_mux\t- enable or disable MMC or SPI\n", + "enable or disable MMC or SPI\n", "[mmc, spi]\n" " - enable or disable MMC or SPI" ); diff --git a/common/cmd_mgdisk.c b/common/cmd_mgdisk.c index c2d5217..dfd0142 100644 --- a/common/cmd_mgdisk.c +++ b/common/cmd_mgdisk.c @@ -62,7 +62,7 @@ int do_mg_disk_cmd (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
U_BOOT_CMD( mgd, 5, 0, do_mg_disk_cmd, - "mgd - mgine m[g]flash command\n", + "mgine m[g]flash command\n", ": mgine mflash IO mode (disk) command\n" " - initialize : mgd init\n" " - random read : mgd read [from] [to] [size]\n" diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c index e5f5e94..30e6e0b 100644 --- a/common/cmd_mmc.c +++ b/common/cmd_mmc.c @@ -131,7 +131,9 @@ int do_mmcinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) }
U_BOOT_CMD(mmcinfo, 2, 0, do_mmcinfo, - "mmcinfo <dev num>-- display MMC info", + "display MMC info", + "<dev num>\n + " - device number of the device to dislay info of\n" "" );

Most of the files have U_BOOT_CMD on a separate line, but a few didn't and had the first line on the same line as U_BOOT_CMD.
This changes these files by adding a line break and a tab
Signed-off-by: Frans Meulenbroeks fransmeulenbroeks@gmail.com --- common/cmd_ambapp.c | 3 ++- common/cmd_bootldr.c | 3 ++- common/cmd_cplbinfo.c | 3 ++- common/cmd_license.c | 3 ++- common/cmd_mmc.c | 3 ++- common/cmd_nand.c | 3 ++- common/cmd_otp.c | 3 ++- common/cmd_spibootldr.c | 3 ++- common/cmd_strings.c | 3 ++- common/cmd_ubi.c | 3 ++- common/cmd_ubifs.c | 6 ++++-- common/cmd_ximg.c | 3 ++- 12 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/common/cmd_ambapp.c b/common/cmd_ambapp.c index 283c433..fa7d7e2 100644 --- a/common/cmd_ambapp.c +++ b/common/cmd_ambapp.c @@ -272,7 +272,8 @@ int ambapp_init_reloc(void) return 0; }
-U_BOOT_CMD(ambapp, 1, 1, do_ambapp_print, +U_BOOT_CMD( + ambapp, 1, 1, do_ambapp_print, "list AMBA Plug&Play information", "ambapp\n" " - lists AMBA (AHB & APB) Plug&Play devices present on the system" diff --git a/common/cmd_bootldr.c b/common/cmd_bootldr.c index c7f14d9..535b931 100644 --- a/common/cmd_bootldr.c +++ b/common/cmd_bootldr.c @@ -167,7 +167,8 @@ int do_bootldr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 0; }
-U_BOOT_CMD(bootldr, 2, 0, do_bootldr, +U_BOOT_CMD( + bootldr, 2, 0, do_bootldr, "boot ldr image from memory", "[addr]\n" "" diff --git a/common/cmd_cplbinfo.c b/common/cmd_cplbinfo.c index fc6abff..ab5b3b5 100644 --- a/common/cmd_cplbinfo.c +++ b/common/cmd_cplbinfo.c @@ -53,7 +53,8 @@ int do_cplbinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 0; }
-U_BOOT_CMD(cplbinfo, 1, 0, do_cplbinfo, +U_BOOT_CMD( + cplbinfo, 1, 0, do_cplbinfo, "display current CPLB tables", "" ); diff --git a/common/cmd_license.c b/common/cmd_license.c index 90fd57e..70645d5 100644 --- a/common/cmd_license.c +++ b/common/cmd_license.c @@ -49,7 +49,8 @@ int do_license(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 0; }
-U_BOOT_CMD(license, 1, 1, do_license, +U_BOOT_CMD( + license, 1, 1, do_license, "print GPL license text", "" ); diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c index 30e6e0b..d318841 100644 --- a/common/cmd_mmc.c +++ b/common/cmd_mmc.c @@ -130,7 +130,8 @@ int do_mmcinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 0; }
-U_BOOT_CMD(mmcinfo, 2, 0, do_mmcinfo, +U_BOOT_CMD( + mmcinfo, 2, 0, do_mmcinfo, "display MMC info", "<dev num>\n " - device number of the device to dislay info of\n" diff --git a/common/cmd_nand.c b/common/cmd_nand.c index 0f47a25..3f1d077 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -579,7 +579,8 @@ usage: return cmd_usage(cmdtp); }
-U_BOOT_CMD(nand, CONFIG_SYS_MAXARGS, 1, do_nand, +U_BOOT_CMD( + nand, CONFIG_SYS_MAXARGS, 1, do_nand, "NAND sub-system", "info - show available NAND devices\n" "nand device [dev] - show or set current device\n" diff --git a/common/cmd_otp.c b/common/cmd_otp.c index 43f7c69..56f08e0 100644 --- a/common/cmd_otp.c +++ b/common/cmd_otp.c @@ -223,7 +223,8 @@ int do_otp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return ret; }
-U_BOOT_CMD(otp, 7, 0, do_otp, +U_BOOT_CMD( + otp, 7, 0, do_otp, "One-Time-Programmable sub-system", "read <addr> <page> [count] [half]\n" " - read 'count' half-pages starting at 'page' (offset 'half') to 'addr'\n" diff --git a/common/cmd_spibootldr.c b/common/cmd_spibootldr.c index 68aa618..ca76dde 100644 --- a/common/cmd_spibootldr.c +++ b/common/cmd_spibootldr.c @@ -30,7 +30,8 @@ int do_spibootldr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return bfrom_SpiBoot(addr, BFLAG_PERIPHERAL | 4, 0, NULL); }
-U_BOOT_CMD(spibootldr, 2, 0, do_spibootldr, +U_BOOT_CMD( + spibootldr, 2, 0, do_spibootldr, "boot ldr image from spi", "[offset]\n" " - boot ldr image stored at offset into spi\n"); diff --git a/common/cmd_strings.c b/common/cmd_strings.c index 144a6c1..2986324 100644 --- a/common/cmd_strings.c +++ b/common/cmd_strings.c @@ -38,7 +38,8 @@ int do_strings(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 0; }
-U_BOOT_CMD(strings, 3, 1, do_strings, +U_BOOT_CMD( + strings, 3, 1, do_strings, "display strings", "<addr> [byte count]\n" " - display strings at <addr> for at least [byte count] or first double NUL" diff --git a/common/cmd_ubi.c b/common/cmd_ubi.c index 77ca0a5..7692ac7 100644 --- a/common/cmd_ubi.c +++ b/common/cmd_ubi.c @@ -598,7 +598,8 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) return -1; }
-U_BOOT_CMD(ubi, 6, 1, do_ubi, +U_BOOT_CMD( + ubi, 6, 1, do_ubi, "ubi commands", "part [part] [offset]\n" " - Show or set current partition (with optional VID" diff --git a/common/cmd_ubifs.c b/common/cmd_ubifs.c index 2cab793..a0ec184 100644 --- a/common/cmd_ubifs.c +++ b/common/cmd_ubifs.c @@ -131,13 +131,15 @@ U_BOOT_CMD( " - mount 'volume-name' volume" );
-U_BOOT_CMD(ubifsls, 2, 0, do_ubifs_ls, +U_BOOT_CMD( + ubifsls, 2, 0, do_ubifs_ls, "list files in a directory", "[directory]\n" " - list files in a 'directory' (default '/')" );
-U_BOOT_CMD(ubifsload, 4, 0, do_ubifs_load, +U_BOOT_CMD( + ubifsload, 4, 0, do_ubifs_load, "load file from an UBIFS filesystem", "<addr> <filename> [bytes]\n" " - load file 'filename' to address 'addr'" diff --git a/common/cmd_ximg.c b/common/cmd_ximg.c index 8a2cf83..dceb975 100644 --- a/common/cmd_ximg.c +++ b/common/cmd_ximg.c @@ -262,7 +262,8 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) return 0; }
-U_BOOT_CMD(imxtract, 4, 1, do_imgextract, +U_BOOT_CMD( + imxtract, 4, 1, do_imgextract, "extract a part of a multi-image", "addr part [dest]\n" " - extract <part> from legacy image at <addr> and copy to <dest>"

Dear Frans Meulenbroeks,
In message 1280581313-5174-2-git-send-email-fransmeulenbroeks@gmail.com you wrote:
Most of the files have U_BOOT_CMD on a separate line, but a few didn't and had the first line on the same line as U_BOOT_CMD.
This changes these files by adding a line break and a tab
Signed-off-by: Frans Meulenbroeks fransmeulenbroeks@gmail.com
common/cmd_ambapp.c | 3 ++- common/cmd_bootldr.c | 3 ++- common/cmd_cplbinfo.c | 3 ++- common/cmd_license.c | 3 ++- common/cmd_mmc.c | 3 ++- common/cmd_nand.c | 3 ++- common/cmd_otp.c | 3 ++- common/cmd_spibootldr.c | 3 ++- common/cmd_strings.c | 3 ++- common/cmd_ubi.c | 3 ++- common/cmd_ubifs.c | 6 ++++-- common/cmd_ximg.c | 3 ++- 12 files changed, 26 insertions(+), 13 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk

Dear Frans Meulenbroeks,
In message 1280581313-5174-1-git-send-email-fransmeulenbroeks@gmail.com you wrote:
removed the command name from the help message as it is already printed. for cmd_mmc also rewrote the message a little bit
Signed-off-by: Frans Meulenbroeks fransmeulenbroeks@gmail.com
common/cmd_cramfs.c | 4 ++-- common/cmd_dataflash_mmc_mux.c | 2 +- common/cmd_mgdisk.c | 2 +- common/cmd_mmc.c | 4 +++- 4 files changed, 7 insertions(+), 5 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
participants (2)
-
Frans Meulenbroeks
-
Wolfgang Denk