[U-Boot] [PATCH 0/5] Command usage cleanup

This patch series attempts to clean up how the "usage" field of the cmd_tbl_s structure is used. It does 3 things: 1. Adds a cmd_usage() function to print a command's usage 2. Removes the command name from the usage field for all commands 3. Removes newlines from the usage field of all commands
The benefits of these changes are: 1. Command formatting in the "help" command output will always be properly aligned. A fair number of commands currently aren't properly formated, eg "cmd1 - description" vs "cmd2 - description". 2. Command definitions are reduced in size/complexity. The patch shaved off 1.1KB from the XPedite5370 image for example.
Most of the changes were done via scripts, so let me know if anything looks fishy.
Best, Peter
Peter Tyser (5): Clean up diufb command definitions pcs440ep: Clean up led command definition Standardize command usage messages with new cmd_usage() function amcc: Clean up command usage output Command usage cleanup
README | 3 + board/BuS/EB+MCF-EV123/EB+MCF-EV123.c | 4 +- board/MAI/AmigaOneG3SE/cmd_boota.c | 2 +- board/MAI/menu/cmd_menu.c | 2 +- board/ads5121/ads5121_diu.c | 4 +- board/amcc/acadia/cmd_acadia.c | 4 +- board/amcc/canyonlands/bootstrap.c | 4 +- board/amcc/katmai/cmd_katmai.c | 4 +- board/amcc/kilauea/cmd_pll.c | 8 ++-- board/amcc/luan/luan.c | 4 +- board/amcc/makalu/cmd_pll.c | 8 ++-- board/amcc/sequoia/cmd_sequoia.c | 4 +- board/amcc/taihu/lcd.c | 14 +++--- board/amcc/taihu/taihu.c | 10 ++-- board/amcc/taihu/update.c | 2 +- board/amcc/taishan/lcd.c | 20 +++++----- board/amcc/taishan/showinfo.c | 6 +- board/amcc/taishan/update.c | 2 +- board/amcc/yucca/cmd_yucca.c | 4 +- board/amirix/ap1000/ap1000.c | 10 ++-- board/amirix/ap1000/powerspan.c | 2 +- board/barco/barco.c | 8 ++-- board/bc3450/cmd_bc3450.c | 10 ++-- board/bf537-stamp/cmd_bf537led.c | 2 +- board/cm5200/cmd_cm5200.c | 2 +- board/delta/delta.c | 2 +- board/esd/ar405/ar405.c | 6 +- board/esd/cms700/cms700.c | 2 +- board/esd/common/auto_update.c | 2 +- board/esd/common/cmd_loadpci.c | 2 +- board/esd/common/lcd.c | 4 +- board/esd/common/xilinx_jtag/micro.c | 2 +- board/esd/cpci2dp/cpci2dp.c | 2 +- board/esd/cpci405/cpci405.c | 6 +- board/esd/cpci5200/cpci5200.c | 2 +- board/esd/cpci750/cpci750.c | 2 +- board/esd/dasa_sim/cmd_dasa_sim.c | 4 +- board/esd/du440/du440.c | 16 ++++---- board/esd/hh405/hh405.c | 2 +- board/esd/ocrtc/cmd_ocrtc.c | 4 +- board/esd/pci405/cmd_pci405.c | 2 +- board/esd/pci405/pci405.c | 2 +- board/esd/pf5200/pf5200.c | 6 +- board/esd/plu405/plu405.c | 2 +- board/esd/pmc405/pmc405.c | 2 +- board/esd/pmc440/cmd_pmc440.c | 18 ++++---- board/esd/tasreg/tasreg.c | 12 +++--- board/esd/voh405/voh405.c | 2 +- board/evb64260/zuma_pbb.c | 6 +- board/freescale/common/pixis.c | 4 +- board/freescale/common/sys_eeprom.c | 4 +- board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c | 4 +- board/g2000/g2000.c | 6 +- board/hymod/bsp.c | 8 ++-- board/keymile/common/keymile_hdlc_enet.c | 4 +- board/lwmon/lwmon.c | 10 ++-- board/lwmon5/kbd.c | 2 +- board/lwmon5/lwmon5.c | 6 +- board/mpl/common/common_util.c | 2 +- board/mpl/mip405/cmd_mip405.c | 2 +- board/mpl/pati/cmd_pati.c | 2 +- board/mpl/pip405/cmd_pip405.c | 2 +- board/mpl/vcma9/cmd_vcma9.c | 2 +- board/pcippc2/pcippc2.c | 4 +- board/pcs440ep/pcs440ep.c | 6 +- board/pn62/cmd_pn62.c | 8 ++-- board/prodrive/pdnb3/pdnb3.c | 4 +- board/pxa255_idp/pxa_idp.c | 2 +- board/r360mpi/r360mpi.c | 2 +- board/renesas/sh7785lcr/rtl8169_mac.c | 8 ++-- board/renesas/sh7785lcr/selfcheck.c | 6 +- board/sandburst/common/ppc440gx_i2c.c | 2 +- board/sandburst/karef/karef.c | 4 +- board/sandburst/metrobox/metrobox.c | 4 +- board/siemens/common/fpga.c | 4 +- board/siemens/pcu_e/pcu_e.c | 4 +- board/ssv/common/cmd_sled.c | 4 +- board/ssv/common/wd_pio.c | 4 +- board/tqc/tqm5200/cmd_stk52xx.c | 22 +++++----- board/tqc/tqm5200/cmd_tb5200.c | 4 +- board/tqc/tqm8272/tqm8272.c | 2 +- board/trab/cmd_trab.c | 24 +++++----- board/trab/trab.c | 2 +- board/trizepsiv/eeprom.c | 10 ++-- board/w7o/cmd_vpd.c | 4 +- board/zeus/update.c | 2 +- board/zeus/zeus.c | 4 +- common/cmd_ambapp.c | 2 +- common/cmd_autoscript.c | 2 +- common/cmd_bdinfo.c | 2 +- common/cmd_bedbug.c | 20 +++++----- common/cmd_bmp.c | 6 +- common/cmd_boot.c | 6 +- common/cmd_bootldr.c | 2 +- common/cmd_bootm.c | 14 +++--- common/cmd_cache.c | 12 +++--- common/cmd_console.c | 2 +- common/cmd_cplbinfo.c | 2 +- common/cmd_date.c | 4 +- common/cmd_dcr.c | 16 ++++---- common/cmd_df.c | 4 +- common/cmd_diag.c | 2 +- common/cmd_display.c | 2 +- common/cmd_doc.c | 14 +++--- common/cmd_dtt.c | 2 +- common/cmd_eeprom.c | 6 +- common/cmd_elf.c | 4 +- common/cmd_ext2.c | 8 ++-- common/cmd_fat.c | 6 +- common/cmd_fdc.c | 4 +- common/cmd_fdos.c | 6 +- common/cmd_fdt.c | 16 ++++---- common/cmd_flash.c | 20 +++++----- common/cmd_fpga.c | 4 +- common/cmd_i2c.c | 42 ++++++++++---------- common/cmd_ide.c | 14 +++--- common/cmd_immap.c | 34 ++++++++-------- common/cmd_irq.c | 4 +- common/cmd_itest.c | 4 +- common/cmd_jffs2.c | 12 +++--- common/cmd_license.c | 2 +- common/cmd_load.c | 16 ++++---- common/cmd_log.c | 6 +- common/cmd_mac.c | 2 +- common/cmd_mem.c | 54 ++++++++++++------------ common/cmd_mfsl.c | 16 ++++---- common/cmd_mii.c | 6 +- common/cmd_misc.c | 6 +- common/cmd_mmc.c | 2 +- common/cmd_mp.c | 10 ++-- common/cmd_nand.c | 24 +++++----- common/cmd_net.c | 20 +++++----- common/cmd_nvedit.c | 16 ++++---- common/cmd_onenand.c | 4 +- common/cmd_otp.c | 4 +- common/cmd_pci.c | 4 +- common/cmd_pcmcia.c | 2 +- common/cmd_portio.c | 8 ++-- common/cmd_reginfo.c | 2 +- common/cmd_reiser.c | 8 ++-- common/cmd_sata.c | 10 ++-- common/cmd_scsi.c | 14 +++--- common/cmd_setexpr.c | 4 +- common/cmd_sf.c | 4 +- common/cmd_spi.c | 2 +- common/cmd_strings.c | 4 +- common/cmd_terminal.c | 2 +- common/cmd_ubi.c | 6 +- common/cmd_universe.c | 2 +- common/cmd_usb.c | 10 ++-- common/cmd_vfd.c | 4 +- common/cmd_ximg.c | 2 +- common/cmd_yaffs2.c | 24 +++++----- common/command.c | 24 +++++++---- common/hush.c | 4 +- common/kgdb.c | 2 +- common/lcd.c | 2 +- common/main.c | 4 +- cpu/mpc512x/speed.c | 2 +- cpu/mpc8260/bedbug_603e.c | 4 +- cpu/mpc83xx/ecc.c | 6 +- cpu/mpc83xx/speed.c | 2 +- cpu/mpc8xx/bedbug_860.c | 4 +- cpu/nios2/sysid.c | 2 +- cpu/ppc4xx/bedbug_405.c | 4 +- drivers/gpio/pca953x.c | 4 +- drivers/misc/ds4510.c | 4 +- drivers/qe/qe.c | 6 +- include/command.h | 7 +++ tools/updater/cmd_flash.c | 14 +++--- 170 files changed, 580 insertions(+), 564 deletions(-)

The diufb command usage formatting is non-standard. It was made standard in preparation for larger command usage updates.
Signed-off-by: Peter Tyser ptyser@xes-inc.com --- board/ads5121/ads5121_diu.c | 2 +- board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/board/ads5121/ads5121_diu.c b/board/ads5121/ads5121_diu.c index 11450aa..896900b 100644 --- a/board/ads5121/ads5121_diu.c +++ b/board/ads5121/ads5121_diu.c @@ -101,7 +101,7 @@ int ads5121diu_init_show_bmp(cmd_tbl_t *cmdtp,
U_BOOT_CMD( diufb, CONFIG_SYS_MAXARGS, 1, ads5121diu_init_show_bmp, - "diufb init | addr - Init or Display BMP file\n", + "diufb - Init or Display BMP file\n", "init\n - initialize DIU\n" "addr\n - display bmp at address 'addr'\n" ); diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c index cd25d4a..08eaf10 100644 --- a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c +++ b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c @@ -138,7 +138,7 @@ int mpc8610diu_init_show_bmp(cmd_tbl_t *cmdtp,
U_BOOT_CMD( diufb, CONFIG_SYS_MAXARGS, 1, mpc8610diu_init_show_bmp, - "diufb init | addr - Init or Display BMP file\n", + "diufb - Init or Display BMP file\n", "init\n - initialize DIU\n" "addr\n - display bmp at address 'addr'\n" );

The pcs440ep's led command usage formatting is non-standard. It was made standard in preparation for larger command usage updates.
Signed-off-by: Peter Tyser ptyser@xes-inc.com --- board/pcs440ep/pcs440ep.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/board/pcs440ep/pcs440ep.c b/board/pcs440ep/pcs440ep.c index 271005f..73a7a08 100644 --- a/board/pcs440ep/pcs440ep.c +++ b/board/pcs440ep/pcs440ep.c @@ -761,7 +761,7 @@ int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
U_BOOT_CMD( led, 2, 1, do_led, - "led [bitmask] - set the DIAG-LED\n", + "led - set the DIAG-LED\n", "[bitmask] 0x01 = DIAG 1 on\n" " 0x02 = DIAG 2 on\n" " 0x04 = DIAG 3 on\n"

Signed-off-by: Peter Tyser ptyser@xes-inc.com --- board/BuS/EB+MCF-EV123/EB+MCF-EV123.c | 2 +- board/ads5121/ads5121_diu.c | 2 +- board/amcc/acadia/cmd_acadia.c | 2 +- board/amcc/canyonlands/bootstrap.c | 2 +- board/amcc/katmai/cmd_katmai.c | 2 +- board/amcc/kilauea/cmd_pll.c | 6 +++--- board/amcc/luan/luan.c | 2 +- board/amcc/makalu/cmd_pll.c | 6 +++--- board/amcc/sequoia/cmd_sequoia.c | 2 +- board/amcc/yucca/cmd_yucca.c | 2 +- board/barco/barco.c | 2 +- board/esd/common/lcd.c | 2 +- board/esd/dasa_sim/cmd_dasa_sim.c | 2 +- board/freescale/common/sys_eeprom.c | 4 ++-- board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c | 2 +- board/hymod/bsp.c | 4 ++-- board/lwmon/lwmon.c | 4 ++-- board/lwmon5/lwmon5.c | 4 ++-- board/mpl/common/common_util.c | 2 +- board/pcippc2/pcippc2.c | 2 +- board/pcs440ep/pcs440ep.c | 2 +- board/pn62/cmd_pn62.c | 4 ++-- board/prodrive/pdnb3/pdnb3.c | 2 +- board/renesas/sh7785lcr/rtl8169_mac.c | 4 ++-- board/renesas/sh7785lcr/selfcheck.c | 4 ++-- board/siemens/common/fpga.c | 2 +- board/siemens/pcu_e/pcu_e.c | 2 +- board/ssv/common/cmd_sled.c | 2 +- board/ssv/common/wd_pio.c | 2 +- board/tqc/tqm5200/cmd_stk52xx.c | 12 ++++++------ board/trab/cmd_trab.c | 12 ++++++------ board/trizepsiv/eeprom.c | 8 ++++---- board/w7o/cmd_vpd.c | 2 +- common/cmd_bedbug.c | 4 ++-- common/cmd_bmp.c | 4 ++-- common/cmd_boot.c | 2 +- common/cmd_bootm.c | 4 ++-- common/cmd_cache.c | 8 ++++---- common/cmd_date.c | 2 +- common/cmd_dcr.c | 8 ++++---- common/cmd_df.c | 2 +- common/cmd_doc.c | 10 +++++----- common/cmd_eeprom.c | 2 +- common/cmd_ext2.c | 4 ++-- common/cmd_fdc.c | 2 +- common/cmd_fdos.c | 2 +- common/cmd_fdt.c | 14 +++++++------- common/cmd_flash.c | 14 +++++++------- common/cmd_fpga.c | 2 +- common/cmd_i2c.c | 24 ++++++++++++------------ common/cmd_ide.c | 10 +++++----- common/cmd_irq.c | 2 +- common/cmd_itest.c | 2 +- common/cmd_jffs2.c | 2 +- common/cmd_load.c | 2 +- common/cmd_log.c | 4 ++-- common/cmd_mem.c | 24 ++++++++++++------------ common/cmd_mfsl.c | 10 +++++----- common/cmd_mii.c | 4 ++-- common/cmd_misc.c | 2 +- common/cmd_mp.c | 8 ++++---- common/cmd_nand.c | 16 ++++++++-------- common/cmd_net.c | 4 ++-- common/cmd_nvedit.c | 6 +++--- common/cmd_onenand.c | 2 +- common/cmd_otp.c | 2 +- common/cmd_pci.c | 2 +- common/cmd_portio.c | 4 ++-- common/cmd_reiser.c | 4 ++-- common/cmd_sata.c | 8 ++++---- common/cmd_scsi.c | 10 +++++----- common/cmd_setexpr.c | 2 +- common/cmd_sf.c | 2 +- common/cmd_strings.c | 2 +- common/cmd_ubi.c | 4 ++-- common/cmd_usb.c | 4 ++-- common/cmd_vfd.c | 2 +- common/command.c | 5 +++++ common/hush.c | 2 +- common/main.c | 4 ++-- cpu/mpc8260/bedbug_603e.c | 4 ++-- cpu/mpc83xx/ecc.c | 4 ++-- cpu/mpc8xx/bedbug_860.c | 4 ++-- cpu/ppc4xx/bedbug_405.c | 4 ++-- drivers/gpio/pca953x.c | 2 +- drivers/misc/ds4510.c | 4 ++-- drivers/qe/qe.c | 4 ++-- include/command.h | 2 ++ tools/updater/cmd_flash.c | 14 +++++++------- 89 files changed, 213 insertions(+), 206 deletions(-)
diff --git a/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c b/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c index d509a8f..753d85b 100644 --- a/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c +++ b/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c @@ -144,7 +144,7 @@ int do_vcimage (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) rcode = 0; break; default: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); rcode = 1; break; } diff --git a/board/ads5121/ads5121_diu.c b/board/ads5121/ads5121_diu.c index 896900b..11e2be7 100644 --- a/board/ads5121/ads5121_diu.c +++ b/board/ads5121/ads5121_diu.c @@ -79,7 +79,7 @@ int ads5121diu_init_show_bmp(cmd_tbl_t *cmdtp, unsigned int addr;
if (argc < 2) { - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/board/amcc/acadia/cmd_acadia.c b/board/amcc/acadia/cmd_acadia.c index 052cf61..9fc03f1 100644 --- a/board/amcc/acadia/cmd_acadia.c +++ b/board/amcc/acadia/cmd_acadia.c @@ -45,7 +45,7 @@ static int do_bootstrap(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int cpu_freq;
if (argc < 3) { - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/board/amcc/canyonlands/bootstrap.c b/board/amcc/canyonlands/bootstrap.c index b1f4a21..35284d1 100644 --- a/board/amcc/canyonlands/bootstrap.c +++ b/board/amcc/canyonlands/bootstrap.c @@ -99,7 +99,7 @@ static int do_bootstrap(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) extern char console_buffer[];
if (argc < 2) { - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/board/amcc/katmai/cmd_katmai.c b/board/amcc/katmai/cmd_katmai.c index ba71bd5..d362655 100644 --- a/board/amcc/katmai/cmd_katmai.c +++ b/board/amcc/katmai/cmd_katmai.c @@ -43,7 +43,7 @@ static int do_bootstrap(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) char pcixClock[4];
if (argc < 3) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/board/amcc/kilauea/cmd_pll.c b/board/amcc/kilauea/cmd_pll.c index 0f571fe..3b49e5b 100644 --- a/board/amcc/kilauea/cmd_pll.c +++ b/board/amcc/kilauea/cmd_pll.c @@ -183,7 +183,7 @@ do_pll_alter (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) char c = '\0'; pll_freq_t pll_freq; if (argc < 2) { - printf("Usage: \n%s\n", cmdtp->usage); + cmd_usage(cmdtp); goto ret; }
@@ -222,8 +222,8 @@ do_pll_alter (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) goto ret;
default: - printf("Invalid options" - "\n\nUsage: \n%s\n", cmdtp->usage); + printf("Invalid options\n\n"); + cmd_usage(cmdtp); goto ret; }
diff --git a/board/amcc/luan/luan.c b/board/amcc/luan/luan.c index de3e3d8..e1357f4 100644 --- a/board/amcc/luan/luan.c +++ b/board/amcc/luan/luan.c @@ -319,7 +319,7 @@ int do_l2cache( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] ) l2cache_status() ? "ON" : "OFF"); return 0; default: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/board/amcc/makalu/cmd_pll.c b/board/amcc/makalu/cmd_pll.c index 0f571fe..3b49e5b 100644 --- a/board/amcc/makalu/cmd_pll.c +++ b/board/amcc/makalu/cmd_pll.c @@ -183,7 +183,7 @@ do_pll_alter (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) char c = '\0'; pll_freq_t pll_freq; if (argc < 2) { - printf("Usage: \n%s\n", cmdtp->usage); + cmd_usage(cmdtp); goto ret; }
@@ -222,8 +222,8 @@ do_pll_alter (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) goto ret;
default: - printf("Invalid options" - "\n\nUsage: \n%s\n", cmdtp->usage); + printf("Invalid options\n\n"); + cmd_usage(cmdtp); goto ret; }
diff --git a/board/amcc/sequoia/cmd_sequoia.c b/board/amcc/sequoia/cmd_sequoia.c index 3402f84..c840748 100644 --- a/board/amcc/sequoia/cmd_sequoia.c +++ b/board/amcc/sequoia/cmd_sequoia.c @@ -128,7 +128,7 @@ static int do_bootstrap(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) extern char console_buffer[];
if (argc < 2) { - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/board/amcc/yucca/cmd_yucca.c b/board/amcc/yucca/cmd_yucca.c index d969860..5198317 100644 --- a/board/amcc/yucca/cmd_yucca.c +++ b/board/amcc/yucca/cmd_yucca.c @@ -59,7 +59,7 @@ static int setBootStrapClock(cmd_tbl_t *cmdtp, int incrflag, int flag, char pcixClock[4];
if (argc < 3) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/board/barco/barco.c b/board/barco/barco.c index ed35572..e3abca4 100644 --- a/board/barco/barco.c +++ b/board/barco/barco.c @@ -292,7 +292,7 @@ int barcobcd_boot_image (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { #if 0 if (argc > 1) { - printf ("Usage:\n (%d) %s\n", argc, cmdtp->usage); + cmd_usage(cmdtp); return 1; } #endif diff --git a/board/esd/common/lcd.c b/board/esd/common/lcd.c index 1eea59e..1db8d90 100644 --- a/board/esd/common/lcd.c +++ b/board/esd/common/lcd.c @@ -346,7 +346,7 @@ int do_esdbmp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) char *str; #endif if (argc != 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/board/esd/dasa_sim/cmd_dasa_sim.c b/board/esd/dasa_sim/cmd_dasa_sim.c index 36dd58c..97a39c9 100644 --- a/board/esd/dasa_sim/cmd_dasa_sim.c +++ b/board/esd/dasa_sim/cmd_dasa_sim.c @@ -220,7 +220,7 @@ int do_pci9054 (cmd_tbl_t * cmdtp, int flag, int argc, return 0; }
- printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1;
} diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c index eb58c7f..988cb94 100644 --- a/board/freescale/common/sys_eeprom.c +++ b/board/freescale/common/sys_eeprom.c @@ -328,7 +328,7 @@ int do_mac(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) prog_eeprom(); break; default: - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); break; }
@@ -362,7 +362,7 @@ int do_mac(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) break; case 'h': /* help */ default: - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); break; }
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c index 08eaf10..2320c0f 100644 --- a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c +++ b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c @@ -116,7 +116,7 @@ int mpc8610diu_init_show_bmp(cmd_tbl_t *cmdtp, unsigned int addr;
if (argc < 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/board/hymod/bsp.c b/board/hymod/bsp.c index 1848bb3..54b3b86 100644 --- a/board/hymod/bsp.c +++ b/board/hymod/bsp.c @@ -272,7 +272,7 @@ do_fpga (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) break; }
- printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } U_BOOT_CMD( @@ -324,7 +324,7 @@ do_eecl (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) /* fall through ... */
default: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/board/lwmon/lwmon.c b/board/lwmon/lwmon.c index 878752c..257f1cd 100644 --- a/board/lwmon/lwmon.c +++ b/board/lwmon/lwmon.c @@ -846,7 +846,7 @@ int do_pic (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) default: break; } - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } U_BOOT_CMD( @@ -976,7 +976,7 @@ int do_lsb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) default: break; } - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/board/lwmon5/lwmon5.c b/board/lwmon5/lwmon5.c index aa62f37..adecad0 100644 --- a/board/lwmon5/lwmon5.c +++ b/board/lwmon5/lwmon5.c @@ -467,7 +467,7 @@ void hw_watchdog_reset(void) int do_eeprom_wp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { if (argc < 2) { - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -476,7 +476,7 @@ int do_eeprom_wp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } else if ((strcmp(argv[1], "off") == 0)) { gpio_write_bit(CONFIG_SYS_GPIO_EEPROM_EXT_WP, 0); } else { - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/board/mpl/common/common_util.c b/board/mpl/common/common_util.c index 877a2d0..d169391 100644 --- a/board/mpl/common/common_util.c +++ b/board/mpl/common/common_util.c @@ -559,7 +559,7 @@ int do_mplcommon(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 0; } #endif - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/board/pcippc2/pcippc2.c b/board/pcippc2/pcippc2.c index a3dbdc8..c706ca5 100644 --- a/board/pcippc2/pcippc2.c +++ b/board/pcippc2/pcippc2.c @@ -230,7 +230,7 @@ int do_wd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) default: break; } - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/board/pcs440ep/pcs440ep.c b/board/pcs440ep/pcs440ep.c index 73a7a08..01ceece 100644 --- a/board/pcs440ep/pcs440ep.c +++ b/board/pcs440ep/pcs440ep.c @@ -780,7 +780,7 @@ int do_sha1 (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
if (argc < 2) { usage: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/board/pn62/cmd_pn62.c b/board/pn62/cmd_pn62.c index 3f53e4b..bb98fcf 100644 --- a/board/pn62/cmd_pn62.c +++ b/board/pn62/cmd_pn62.c @@ -41,7 +41,7 @@ int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) unsigned int number, function;
if (argc != 3) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } number = simple_strtoul(argv[1], NULL, 10); @@ -83,7 +83,7 @@ int do_loadpci (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) addr = simple_strtoul(argv[1], NULL, 16); break; default: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/board/prodrive/pdnb3/pdnb3.c b/board/prodrive/pdnb3/pdnb3.c index 3773ba1..9b87f6a 100644 --- a/board/prodrive/pdnb3/pdnb3.c +++ b/board/prodrive/pdnb3/pdnb3.c @@ -216,7 +216,7 @@ int do_fpga(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) ulong addr;
if (argc < 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/board/renesas/sh7785lcr/rtl8169_mac.c b/board/renesas/sh7785lcr/rtl8169_mac.c index bf0ba14..8b04453 100644 --- a/board/renesas/sh7785lcr/rtl8169_mac.c +++ b/board/renesas/sh7785lcr/rtl8169_mac.c @@ -305,7 +305,7 @@ int do_set_mac(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) char *s, *e;
if (argc != 2) { - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -331,7 +331,7 @@ U_BOOT_CMD( int do_print_mac(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { if (argc != 1) { - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/board/renesas/sh7785lcr/selfcheck.c b/board/renesas/sh7785lcr/selfcheck.c index ce0620f..22079fb 100644 --- a/board/renesas/sh7785lcr/selfcheck.c +++ b/board/renesas/sh7785lcr/selfcheck.c @@ -113,7 +113,7 @@ int do_hw_test(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) char *cmd;
if (argc != 2) { - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -150,7 +150,7 @@ int do_hw_test(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) test_net(); break; default: - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/board/siemens/common/fpga.c b/board/siemens/common/fpga.c index ac0022e..63aa179 100644 --- a/board/siemens/common/fpga.c +++ b/board/siemens/common/fpga.c @@ -286,7 +286,7 @@ int do_fpga (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 0;
failure: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/board/siemens/pcu_e/pcu_e.c b/board/siemens/pcu_e/pcu_e.c index a60c825..25cf2bb 100644 --- a/board/siemens/pcu_e/pcu_e.c +++ b/board/siemens/pcu_e/pcu_e.c @@ -399,7 +399,7 @@ int do_puma (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) default: break; } - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/board/ssv/common/cmd_sled.c b/board/ssv/common/cmd_sled.c index 2208580..cb79698 100644 --- a/board/ssv/common/cmd_sled.c +++ b/board/ssv/common/cmd_sled.c @@ -133,7 +133,7 @@ int do_sled (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) default: break; } - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/board/ssv/common/wd_pio.c b/board/ssv/common/wd_pio.c index 9945c59..8823ed1 100644 --- a/board/ssv/common/wd_pio.c +++ b/board/ssv/common/wd_pio.c @@ -145,7 +145,7 @@ int do_wd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) default: break; } - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/board/tqc/tqm5200/cmd_stk52xx.c b/board/tqc/tqm5200/cmd_stk52xx.c index 5483fca..6ef7fbe 100644 --- a/board/tqc/tqm5200/cmd_stk52xx.c +++ b/board/tqc/tqm5200/cmd_stk52xx.c @@ -327,7 +327,7 @@ static int cmd_sound(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) switch (argc) { case 0: case 1: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; case 2: if (strncmp(argv[1],"saw",3) == 0) { @@ -342,7 +342,7 @@ static int cmd_sound(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return rcode; }
- printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; case 3: if (strncmp(argv[1],"saw",3) == 0) { @@ -358,7 +358,7 @@ static int cmd_sound(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) LEFT_RIGHT); return rcode; } - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; case 4: if (strncmp(argv[1],"saw",3) == 0) { @@ -382,7 +382,7 @@ static int cmd_sound(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) pcm1772_write_reg((uchar)reg, (uchar)val); return 0; } - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; case 5: if (strncmp(argv[1],"saw",3) == 0) { @@ -412,7 +412,7 @@ static int cmd_sound(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) channel); return rcode; } - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } printf ("Usage:\nsound cmd [arg1] [arg2] ...\n"); @@ -513,7 +513,7 @@ static int cmd_beep(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) channel = LEFT_RIGHT; break; default: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/board/trab/cmd_trab.c b/board/trab/cmd_trab.c index daa6aee..5020d60 100644 --- a/board/trab/cmd_trab.c +++ b/board/trab/cmd_trab.c @@ -168,7 +168,7 @@ int do_burn_in (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int cycle_status;
if (argc > 1) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -271,7 +271,7 @@ int do_dip (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int i, dip;
if (argc > 1) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -304,7 +304,7 @@ int do_vcc5v (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int vcc5v;
if (argc > 1) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -332,7 +332,7 @@ int do_contact_temp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int contact_temp;
if (argc > 1) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -355,7 +355,7 @@ U_BOOT_CMD( int do_burn_in_status (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { if (argc > 1) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -851,7 +851,7 @@ int do_temp_log (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) #endif
if (argc > 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/board/trizepsiv/eeprom.c b/board/trizepsiv/eeprom.c index 7a2b905..e11519a 100644 --- a/board/trizepsiv/eeprom.c +++ b/board/trizepsiv/eeprom.c @@ -43,7 +43,7 @@ static int do_write_dm9000_eeprom ( cmd_tbl_t *cmdtp, int flag, int argc, char * int offset,value;
if (argc < 4) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -51,7 +51,7 @@ static int do_write_dm9000_eeprom ( cmd_tbl_t *cmdtp, int flag, int argc, char * value=simple_strtoul(argv[3],NULL,16); if (offset > 0x40) { printf("Wrong offset : 0x%x\n",offset); - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } write_srom_word(offset, value); @@ -60,7 +60,7 @@ static int do_write_dm9000_eeprom ( cmd_tbl_t *cmdtp, int flag, int argc, char *
int do_dm9000_eeprom ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { if (argc < 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -69,7 +69,7 @@ int do_dm9000_eeprom ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { } else if (strcmp (argv[1],"write") == 0) { return (do_write_dm9000_eeprom(cmdtp,flag,argc,argv)); } else { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } } diff --git a/board/w7o/cmd_vpd.c b/board/w7o/cmd_vpd.c index 310fde0..5202521 100644 --- a/board/w7o/cmd_vpd.c +++ b/board/w7o/cmd_vpd.c @@ -39,7 +39,7 @@ int do_vpd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
/* Validate usage */ if (argc > 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/common/cmd_bedbug.c b/common/cmd_bedbug.c index e6277c9..1dda193 100644 --- a/common/cmd_bedbug.c +++ b/common/cmd_bedbug.c @@ -85,7 +85,7 @@ int do_bedbug_dis (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) len = dis_last_len;
if (argc < 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -126,7 +126,7 @@ int do_bedbug_asm (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) int rcode = 0;
if (argc < 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c index bc08b26..e60f18b 100644 --- a/common/cmd_bmp.c +++ b/common/cmd_bmp.c @@ -120,7 +120,7 @@ int do_bmp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) y = simple_strtoul(argv[4], NULL, 10); break; default: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -132,7 +132,7 @@ int do_bmp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } else if (strncmp(argv[1],"display",1) == 0) { return (bmp_display(addr, x, y)); } else { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } } diff --git a/common/cmd_boot.c b/common/cmd_boot.c index 6024ffe..36106c7 100644 --- a/common/cmd_boot.c +++ b/common/cmd_boot.c @@ -41,7 +41,7 @@ int do_go (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int rcode = 0;
if (argc < 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index a8f85e9..3466e72 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -454,13 +454,13 @@ int do_bootm_subcommand (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } /* Unrecognized command */ else { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
if (images.state >= state) { printf ("Trying to execute a command out of order\n"); - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/common/cmd_cache.c b/common/cmd_cache.c index 675d43f..caa56da 100644 --- a/common/cmd_cache.c +++ b/common/cmd_cache.c @@ -37,7 +37,7 @@ int do_icache ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) case 2: /* on / off */ switch (on_off(argv[1])) { #if 0 /* prevented by varargs handling; FALLTROUGH is harmless, too */ - default: printf ("Usage:\n%s\n", cmdtp->usage); + default: cmd_usage(cmdtp); return; #endif case 0: icache_disable(); @@ -51,7 +51,7 @@ int do_icache ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) icache_status() ? "ON" : "OFF"); return 0; default: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } return 0; @@ -63,7 +63,7 @@ int do_dcache ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) case 2: /* on / off */ switch (on_off(argv[1])) { #if 0 /* prevented by varargs handling; FALLTROUGH is harmless, too */ - default: printf ("Usage:\n%s\n", cmdtp->usage); + default: cmd_usage(cmdtp); return; #endif case 0: dcache_disable(); @@ -77,7 +77,7 @@ int do_dcache ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) dcache_status() ? "ON" : "OFF"); return 0; default: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } return 0; diff --git a/common/cmd_date.c b/common/cmd_date.c index b4d9649..d6bd931 100644 --- a/common/cmd_date.c +++ b/common/cmd_date.c @@ -89,7 +89,7 @@ int do_date (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
break; default: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); rcode = 1; }
diff --git a/common/cmd_dcr.c b/common/cmd_dcr.c index 439d07a..7d382bb 100644 --- a/common/cmd_dcr.c +++ b/common/cmd_dcr.c @@ -45,7 +45,7 @@ int do_getdcr ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] )
/* Validate arguments */ if (argc < 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -74,7 +74,7 @@ int do_setdcr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
/* Validate arguments */ if (argc < 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -121,7 +121,7 @@ int do_getidcr (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
/* Validate arguments */ if (argc < 3) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -177,7 +177,7 @@ int do_setidcr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
/* Validate arguments */ if (argc < 4) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/common/cmd_df.c b/common/cmd_df.c index 5f65044..c85b7a6 100644 --- a/common/cmd_df.c +++ b/common/cmd_df.c @@ -27,7 +27,7 @@ static int do_df(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) }
usage: - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/common/cmd_doc.c b/common/cmd_doc.c index 02502cc..f139d42 100644 --- a/common/cmd_doc.c +++ b/common/cmd_doc.c @@ -96,7 +96,7 @@ int do_doc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) switch (argc) { case 0: case 1: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; case 2: if (strcmp(argv[1],"info") == 0) { @@ -121,7 +121,7 @@ int do_doc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) doc_print(&doc_dev_desc[curr_device]); return 0; } - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; case 3: if (strcmp(argv[1],"device") == 0) { @@ -146,7 +146,7 @@ int do_doc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 0; }
- printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; default: /* at least 4 args */ @@ -182,7 +182,7 @@ int do_doc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
return ret; } else { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); rcode = 1; }
@@ -235,7 +235,7 @@ int do_docboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) offset = simple_strtoul(argv[3], NULL, 16); break; default: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); show_boot_progress (-35); return 1; } diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c index 2451bef..c59227d 100644 --- a/common/cmd_eeprom.c +++ b/common/cmd_eeprom.c @@ -104,7 +104,7 @@ int do_eeprom ( cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) } }
- printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } #endif diff --git a/common/cmd_ext2.c b/common/cmd_ext2.c index 9c43792..05a053b 100644 --- a/common/cmd_ext2.c +++ b/common/cmd_ext2.c @@ -66,7 +66,7 @@ int do_ext2ls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int part_length;
if (argc < 3) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return(1); } dev = (int)simple_strtoul (argv[2], &ep, 16); @@ -164,7 +164,7 @@ int do_ext2load (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) break;
default: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return(1); }
diff --git a/common/cmd_fdc.c b/common/cmd_fdc.c index d995ff2..c6265c3 100644 --- a/common/cmd_fdc.c +++ b/common/cmd_fdc.c @@ -801,7 +801,7 @@ int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) boot_drive=simple_strtoul(argv[2], NULL, 10); break; default: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } /* setup FDC and scan for drives */ diff --git a/common/cmd_fdos.c b/common/cmd_fdos.c index aa13b52..514c049 100644 --- a/common/cmd_fdos.c +++ b/common/cmd_fdos.c @@ -73,7 +73,7 @@ int do_fdosboot(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) name = argv [2]; break; default: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); break; }
diff --git a/common/cmd_fdt.c b/common/cmd_fdt.c index 4274a77..a36ca20 100644 --- a/common/cmd_fdt.c +++ b/common/cmd_fdt.c @@ -66,7 +66,7 @@ void set_working_fdt_addr(void *addr) int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) { if (argc < 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -125,7 +125,7 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) int err;
if (argc < 4) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -179,7 +179,7 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) * Parameters: Node path, new node to be appended to the path. */ if (argc < 4) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -217,7 +217,7 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) * Parameters: Node path, property, optional value. */ if (argc < 4) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -427,7 +427,7 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) } } else { /* Unrecognized command */ - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } } @@ -441,7 +441,7 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) unsigned long initrd_start = 0, initrd_end = 0;
if ((argc != 2) && (argc != 4)) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -459,7 +459,7 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) } else { /* Unrecognized command */ - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/common/cmd_flash.c b/common/cmd_flash.c index 93eefa9..2df40f0 100644 --- a/common/cmd_flash.c +++ b/common/cmd_flash.c @@ -333,7 +333,7 @@ int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int rcode = 0;
if (argc < 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -384,7 +384,7 @@ int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) #endif
if (argc != 3) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -407,7 +407,7 @@ int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) }
if (addr_first >= addr_last) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -481,7 +481,7 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) #endif
if (argc < 3) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -490,7 +490,7 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } else if (strcmp(argv[1], "on") == 0) { p = 1; } else { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -591,7 +591,7 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) #endif
if (argc != 4) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -633,7 +633,7 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) }
if (addr_first >= addr_last) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } rcode = flash_sect_protect (p, addr_first, addr_last); diff --git a/common/cmd_fpga.c b/common/cmd_fpga.c index dcbbc99..4abb86e 100644 --- a/common/cmd_fpga.c +++ b/common/cmd_fpga.c @@ -320,7 +320,7 @@ int do_fpga (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
static void fpga_usage (cmd_tbl_t * cmdtp) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); }
/* diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c index 448f2fe..170ebc7 100644 --- a/common/cmd_i2c.c +++ b/common/cmd_i2c.c @@ -159,7 +159,7 @@ int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) length = i2c_dp_last_length;
if (argc < 3) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -184,7 +184,7 @@ int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) if (argv[2][j] == '.') { alen = argv[2][j+1] - '0'; if (alen > 4) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } break; @@ -269,7 +269,7 @@ int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int j;
if ((argc < 4) || (argc > 5)) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -287,7 +287,7 @@ int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) if (argv[2][j] == '.') { alen = argv[2][j+1] - '0'; if (alen > 4) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } break; @@ -355,7 +355,7 @@ int do_i2c_crc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int j;
if (argc < 4) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -373,7 +373,7 @@ int do_i2c_crc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) if (argv[2][j] == '.') { alen = argv[2][j+1] - '0'; if (alen > 4) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } break; @@ -427,7 +427,7 @@ mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char *argv[]) extern char console_buffer[];
if (argc != 3) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -463,7 +463,7 @@ mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char *argv[]) if (argv[2][j] == '.') { alen = argv[2][j+1] - '0'; if (alen > 4) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } break; @@ -601,7 +601,7 @@ int do_i2c_loop(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int j;
if (argc < 3) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -619,7 +619,7 @@ int do_i2c_loop(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) if (argv[2][j] == '.') { alen = argv[2][j+1] - '0'; if (alen > 4) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } break; @@ -764,7 +764,7 @@ int do_sdram (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) };
if (argc < 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } /* @@ -1293,7 +1293,7 @@ int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) return do_sdram(cmdtp, flag, --argc, ++argv); #endif else - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 0; } #endif /* CONFIG_I2C_CMD_TREE */ diff --git a/common/cmd_ide.c b/common/cmd_ide.c index db05f76..3afa38d 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -188,7 +188,7 @@ int do_ide (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) switch (argc) { case 0: case 1: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; case 2: if (strncmp(argv[1],"res",3) == 0) { @@ -238,7 +238,7 @@ int do_ide (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } return rcode; } - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; case 3: if (strncmp(argv[1],"dev",3) == 0) { @@ -287,7 +287,7 @@ int do_ide (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) #endif }
- printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; default: /* at least 4 args */ @@ -347,7 +347,7 @@ int do_ide (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 1; } } else { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); rcode = 1; }
@@ -383,7 +383,7 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) boot_device = argv[2]; break; default: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); show_boot_progress (-42); return 1; } diff --git a/common/cmd_irq.c b/common/cmd_irq.c index 04914c6..a47cde4 100644 --- a/common/cmd_irq.c +++ b/common/cmd_irq.c @@ -28,7 +28,7 @@ int do_interrupts(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) {
if (argc != 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/common/cmd_itest.c b/common/cmd_itest.c index 9e77fa9..b3025e3 100644 --- a/common/cmd_itest.c +++ b/common/cmd_itest.c @@ -161,7 +161,7 @@ int do_itest ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] )
/* Validate arguments */ if ((argc != 4)){ - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c index 7866c80..cd4d24b 100644 --- a/common/cmd_jffs2.c +++ b/common/cmd_jffs2.c @@ -2197,7 +2197,7 @@ int do_jffs2_mtdparts(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return delete_partition(argv[2]); }
- printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } #endif /* #ifdef CONFIG_JFFS2_CMDLINE */ diff --git a/common/cmd_load.c b/common/cmd_load.c index 65a4d69..350d7a3 100644 --- a/common/cmd_load.c +++ b/common/cmd_load.c @@ -1119,7 +1119,7 @@ int do_hwflow (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) if (strcmp(argv[1], "on") == 0) hwflow_onoff(1); else - printf("Usage: %s\n", cmdtp->usage); + cmd_usage(cmdtp); } printf("RTS/CTS hardware flow control: %s\n", hwflow_onoff(0) ? "on" : "off"); return 0; diff --git a/common/cmd_log.c b/common/cmd_log.c index febdb90..6f8a27f 100644 --- a/common/cmd_log.c +++ b/common/cmd_log.c @@ -241,11 +241,11 @@ int do_log (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } return 0; } - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1;
default: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } } diff --git a/common/cmd_mem.c b/common/cmd_mem.c index 400cfd7..67bbf8d 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -77,7 +77,7 @@ int do_mem_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) length = dp_last_length;
if (argc < 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -173,7 +173,7 @@ int do_mem_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int size;
if ((argc < 3) || (argc > 4)) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -217,7 +217,7 @@ int do_mem_mdc ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) ulong count;
if (argc < 4) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -246,7 +246,7 @@ int do_mem_mwc ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) ulong count;
if (argc < 4) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -277,7 +277,7 @@ int do_mem_cmp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int rcode = 0;
if (argc != 4) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -361,7 +361,7 @@ int do_mem_cp ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int size;
if (argc != 4) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -525,7 +525,7 @@ int do_mem_loop (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) volatile u_char *cp;
if (argc < 3) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -596,7 +596,7 @@ int do_mem_loopw (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) volatile u_char *cp;
if (argc < 4) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -984,7 +984,7 @@ mod_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char *argv[]) extern char console_buffer[];
if (argc != 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -1089,7 +1089,7 @@ int do_mem_crc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) ulong *ptr;
if (argc < 3) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -1125,7 +1125,7 @@ int do_mem_crc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
if (argc < 3) { usage: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -1185,7 +1185,7 @@ int do_unzip ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) dst = simple_strtoul(argv[2], NULL, 16); break; default: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/common/cmd_mfsl.c b/common/cmd_mfsl.c index c2442ee..db2a994 100644 --- a/common/cmd_mfsl.c +++ b/common/cmd_mfsl.c @@ -38,7 +38,7 @@ int do_frd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) unsigned int blocking;
if (argc < 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -46,7 +46,7 @@ int do_frd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) blocking = (unsigned int)simple_strtoul (argv[2], NULL, 16); if (fslnum < 0 || fslnum >= XILINX_FSL_NUMBER) { puts ("Bad number of FSL\n"); - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -196,7 +196,7 @@ int do_fwr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) unsigned int blocking;
if (argc < 3) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -204,7 +204,7 @@ int do_fwr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) num = (unsigned int)simple_strtoul (argv[2], NULL, 16); blocking = (unsigned int)simple_strtoul (argv[3], NULL, 16); if (fslnum < 0 || fslnum >= XILINX_FSL_NUMBER) { - printf ("Bad number of FSL\nUsage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -354,7 +354,7 @@ int do_rspr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) unsigned int val = 0;
if (argc < 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } reg = (unsigned int)simple_strtoul (argv[1], NULL, 16); diff --git a/common/cmd_mii.c b/common/cmd_mii.c index bcbd7aa..19a7fbd 100644 --- a/common/cmd_mii.c +++ b/common/cmd_mii.c @@ -302,7 +302,7 @@ int do_mii (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) char *devname;
if (argc < 2) { - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -431,7 +431,7 @@ int do_mii (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) else miiphy_set_current_dev (argv[2]); } else { - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/common/cmd_misc.c b/common/cmd_misc.c index 3ea8ee0..c29f52b 100644 --- a/common/cmd_misc.c +++ b/common/cmd_misc.c @@ -33,7 +33,7 @@ int do_sleep (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) ulong delay;
if (argc != 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/common/cmd_mp.c b/common/cmd_mp.c index f3a7f49..d8e3ab2 100644 --- a/common/cmd_mp.c +++ b/common/cmd_mp.c @@ -29,7 +29,7 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) unsigned long cpuid;
if (argc < 3) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -47,7 +47,7 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } else if (strncmp(argv[2], "status", 6) == 0) { cpu_status(cpuid); } else { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } return 0; @@ -55,12 +55,12 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
/* 4 or greater, make sure its release */ if (strncmp(argv[2], "release", 7) != 0) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
if (cpu_release(cpuid, argc - 3, argv + 3)) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/common/cmd_nand.c b/common/cmd_nand.c index 0a366d3..a2a2202 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -464,7 +464,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) }
usage: - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -636,7 +636,7 @@ int do_nandboot(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) #if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE) usage: #endif - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); show_boot_progress(-53); return 1; } @@ -749,7 +749,7 @@ int do_nand (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) switch (argc) { case 0: case 1: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; case 2: if (strcmp (argv[1], "info") == 0) { @@ -787,7 +787,7 @@ int do_nand (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) return 0;
} - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; case 3: if (strcmp (argv[1], "device") == 0) { @@ -826,7 +826,7 @@ int do_nand (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) return ret; }
- printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; default: /* at least 4 args */ @@ -876,7 +876,7 @@ int do_nand (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) } #endif /* CONFIG_SYS_NAND_SKIP_BAD_DOT_I */ else if (cmdtail) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -912,7 +912,7 @@ int do_nand (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
return ret; } else { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); rcode = 1; }
@@ -969,7 +969,7 @@ int do_nandboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) offset = simple_strtoul(argv[3], NULL, 16); break; default: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); show_boot_progress (-53); return 1; } diff --git a/common/cmd_net.c b/common/cmd_net.c index c053d7b..b627c38 100644 --- a/common/cmd_net.c +++ b/common/cmd_net.c @@ -186,7 +186,7 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
break;
- default: printf ("Usage:\n%s\n", cmdtp->usage); + default: cmd_usage(cmdtp); show_boot_progress (-80); return 1; } @@ -251,7 +251,7 @@ int do_ping (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
NetPingIP = string_to_ip(argv[1]); if (NetPingIP == 0) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return -1; }
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 85025da..abcc914 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -408,7 +408,7 @@ void forceenv (char *varname, char *varvalue) int do_setenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { if (argc < 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -434,13 +434,13 @@ int do_askenv ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) local_args[3] = NULL;
if (argc < 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } /* Check the syntax */ switch (argc) { case 1: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1;
case 2: /* askenv envname */ diff --git a/common/cmd_onenand.c b/common/cmd_onenand.c index 8d87b78..b0f6fee 100644 --- a/common/cmd_onenand.c +++ b/common/cmd_onenand.c @@ -28,7 +28,7 @@ int do_onenand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) switch (argc) { case 0: case 1: - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1;
case 2: diff --git a/common/cmd_otp.c b/common/cmd_otp.c index 825fa34..bdf2e6a 100644 --- a/common/cmd_otp.c +++ b/common/cmd_otp.c @@ -57,7 +57,7 @@ int do_otp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) otp_func = otp_write; else { usage: - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/common/cmd_pci.c b/common/cmd_pci.c index 67ff2fb..110415e 100644 --- a/common/cmd_pci.c +++ b/common/cmd_pci.c @@ -534,7 +534,7 @@ int do_pci (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
return 1; usage: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/common/cmd_portio.c b/common/cmd_portio.c index c88fcd5..b318ff0 100644 --- a/common/cmd_portio.c +++ b/common/cmd_portio.c @@ -44,7 +44,7 @@ int do_portio_out (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) uint value = out_last_value;
if (argc != 3) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -103,7 +103,7 @@ int do_portio_in (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) uint size = in_last_size;
if (argc != 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/common/cmd_reiser.c b/common/cmd_reiser.c index 4f4117e..a2f2286 100644 --- a/common/cmd_reiser.c +++ b/common/cmd_reiser.c @@ -57,7 +57,7 @@ int do_reiserls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int part_length;
if (argc < 3) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } dev = (int)simple_strtoul (argv[2], &ep, 16); @@ -150,7 +150,7 @@ int do_reiserload (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) break;
default: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/common/cmd_sata.c b/common/cmd_sata.c index dd6f1d9..2d976df 100644 --- a/common/cmd_sata.c +++ b/common/cmd_sata.c @@ -68,7 +68,7 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) switch (argc) { case 0: case 1: - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; case 2: if (strncmp(argv[1],"inf", 3) == 0) { @@ -106,7 +106,7 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } return rc; } - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; case 3: if (strncmp(argv[1], "dev", 3) == 0) { @@ -138,7 +138,7 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } return rc; } - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1;
default: /* at least 4 args */ @@ -175,7 +175,7 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) n, (n == cnt) ? "OK" : "ERROR"); return (n == cnt) ? 0 : 1; } else { - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); rc = 1; }
diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c index 066fd80..8aae9fc 100644 --- a/common/cmd_scsi.c +++ b/common/cmd_scsi.c @@ -229,7 +229,7 @@ int do_scsiboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) boot_device = argv[2]; break; default: - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -346,7 +346,7 @@ int do_scsi (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { switch (argc) { case 0: - case 1: printf ("Usage:\n%s\n", cmdtp->usage); return 1; + case 1: cmd_usage(cmdtp); return 1; case 2: if (strncmp(argv[1],"res",3) == 0) { printf("\nReset SCSI\n"); @@ -392,7 +392,7 @@ int do_scsi (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) printf("\nno SCSI devices available\n"); return 1; } - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; case 3: if (strncmp(argv[1],"dev",3) == 0) { @@ -421,7 +421,7 @@ int do_scsi (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } return 1; } - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; default: /* at least 4 args */ @@ -437,7 +437,7 @@ int do_scsi (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 0; } } /* switch */ - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/common/cmd_setexpr.c b/common/cmd_setexpr.c index 2e49b6d..4125b18 100644 --- a/common/cmd_setexpr.c +++ b/common/cmd_setexpr.c @@ -35,7 +35,7 @@ int do_setexpr(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
/* Validate arguments */ if ((argc != 5) || (strlen(argv[3]) != 1)) { - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/common/cmd_sf.c b/common/cmd_sf.c index 8c0a751..6dc522d 100644 --- a/common/cmd_sf.c +++ b/common/cmd_sf.c @@ -175,7 +175,7 @@ static int do_spi_flash(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return do_spi_flash_erase(argc - 1, argv + 1);
usage: - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/common/cmd_strings.c b/common/cmd_strings.c index 7d05cf8..6f0cbca 100644 --- a/common/cmd_strings.c +++ b/common/cmd_strings.c @@ -15,7 +15,7 @@ static char *start_addr, *last_addr; int do_strings(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { if (argc == 1) { - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/common/cmd_ubi.c b/common/cmd_ubi.c index 5c31f7b..305e2e1 100644 --- a/common/cmd_ubi.c +++ b/common/cmd_ubi.c @@ -441,7 +441,7 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) int err = 0;
if (argc < 2) { - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -459,7 +459,7 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) }
if (argc < 4) { - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/common/cmd_usb.c b/common/cmd_usb.c index 8b19240..46d6eea 100644 --- a/common/cmd_usb.c +++ b/common/cmd_usb.c @@ -366,7 +366,7 @@ int do_usbboot(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) boot_device = argv[2]; break; default: - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -659,7 +659,7 @@ int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 0; } #endif /* CONFIG_USB_STORAGE */ - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/common/cmd_vfd.c b/common/cmd_vfd.c index 45f4271..ef4dd83 100644 --- a/common/cmd_vfd.c +++ b/common/cmd_vfd.c @@ -50,7 +50,7 @@ int do_vfd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) ulong bitmap;
if (argc != 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/common/command.c b/common/command.c index a4a978c..c396648 100644 --- a/common/command.c +++ b/common/command.c @@ -379,6 +379,11 @@ cmd_tbl_t *find_cmd (const char *cmd) return find_cmd_tbl(cmd, &__u_boot_cmd_start, len); }
+void cmd_usage(cmd_tbl_t *cmdtp) +{ + printf("Usage:\n%s\n", cmdtp->usage); +} + #ifdef CONFIG_AUTO_COMPLETE
int var_complete(int argc, char *argv[], char last_char, int maxv, char *cmdv[]) diff --git a/common/hush.c b/common/hush.c index 9aef6e4..dbb4035 100644 --- a/common/hush.c +++ b/common/hush.c @@ -1696,7 +1696,7 @@ static int run_pipe_real(struct pipe *pi) #endif /* found - check max args */ if ((child->argc - i) > cmdtp->maxargs) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return -1; } #endif diff --git a/common/main.c b/common/main.c index a999a5d..3f8e1d6 100644 --- a/common/main.c +++ b/common/main.c @@ -1370,7 +1370,7 @@ int run_command (const char *cmd, int flag)
/* found - check max args */ if (argc > cmdtp->maxargs) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); rc = -1; continue; } @@ -1414,7 +1414,7 @@ int do_run (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) int i;
if (argc < 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/cpu/mpc8260/bedbug_603e.c b/cpu/mpc8260/bedbug_603e.c index f1be485..c969ff6 100644 --- a/cpu/mpc8260/bedbug_603e.c +++ b/cpu/mpc8260/bedbug_603e.c @@ -72,7 +72,7 @@ void bedbug603e_do_break (cmd_tbl_t *cmdtp, int flag, int argc,
if (argc < 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return; }
@@ -119,7 +119,7 @@ void bedbug603e_do_break (cmd_tbl_t *cmdtp, int flag, int argc, (( argv[ 1 ][ 0 ] >= 'a' ) && ( argv[ 1 ][ 0 ] <= 'f' )) || (( argv[ 1 ][ 0 ] >= 'A' ) && ( argv[ 1 ][ 0 ] <= 'F' )))) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return; }
diff --git a/cpu/mpc83xx/ecc.c b/cpu/mpc83xx/ecc.c index 5ab169f..47c8937 100644 --- a/cpu/mpc83xx/ecc.c +++ b/cpu/mpc83xx/ecc.c @@ -119,7 +119,7 @@ int do_ecc(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) writeback[1] = 0x89abcdefUL;
if (argc > 4) { - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -350,7 +350,7 @@ int do_ecc(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) return 0; } } - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/cpu/mpc8xx/bedbug_860.c b/cpu/mpc8xx/bedbug_860.c index 5d52366..0308bbb 100644 --- a/cpu/mpc8xx/bedbug_860.c +++ b/cpu/mpc8xx/bedbug_860.c @@ -71,7 +71,7 @@ void bedbug860_do_break (cmd_tbl_t *cmdtp, int flag, int argc,
if (argc < 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return; }
@@ -122,7 +122,7 @@ void bedbug860_do_break (cmd_tbl_t *cmdtp, int flag, int argc,
if( !isdigit( argv[ 1 ][ 0 ])) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return; }
diff --git a/cpu/ppc4xx/bedbug_405.c b/cpu/ppc4xx/bedbug_405.c index 5ef5607..ef11cb6 100644 --- a/cpu/ppc4xx/bedbug_405.c +++ b/cpu/ppc4xx/bedbug_405.c @@ -71,7 +71,7 @@ void bedbug405_do_break (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) /* -------------------------------------------------- */
if (argc < 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return; }
@@ -125,7 +125,7 @@ void bedbug405_do_break (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) /* Set a breakpoint at the address */
if (!isdigit (argv[1][0])) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return; }
diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c index 390d99a..f80baeb 100644 --- a/drivers/gpio/pca953x.c +++ b/drivers/gpio/pca953x.c @@ -164,7 +164,7 @@ int do_pca953x(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) if (!c || !((argc == (c->maxargs)) || (((int)c->cmd == PCA953X_CMD_DEVICE) && (argc == (c->maxargs - 1))))) { - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c index 4cd2fc2..958ff68 100644 --- a/drivers/misc/ds4510.c +++ b/drivers/misc/ds4510.c @@ -294,7 +294,7 @@ int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) if (!c || !((argc == (c->maxargs)) || (((int)c->cmd == DS4510_CMD_DEVICE) && (argc == (c->maxargs - 1))))) { - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -371,7 +371,7 @@ int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } else if (strcmp(argv[2], "write") == 0) { rw_func = ds4510_mem_write; } else { - printf("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c index e914d01..7b29fd7 100644 --- a/drivers/qe/qe.c +++ b/drivers/qe/qe.c @@ -425,7 +425,7 @@ static int qe_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) ulong addr;
if (argc < 3) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -455,7 +455,7 @@ static int qe_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return qe_upload_firmware((const struct qe_firmware *) addr); }
- printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/include/command.h b/include/command.h index a8a153c..58992e9 100644 --- a/include/command.h +++ b/include/command.h @@ -64,6 +64,8 @@ extern cmd_tbl_t __u_boot_cmd_end; cmd_tbl_t *find_cmd(const char *cmd); cmd_tbl_t *find_cmd_tbl (const char *cmd, cmd_tbl_t *table, int table_len);
+extern void cmd_usage(cmd_tbl_t *cmdtp); + #ifdef CONFIG_AUTO_COMPLETE extern void install_auto_complete(void); extern int cmd_auto_complete(const char *const prompt, char *buf, int *np, int *colp); diff --git a/tools/updater/cmd_flash.c b/tools/updater/cmd_flash.c index 5ff7336..5ce45ba 100644 --- a/tools/updater/cmd_flash.c +++ b/tools/updater/cmd_flash.c @@ -122,7 +122,7 @@ int do_flerase(cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[]) int rcode = 0;
if (argc < 2) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -147,7 +147,7 @@ int do_flerase(cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[]) }
if (argc != 3) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -168,7 +168,7 @@ int do_flerase(cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[]) addr_last = simple_strtoul(argv[2], NULL, 16);
if (addr_first >= addr_last) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -244,7 +244,7 @@ int do_protect(cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[]) int rcode = 0;
if (argc < 3) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -253,7 +253,7 @@ int do_protect(cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[]) else if (strcmp(argv[1], "on") == 0) p = 1; else { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -310,7 +310,7 @@ int do_protect(cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[]) }
if (argc != 4) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
@@ -350,7 +350,7 @@ int do_protect(cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[]) addr_last = simple_strtoul(argv[3], NULL, 16);
if (addr_first >= addr_last) { - printf ("Usage:\n%s\n", cmdtp->usage); + cmd_usage(cmdtp); return 1; } rcode = flash_sect_protect (p, addr_first, addr_last);

Update taihu and taishan commands to use cmd_usage() function to display usage messages.
Signed-off-by: Peter Tyser ptyser@xes-inc.com --- board/amcc/taihu/lcd.c | 6 +++--- board/amcc/taihu/taihu.c | 6 +++--- board/amcc/taishan/lcd.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/board/amcc/taihu/lcd.c b/board/amcc/taihu/lcd.c index 3d042df..7cc094a 100644 --- a/board/amcc/taihu/lcd.c +++ b/board/amcc/taihu/lcd.c @@ -140,7 +140,7 @@ static int do_lcd_clear (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) static int do_lcd_puts (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) { if (argc < 2) { - printf("%s", cmdtp->usage); + cmd_usage(cmdtp); return 1; } lcd_puts(argv[1]); @@ -151,7 +151,7 @@ static int do_lcd_puts (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) static int do_lcd_putc (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) { if (argc < 2) { - printf("%s", cmdtp->usage); + cmd_usage(cmdtp); return 1; } lcd_putc((char)argv[1][0]); @@ -166,7 +166,7 @@ static int do_lcd_cur (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) char cur_addr;
if (argc < 3) { - printf("%s", cmdtp->usage); + cmd_usage(cmdtp); return 1; }
diff --git a/board/amcc/taihu/taihu.c b/board/amcc/taihu/taihu.c index 6e9330f..a98c186 100644 --- a/board/amcc/taihu/taihu.c +++ b/board/amcc/taihu/taihu.c @@ -102,13 +102,13 @@ static int do_led_ctl(cmd_tbl_t* cmd_tp, int flags, int argc, char *argv[]) int led_no;
if (argc != 3) { - printf("%s", cmd_tp->usage); + cmd_usage(cmd_tp); return -1; }
led_no = simple_strtoul(argv[1], NULL, 16); if (led_no != 1 && led_no != 2) { - printf("%s", cmd_tp->usage); + cmd_usage(cmd_tp); return -1; }
@@ -123,7 +123,7 @@ static int do_led_ctl(cmd_tbl_t* cmd_tp, int flags, int argc, char *argv[]) else gpio_write_bit(31, 0); } else { - printf("%s", cmd_tp->usage); + cmd_usage(cmd_tp); return -1; }
diff --git a/board/amcc/taishan/lcd.c b/board/amcc/taishan/lcd.c index 624ae40..4e14bbc 100644 --- a/board/amcc/taishan/lcd.c +++ b/board/amcc/taishan/lcd.c @@ -167,7 +167,7 @@ static int do_lcd_clear(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) static int do_lcd_puts(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) { if (argc < 2) { - printf("%s", cmdtp->usage); + cmd_usage(cmdtp); return 1; } lcd_puts(argv[1]); @@ -176,7 +176,7 @@ static int do_lcd_puts(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) static int do_lcd_putc(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) { if (argc < 2) { - printf("%s", cmdtp->usage); + cmd_usage(cmdtp); return 1; } lcd_putc((char)argv[1][0]); @@ -189,7 +189,7 @@ static int do_lcd_cur(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) char cur_addr;
if (argc < 3) { - printf("%s", cmdtp->usage); + cmd_usage(cmdtp); return 1; }

Remove command name from all command "usage" fields and update common/command.c to display "name - usage" instead of just "usage". Also remove newlines from command usage fields.
Signed-off-by: Peter Tyser ptyser@xes-inc.com --- Note: Only 1 line of diff context used to reduce patch size to < 100KB to allow posting to mailing list.
README | 3 ++ board/BuS/EB+MCF-EV123/EB+MCF-EV123.c | 2 +- board/MAI/AmigaOneG3SE/cmd_boota.c | 2 +- board/MAI/menu/cmd_menu.c | 2 +- board/ads5121/ads5121_diu.c | 2 +- board/amcc/acadia/cmd_acadia.c | 2 +- board/amcc/canyonlands/bootstrap.c | 2 +- board/amcc/katmai/cmd_katmai.c | 2 +- board/amcc/kilauea/cmd_pll.c | 2 +- board/amcc/luan/luan.c | 2 +- board/amcc/makalu/cmd_pll.c | 2 +- board/amcc/sequoia/cmd_sequoia.c | 2 +- board/amcc/taihu/lcd.c | 8 +++--- board/amcc/taihu/taihu.c | 4 +- board/amcc/taihu/update.c | 2 +- board/amcc/taishan/lcd.c | 14 +++++----- board/amcc/taishan/showinfo.c | 6 ++-- board/amcc/taishan/update.c | 2 +- board/amcc/yucca/cmd_yucca.c | 2 +- board/amirix/ap1000/ap1000.c | 10 +++--- board/amirix/ap1000/powerspan.c | 2 +- board/barco/barco.c | 6 ++-- board/bc3450/cmd_bc3450.c | 10 +++--- board/bf537-stamp/cmd_bf537led.c | 2 +- board/cm5200/cmd_cm5200.c | 2 +- board/delta/delta.c | 2 +- board/esd/ar405/ar405.c | 6 ++-- board/esd/cms700/cms700.c | 2 +- board/esd/common/auto_update.c | 2 +- board/esd/common/cmd_loadpci.c | 2 +- board/esd/common/lcd.c | 2 +- board/esd/common/xilinx_jtag/micro.c | 2 +- board/esd/cpci2dp/cpci2dp.c | 2 +- board/esd/cpci405/cpci405.c | 6 ++-- board/esd/cpci5200/cpci5200.c | 2 +- board/esd/cpci750/cpci750.c | 2 +- board/esd/dasa_sim/cmd_dasa_sim.c | 2 +- board/esd/du440/du440.c | 16 ++++++------ board/esd/hh405/hh405.c | 2 +- board/esd/ocrtc/cmd_ocrtc.c | 4 +- board/esd/pci405/cmd_pci405.c | 2 +- board/esd/pci405/pci405.c | 2 +- board/esd/pf5200/pf5200.c | 6 ++-- board/esd/plu405/plu405.c | 2 +- board/esd/pmc405/pmc405.c | 2 +- board/esd/pmc440/cmd_pmc440.c | 18 ++++++------ board/esd/tasreg/tasreg.c | 12 ++++---- board/esd/voh405/voh405.c | 2 +- board/evb64260/zuma_pbb.c | 6 ++-- board/freescale/common/pixis.c | 4 +- board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c | 2 +- board/g2000/g2000.c | 6 ++-- board/hymod/bsp.c | 4 +- board/keymile/common/keymile_hdlc_enet.c | 4 +- board/lwmon/lwmon.c | 6 ++-- board/lwmon5/kbd.c | 2 +- board/lwmon5/lwmon5.c | 2 +- board/mpl/mip405/cmd_mip405.c | 2 +- board/mpl/pati/cmd_pati.c | 2 +- board/mpl/pip405/cmd_pip405.c | 2 +- board/mpl/vcma9/cmd_vcma9.c | 2 +- board/pcippc2/pcippc2.c | 2 +- board/pcs440ep/pcs440ep.c | 4 +- board/pn62/cmd_pn62.c | 4 +- board/prodrive/pdnb3/pdnb3.c | 2 +- board/pxa255_idp/pxa_idp.c | 2 +- board/r360mpi/r360mpi.c | 2 +- board/renesas/sh7785lcr/rtl8169_mac.c | 4 +- board/renesas/sh7785lcr/selfcheck.c | 2 +- board/sandburst/common/ppc440gx_i2c.c | 2 +- board/sandburst/karef/karef.c | 4 +- board/sandburst/metrobox/metrobox.c | 4 +- board/siemens/common/fpga.c | 2 +- board/siemens/pcu_e/pcu_e.c | 2 +- board/ssv/common/cmd_sled.c | 2 +- board/ssv/common/wd_pio.c | 2 +- board/tqc/tqm5200/cmd_stk52xx.c | 10 +++--- board/tqc/tqm5200/cmd_tb5200.c | 4 +- board/tqc/tqm8272/tqm8272.c | 2 +- board/trab/cmd_trab.c | 12 ++++---- board/trab/trab.c | 2 +- board/trizepsiv/eeprom.c | 2 +- board/w7o/cmd_vpd.c | 2 +- board/zeus/update.c | 2 +- board/zeus/zeus.c | 4 +- common/cmd_ambapp.c | 2 +- common/cmd_autoscript.c | 2 +- common/cmd_bdinfo.c | 2 +- common/cmd_bedbug.c | 16 ++++++------ common/cmd_bmp.c | 2 +- common/cmd_boot.c | 4 +- common/cmd_bootldr.c | 2 +- common/cmd_bootm.c | 10 +++--- common/cmd_cache.c | 4 +- common/cmd_console.c | 2 +- common/cmd_cplbinfo.c | 2 +- common/cmd_date.c | 2 +- common/cmd_dcr.c | 8 +++--- common/cmd_df.c | 2 +- common/cmd_diag.c | 2 +- common/cmd_display.c | 2 +- common/cmd_doc.c | 4 +- common/cmd_dtt.c | 2 +- common/cmd_eeprom.c | 4 +- common/cmd_elf.c | 4 +- common/cmd_ext2.c | 4 +- common/cmd_fat.c | 6 ++-- common/cmd_fdc.c | 2 +- common/cmd_fdos.c | 4 +- common/cmd_fdt.c | 2 +- common/cmd_flash.c | 6 ++-- common/cmd_fpga.c | 2 +- common/cmd_i2c.c | 18 ++++++------ common/cmd_ide.c | 4 +- common/cmd_immap.c | 34 ++++++++++++------------ common/cmd_irq.c | 2 +- common/cmd_itest.c | 2 +- common/cmd_jffs2.c | 10 +++--- common/cmd_license.c | 2 +- common/cmd_load.c | 14 +++++----- common/cmd_log.c | 2 +- common/cmd_mac.c | 2 +- common/cmd_mem.c | 30 +++++++++++----------- common/cmd_mfsl.c | 6 ++-- common/cmd_mii.c | 2 +- common/cmd_misc.c | 4 +- common/cmd_mmc.c | 2 +- common/cmd_mp.c | 2 +- common/cmd_nand.c | 8 +++--- common/cmd_net.c | 16 ++++++------ common/cmd_nvedit.c | 10 +++--- common/cmd_onenand.c | 2 +- common/cmd_otp.c | 2 +- common/cmd_pci.c | 2 +- common/cmd_pcmcia.c | 2 +- common/cmd_portio.c | 4 +- common/cmd_reginfo.c | 2 +- common/cmd_reiser.c | 4 +- common/cmd_sata.c | 2 +- common/cmd_scsi.c | 4 +- common/cmd_setexpr.c | 2 +- common/cmd_sf.c | 2 +- common/cmd_spi.c | 2 +- common/cmd_strings.c | 2 +- common/cmd_terminal.c | 2 +- common/cmd_ubi.c | 2 +- common/cmd_universe.c | 2 +- common/cmd_usb.c | 6 ++-- common/cmd_vfd.c | 2 +- common/cmd_ximg.c | 2 +- common/cmd_yaffs2.c | 24 +++++++++--------- common/command.c | 21 ++++++++------- common/hush.c | 2 +- common/kgdb.c | 2 +- common/lcd.c | 2 +- cpu/mpc512x/speed.c | 2 +- cpu/mpc83xx/ecc.c | 2 +- cpu/mpc83xx/speed.c | 2 +- cpu/nios2/sysid.c | 2 +- drivers/gpio/pca953x.c | 2 +- drivers/qe/qe.c | 2 +- include/command.h | 5 +++ 162 files changed, 359 insertions(+), 350 deletions(-)
diff --git a/README b/README index 7bf3160..b560c07 100644 --- a/README +++ b/README @@ -2038,2 +2038,5 @@ Configuration Settings:
+- CONFIG_SYS_HELP_CMD_WIDTH: Defined when you want to override the default + width of the commands listed in the 'help' command output. + - CONFIG_SYS_PROMPT: This is what U-Boot prints on the console to diff --git a/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c b/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c index 753d85b..02a095e 100644 --- a/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c +++ b/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c @@ -157,3 +157,3 @@ U_BOOT_CMD( vcimage, 2, 0, do_vcimage, - "vcimage - loads an image to Display\n", + "loads an image to Display", "vcimage addr\n" diff --git a/board/MAI/AmigaOneG3SE/cmd_boota.c b/board/MAI/AmigaOneG3SE/cmd_boota.c index 949af18..6b955d8 100644 --- a/board/MAI/AmigaOneG3SE/cmd_boota.c +++ b/board/MAI/AmigaOneG3SE/cmd_boota.c @@ -124,3 +124,3 @@ U_BOOT_CMD( boota, 3, 1, do_boota, - "boota - boot an Amiga kernel\n", + "boot an Amiga kernel", "address disk" diff --git a/board/MAI/menu/cmd_menu.c b/board/MAI/menu/cmd_menu.c index 079f1ff..2b97d23 100644 --- a/board/MAI/menu/cmd_menu.c +++ b/board/MAI/menu/cmd_menu.c @@ -12,3 +12,3 @@ U_BOOT_CMD( menu, 1, 1, do_menu, - "menu - display BIOS setup menu\n", + "display BIOS setup menu", "" diff --git a/board/ads5121/ads5121_diu.c b/board/ads5121/ads5121_diu.c index 11e2be7..4f7dda0 100644 --- a/board/ads5121/ads5121_diu.c +++ b/board/ads5121/ads5121_diu.c @@ -103,3 +103,3 @@ U_BOOT_CMD( diufb, CONFIG_SYS_MAXARGS, 1, ads5121diu_init_show_bmp, - "diufb - Init or Display BMP file\n", + "Init or Display BMP file", "init\n - initialize DIU\n" diff --git a/board/amcc/acadia/cmd_acadia.c b/board/amcc/acadia/cmd_acadia.c index 9fc03f1..d47cf1a 100644 --- a/board/amcc/acadia/cmd_acadia.c +++ b/board/amcc/acadia/cmd_acadia.c @@ -98,3 +98,3 @@ U_BOOT_CMD( bootstrap, 3, 0, do_bootstrap, - "bootstrap - program the I2C bootstrap EEPROM\n", + "program the I2C bootstrap EEPROM", "<cpu-freq> <nor|nand> - program the I2C bootstrap EEPROM\n" diff --git a/board/amcc/canyonlands/bootstrap.c b/board/amcc/canyonlands/bootstrap.c index 35284d1..30046fe 100644 --- a/board/amcc/canyonlands/bootstrap.c +++ b/board/amcc/canyonlands/bootstrap.c @@ -192,3 +192,3 @@ U_BOOT_CMD( bootstrap, 2, 0, do_bootstrap, - "bootstrap - program the I2C bootstrap EEPROM\n", + "program the I2C bootstrap EEPROM", "<nand|nor> - strap to boot from NAND or NOR flash\n" diff --git a/board/amcc/katmai/cmd_katmai.c b/board/amcc/katmai/cmd_katmai.c index d362655..2c2849b 100644 --- a/board/amcc/katmai/cmd_katmai.c +++ b/board/amcc/katmai/cmd_katmai.c @@ -215,3 +215,3 @@ U_BOOT_CMD( bootstrap, 3, 1, do_bootstrap, - "bootstrap - program the serial device strap\n", + "program the serial device strap", "wrclk [prom0|prom1] - program the serial device strap\n" diff --git a/board/amcc/kilauea/cmd_pll.c b/board/amcc/kilauea/cmd_pll.c index 3b49e5b..6b38493 100644 --- a/board/amcc/kilauea/cmd_pll.c +++ b/board/amcc/kilauea/cmd_pll.c @@ -239,3 +239,3 @@ U_BOOT_CMD( pllalter, CONFIG_SYS_MAXARGS, 1, do_pll_alter, - "pllalter- change pll frequence \n", + "change pll frequence", "pllalter <selection> - change pll frequence \n\n\ diff --git a/board/amcc/luan/luan.c b/board/amcc/luan/luan.c index e1357f4..d2a3b9e 100644 --- a/board/amcc/luan/luan.c +++ b/board/amcc/luan/luan.c @@ -331,3 +331,3 @@ U_BOOT_CMD( l2cache, 2, 1, do_l2cache, - "l2cache - enable or disable L2 cache\n", + "enable or disable L2 cache", "[on, off]\n" diff --git a/board/amcc/makalu/cmd_pll.c b/board/amcc/makalu/cmd_pll.c index 3b49e5b..6b38493 100644 --- a/board/amcc/makalu/cmd_pll.c +++ b/board/amcc/makalu/cmd_pll.c @@ -239,3 +239,3 @@ U_BOOT_CMD( pllalter, CONFIG_SYS_MAXARGS, 1, do_pll_alter, - "pllalter- change pll frequence \n", + "change pll frequence", "pllalter <selection> - change pll frequence \n\n\ diff --git a/board/amcc/sequoia/cmd_sequoia.c b/board/amcc/sequoia/cmd_sequoia.c index c840748..6dfd8ba 100644 --- a/board/amcc/sequoia/cmd_sequoia.c +++ b/board/amcc/sequoia/cmd_sequoia.c @@ -228,3 +228,3 @@ U_BOOT_CMD( bootstrap, 2, 0, do_bootstrap, - "bootstrap - program the I2C bootstrap EEPROM\n", + "program the I2C bootstrap EEPROM", "<nand|nor> - strap to boot from NAND or NOR flash\n" diff --git a/board/amcc/taihu/lcd.c b/board/amcc/taihu/lcd.c index 7cc094a..6b68f33 100644 --- a/board/amcc/taihu/lcd.c +++ b/board/amcc/taihu/lcd.c @@ -234,3 +234,3 @@ U_BOOT_CMD( lcd_cls, 1, 1, do_lcd_clear, - "lcd_cls - lcd clear display\n", + "lcd clear display", NULL @@ -240,3 +240,3 @@ U_BOOT_CMD( lcd_puts, 2, 1, do_lcd_puts, - "lcd_puts - display string on lcd\n", + "display string on lcd", "<string> - <string> to be displayed\n" @@ -246,3 +246,3 @@ U_BOOT_CMD( lcd_putc, 2, 1, do_lcd_putc, - "lcd_putc - display char on lcd\n", + "display char on lcd", "<char> - <char> to be displayed\n" @@ -252,3 +252,3 @@ U_BOOT_CMD( lcd_cur, 3, 1, do_lcd_cur, - "lcd_cur - shift cursor on lcd\n", + "shift cursor on lcd", "<count> <dir> - shift cursor on lcd <count> times, direction is <dir> \n" diff --git a/board/amcc/taihu/taihu.c b/board/amcc/taihu/taihu.c index a98c186..5224378 100644 --- a/board/amcc/taihu/taihu.c +++ b/board/amcc/taihu/taihu.c @@ -95,3 +95,3 @@ U_BOOT_CMD ( sw2_stat, 1, 1, do_sw_stat, - "sw2_stat - show status of switch 2\n", + "show status of switch 2", NULL @@ -134,3 +134,3 @@ U_BOOT_CMD ( led_ctl, 3, 1, do_led_ctl, - "led_ctl - make led 1 or 2 on or off\n", + "make led 1 or 2 on or off", "<led_no> <on/off> - make led <led_no> on/off,\n" diff --git a/board/amcc/taihu/update.c b/board/amcc/taihu/update.c index 52bad56..8e96905 100644 --- a/board/amcc/taihu/update.c +++ b/board/amcc/taihu/update.c @@ -129,3 +129,3 @@ U_BOOT_CMD ( update_boot_eeprom, 1, 1, update_boot_eeprom, - "update_boot_eeprom - update boot eeprom content\n", + "update boot eeprom content", NULL diff --git a/board/amcc/taishan/lcd.c b/board/amcc/taishan/lcd.c index 4e14bbc..e4d0705 100644 --- a/board/amcc/taishan/lcd.c +++ b/board/amcc/taishan/lcd.c @@ -256,12 +256,12 @@ static int do_lcd_cur(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
-U_BOOT_CMD(lcd_test, 1, 1, do_lcd_test, "lcd_test - lcd test display\n", NULL); -U_BOOT_CMD(lcd_cls, 1, 1, do_lcd_clear, "lcd_cls - lcd clear display\n", NULL); +U_BOOT_CMD(lcd_test, 1, 1, do_lcd_test, "lcd test display", NULL); +U_BOOT_CMD(lcd_cls, 1, 1, do_lcd_clear, "lcd clear display", NULL); U_BOOT_CMD(lcd_puts, 2, 1, do_lcd_puts, - "lcd_puts - display string on lcd\n", + "display string on lcd", "<string> - <string> to be displayed\n"); U_BOOT_CMD(lcd_putc, 2, 1, do_lcd_putc, - "lcd_putc - display char on lcd\n", + "display char on lcd", "<char> - <char> to be displayed\n"); U_BOOT_CMD(lcd_cur, 3, 1, do_lcd_cur, - "lcd_cur - shift cursor on lcd\n", + "shift cursor on lcd", "<count> <dir>- shift cursor on lcd <count> times, direction is <dir> \n" @@ -375,6 +375,6 @@ static int do_led_test_on(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(ledon, 1, 1, do_led_test_on, - "ledon - led test light on\n", NULL); + "led test light on", NULL);
U_BOOT_CMD(ledoff, 1, 1, do_led_test_off, - "ledoff - led test light off\n", NULL); + "led test light off", NULL); #endif diff --git a/board/amcc/taishan/showinfo.c b/board/amcc/taishan/showinfo.c index 5b8b88e..b471c95 100644 --- a/board/amcc/taishan/showinfo.c +++ b/board/amcc/taishan/showinfo.c @@ -170,3 +170,3 @@ int do_show_xbridge_info(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(xbriinfo, 1, 1, do_show_xbridge_info, - "xbriinfo - Show PCIX bridge info\n", NULL); + "Show PCIX bridge info", NULL);
@@ -224,3 +224,3 @@ int do_show_pcix_device_info(cmd_tbl_t * cmdtp, int flag, int argc, U_BOOT_CMD(xdevinfo, 1, 1, do_show_pcix_device_info, - "xdevinfo - Show PCIX Device info\n", NULL); + "Show PCIX Device info", NULL);
@@ -235,2 +235,2 @@ int do_show_reset_reg_info(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(resetinfo, 1, 1, do_show_reset_reg_info, - "resetinfo - Show Reset REG info\n", NULL); + "Show Reset REG info", NULL); diff --git a/board/amcc/taishan/update.c b/board/amcc/taishan/update.c index 96b918b..63f8744 100644 --- a/board/amcc/taishan/update.c +++ b/board/amcc/taishan/update.c @@ -76,3 +76,3 @@ int do_update_boot_eeprom(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(update_boot_eeprom, 1, 1, do_update_boot_eeprom, - "update_boot_eeprom - update bootstrap eeprom content\n", NULL); + "update bootstrap eeprom content", NULL); #endif diff --git a/board/amcc/yucca/cmd_yucca.c b/board/amcc/yucca/cmd_yucca.c index 5198317..d2ca257 100644 --- a/board/amcc/yucca/cmd_yucca.c +++ b/board/amcc/yucca/cmd_yucca.c @@ -283,3 +283,3 @@ U_BOOT_CMD( evb440spe, 3, 1, do_evb440spe, - "evb440spe - program the serial device strap\n", + "program the serial device strap", "wrclk [prom0|prom1] - program the serial device strap\n" diff --git a/board/amirix/ap1000/ap1000.c b/board/amirix/ap1000/ap1000.c index e9f80ff..fcf2698 100644 --- a/board/amirix/ap1000/ap1000.c +++ b/board/amirix/ap1000/ap1000.c @@ -661,3 +661,3 @@ done: U_BOOT_CMD (temp, 6, 0, do_temp_sensor, - "temp - interact with the temperature sensor\n", + "interact with the temperature sensor", "temp [s]\n" @@ -676,3 +676,3 @@ U_BOOT_CMD (temp, 6, 0, do_temp_sensor, U_BOOT_CMD (loadace, 2, 0, do_loadace, - "loadace - load fpga configuration from System ACE compact flash\n", + "load fpga configuration from System ACE compact flash", "N\n" @@ -683,3 +683,3 @@ U_BOOT_CMD (loadace, 2, 0, do_loadace, U_BOOT_CMD (swconfig, 2, 0, do_swconfigbyte, - "swconfig- display or modify the software configuration byte\n", + "display or modify the software configuration byte", "N [ADDRESS]\n" @@ -690,3 +690,3 @@ U_BOOT_CMD (swconfig, 2, 0, do_swconfigbyte, U_BOOT_CMD (pause, 2, 0, do_pause, - "pause - sleep processor until any key is pressed with poll time of N seconds\n", + "sleep processor until any key is pressed with poll time of N seconds", "N\n" @@ -697,3 +697,3 @@ U_BOOT_CMD (pause, 2, 0, do_pause, U_BOOT_CMD (swrecon, 1, 0, do_swreconfig, - "swrecon - trigger a board reconfigure to the software selected configuration\n", + "trigger a board reconfigure to the software selected configuration", "\n" diff --git a/board/amirix/ap1000/powerspan.c b/board/amirix/ap1000/powerspan.c index f048155..f727061 100644 --- a/board/amirix/ap1000/powerspan.c +++ b/board/amirix/ap1000/powerspan.c @@ -480,3 +480,3 @@ int do_eeprom (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD (eeprom, 4, 0, do_eeprom, - "eeprom - read/write/copy to/from the PowerSpan II eeprom\n", + "read/write/copy to/from the PowerSpan II eeprom", "eeprom r OFF [NUM]\n" diff --git a/board/barco/barco.c b/board/barco/barco.c index e3abca4..a19e1ed 100644 --- a/board/barco/barco.c +++ b/board/barco/barco.c @@ -308,3 +308,3 @@ U_BOOT_CMD ( try_working, 1, 1, barcobcd_boot_image, - " try_working - check flash value and boot the appropriate image\n", + "check flash value and boot the appropriate image", "\n" @@ -314,3 +314,3 @@ U_BOOT_CMD ( boot_working, 1, 1, barcobcd_boot_image, - " boot_working - check flash value and boot the appropriate image\n", + "check flash value and boot the appropriate image", "\n" @@ -320,3 +320,3 @@ U_BOOT_CMD ( boot_default, 1, 1, barcobcd_boot_image, - " boot_default - check flash value and boot the appropriate image\n", + "check flash value and boot the appropriate image", "\n" diff --git a/board/bc3450/cmd_bc3450.c b/board/bc3450/cmd_bc3450.c index ae5061f..aa46e58 100644 --- a/board/bc3450/cmd_bc3450.c +++ b/board/bc3450/cmd_bc3450.c @@ -196,3 +196,3 @@ int cmd_dip (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD (dip, 1, 1, cmd_dip, - "dip - read dip switch and config inputs\n", + "read dip switch and config inputs", "\n" @@ -230,3 +230,3 @@ static int cmd_buz (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD (buz, 2, 1, cmd_buz, - "buz - turns buzzer on/off\n", + "turns buzzer on/off", "\n" "buz <on/off>\n" " - turns the buzzer on or off\n"); @@ -324,3 +324,3 @@ static int cmd_fp (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD (fp, 3, 1, cmd_fp, - "fp - front panes access functions\n", + "front panes access functions", "\n" @@ -525,3 +525,3 @@ static int cmd_temp (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD (temp, 3, 1, cmd_temp, - "temp - print current temperature\n", + "print current temperature", "\n" "temp\n" " - print current temperature\n"); @@ -818,3 +818,3 @@ int cmd_test (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
-U_BOOT_CMD (test, 2, 1, cmd_test, "test - unit test routines\n", "\n" +U_BOOT_CMD (test, 2, 1, cmd_test, "unit test routines", "\n" #ifdef CONFIG_BC3450_CAN diff --git a/board/bf537-stamp/cmd_bf537led.c b/board/bf537-stamp/cmd_bf537led.c index fa650f2..e77bb0c 100644 --- a/board/bf537-stamp/cmd_bf537led.c +++ b/board/bf537-stamp/cmd_bf537led.c @@ -198,3 +198,3 @@ void show_cmd_usage() U_BOOT_CMD(led, 3, 1, do_bf537led, - "led- Control BF537 stamp LEDs\n", USAGE_LONG); + "Control BF537 stamp LEDs", USAGE_LONG);
diff --git a/board/cm5200/cmd_cm5200.c b/board/cm5200/cmd_cm5200.c index 00f0671..52f031c 100644 --- a/board/cm5200/cmd_cm5200.c +++ b/board/cm5200/cmd_cm5200.c @@ -437,3 +437,3 @@ U_BOOT_CMD( fkt, 4, 1, cmd_fkt, - "fkt - Function test routines\n", + "Function test routines", "i2c\n" diff --git a/board/delta/delta.c b/board/delta/delta.c index 878416f..73e6c3e 100644 --- a/board/delta/delta.c +++ b/board/delta/delta.c @@ -261,3 +261,3 @@ U_BOOT_CMD( kbd, 1, 1, do_kbd, - "kbd - read keyboard status\n", + "read keyboard status", NULL diff --git a/board/esd/ar405/ar405.c b/board/esd/ar405/ar405.c index 3abcfe6..c4b4b67 100644 --- a/board/esd/ar405/ar405.c +++ b/board/esd/ar405/ar405.c @@ -249,3 +249,3 @@ U_BOOT_CMD( digtest, 3, 1, do_digtest, - "digtest - Test digital in-/output\n", + "Test digital in-/output", NULL @@ -343,3 +343,3 @@ U_BOOT_CMD( anatest, 2, 1, do_anatest, - "anatest - Test analog in-/output\n", + "Test analog in-/output", NULL @@ -410,3 +410,3 @@ U_BOOT_CMD( inctest, 3, 1, do_inctest, - "inctest - Test incremental encoder inputs\n", + "Test incremental encoder inputs", NULL diff --git a/board/esd/cms700/cms700.c b/board/esd/cms700/cms700.c index 5709d45..d0ee193 100644 --- a/board/esd/cms700/cms700.c +++ b/board/esd/cms700/cms700.c @@ -200,3 +200,3 @@ int do_eep_wren (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(eepwren, 2, 0, do_eep_wren, - "eepwren - Enable / disable / query EEPROM write access\n", + "Enable / disable / query EEPROM write access", NULL); diff --git a/board/esd/common/auto_update.c b/board/esd/common/auto_update.c index 633f641..4ea373a 100644 --- a/board/esd/common/auto_update.c +++ b/board/esd/common/auto_update.c @@ -552,3 +552,3 @@ U_BOOT_CMD( autoupd, 1, 1, auto_update, - "autoupd - Automatically update images\n", + "Automatically update images", NULL diff --git a/board/esd/common/cmd_loadpci.c b/board/esd/common/cmd_loadpci.c index ad490c3..0a6626e 100644 --- a/board/esd/common/cmd_loadpci.c +++ b/board/esd/common/cmd_loadpci.c @@ -125,3 +125,3 @@ U_BOOT_CMD( loadpci, 1, 1, do_loadpci, - "loadpci - Wait for pci bootcmd and boot it\n", + "Wait for pci bootcmd and boot it", NULL diff --git a/board/esd/common/lcd.c b/board/esd/common/lcd.c index 1db8d90..066df74 100644 --- a/board/esd/common/lcd.c +++ b/board/esd/common/lcd.c @@ -374,3 +374,3 @@ U_BOOT_CMD( esdbmp, 2, 1, do_esdbmp, - "esdbmp - display BMP image\n", + "display BMP image", "<imageAddr> - display image\n" diff --git a/board/esd/common/xilinx_jtag/micro.c b/board/esd/common/xilinx_jtag/micro.c index 318f229..9b2cf90 100644 --- a/board/esd/common/xilinx_jtag/micro.c +++ b/board/esd/common/xilinx_jtag/micro.c @@ -1861,3 +1861,3 @@ U_BOOT_CMD( cpld, 1, 1, do_cpld, - "cpld - Program onboard CPLD\n", + "Program onboard CPLD", NULL diff --git a/board/esd/cpci2dp/cpci2dp.c b/board/esd/cpci2dp/cpci2dp.c index dcab906..517b174 100644 --- a/board/esd/cpci2dp/cpci2dp.c +++ b/board/esd/cpci2dp/cpci2dp.c @@ -178,3 +178,3 @@ U_BOOT_CMD( eepwren, 2, 0, do_eep_wren, - "eepwren - Enable / disable / query EEPROM write access\n", + "Enable / disable / query EEPROM write access", NULL diff --git a/board/esd/cpci405/cpci405.c b/board/esd/cpci405/cpci405.c index c5ccb34..4f4d840 100644 --- a/board/esd/cpci405/cpci405.c +++ b/board/esd/cpci405/cpci405.c @@ -688,3 +688,3 @@ U_BOOT_CMD( onewire, 1, 1, do_onewire, - "onewire - Read 1-write ID\n", + "Read 1-write ID", NULL @@ -747,3 +747,3 @@ U_BOOT_CMD( getbpip, 1, 1, do_get_bpip, - "getbpip - Update IP-Address with Backplane IP-Address\n", + "Update IP-Address with Backplane IP-Address", NULL @@ -783,3 +783,3 @@ U_BOOT_CMD( setbpip, 2, 1, do_set_bpip, - "setbpip - Write Backplane IP-Address\n", + "Write Backplane IP-Address", NULL diff --git a/board/esd/cpci5200/cpci5200.c b/board/esd/cpci5200/cpci5200.c index 6eedb83..b6b50fb 100644 --- a/board/esd/cpci5200/cpci5200.c +++ b/board/esd/cpci5200/cpci5200.c @@ -296,3 +296,3 @@ int do_writepci(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(writepci, 3, 1, do_writepci, - "writepci- Write some data to pcibus\n", + "Write some data to pcibus", "<addr> <size>\n" " - Write some data to pcibus.\n"); diff --git a/board/esd/cpci750/cpci750.c b/board/esd/cpci750/cpci750.c index 70bae60..4826633 100644 --- a/board/esd/cpci750/cpci750.c +++ b/board/esd/cpci750/cpci750.c @@ -995,3 +995,3 @@ U_BOOT_CMD( show_config, 1, 1, do_show_config, - "show_config - Show Marvell strapping register\n", + "Show Marvell strapping register", "Show Marvell strapping register (ResetSampleLow ResetSampleHigh)\n" diff --git a/board/esd/dasa_sim/cmd_dasa_sim.c b/board/esd/dasa_sim/cmd_dasa_sim.c index 97a39c9..f405be9 100644 --- a/board/esd/dasa_sim/cmd_dasa_sim.c +++ b/board/esd/dasa_sim/cmd_dasa_sim.c @@ -229,3 +229,3 @@ U_BOOT_CMD( pci9054, 3, 1, do_pci9054, - "pci9054 - PLX PCI9054 EEPROM access\n", + "PLX PCI9054 EEPROM access", "pci9054 info - print EEPROM values\n" diff --git a/board/esd/du440/du440.c b/board/esd/du440/du440.c index 2f97a12..f9b91b5 100644 --- a/board/esd/du440/du440.c +++ b/board/esd/du440/du440.c @@ -608,3 +608,3 @@ U_BOOT_CMD( dcf77, 1, 1, do_dcf77, - "dcf77 - Check DCF77 receiver\n", + "Check DCF77 receiver", NULL @@ -658,3 +658,3 @@ U_BOOT_CMD( hubinit, 1, 1, do_hubinit, - "hubinit - Initialize USB hub\n", + "Initialize USB hub", NULL @@ -791,3 +791,3 @@ U_BOOT_CMD( sbe, 2, 0, do_setup_boot_eeprom, - "sbe - setup boot eeprom\n", + "setup boot eeprom", NULL @@ -865,3 +865,3 @@ int do_eep_wren (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(eepwren, 2, 0, do_eep_wren, - "eepwren - Enable / disable / query EEPROM write access\n", + "Enable / disable / query EEPROM write access", NULL); @@ -916,3 +916,3 @@ U_BOOT_CMD( wpi, 1, 1, do_waitpwrirq, - "wpi - Wait for power change interrupt\n", + "Wait for power change interrupt", NULL @@ -961,3 +961,3 @@ U_BOOT_CMD( dviinit, 1, 1, do_dviinit, - "dviinit - Initialize DVI Panellink transmitter\n", + "Initialize DVI Panellink transmitter", NULL @@ -1001,3 +1001,3 @@ U_BOOT_CMD( time, CONFIG_SYS_MAXARGS, 1, do_time, - "time - run command and output execution time\n", + "run command and output execution time", NULL @@ -1051,3 +1051,3 @@ U_BOOT_CMD( gfxdemo, CONFIG_SYS_MAXARGS, 1, do_gfxdemo, - "gfxdemo - demo\n", + "demo", NULL diff --git a/board/esd/hh405/hh405.c b/board/esd/hh405/hh405.c index efadf16..ae3bc80 100644 --- a/board/esd/hh405/hh405.c +++ b/board/esd/hh405/hh405.c @@ -735,3 +735,3 @@ int do_eep_wren (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(eepwren, 2, 0, do_eep_wren, - "eepwren - Enable / disable / query EEPROM write access\n", + "Enable / disable / query EEPROM write access", NULL); diff --git a/board/esd/ocrtc/cmd_ocrtc.c b/board/esd/ocrtc/cmd_ocrtc.c index f83dfe8..db2c548 100644 --- a/board/esd/ocrtc/cmd_ocrtc.c +++ b/board/esd/ocrtc/cmd_ocrtc.c @@ -56,3 +56,3 @@ U_BOOT_CMD( setdevice, 1, 1, do_setdevice, - "setdevice - Set device number on pci adapter boards\n", + "Set device number on pci adapter boards", NULL @@ -79,3 +79,3 @@ U_BOOT_CMD( getdevice, 1, 1, do_getdevice, - "getdevice - Get device number and set slot env variable\n", + "Get device number and set slot env variable", NULL diff --git a/board/esd/pci405/cmd_pci405.c b/board/esd/pci405/cmd_pci405.c index f558a2b..a0d1f3f 100644 --- a/board/esd/pci405/cmd_pci405.c +++ b/board/esd/pci405/cmd_pci405.c @@ -110,3 +110,3 @@ U_BOOT_CMD( loadpci, 1, 1, do_loadpci, - "loadpci - Wait for pci-image and boot it\n", + "Wait for pci-image and boot it", NULL diff --git a/board/esd/pci405/pci405.c b/board/esd/pci405/pci405.c index 42774ad..0602abf 100644 --- a/board/esd/pci405/pci405.c +++ b/board/esd/pci405/pci405.c @@ -377,3 +377,3 @@ U_BOOT_CMD( wpeeprom, 2, 1, do_wpeeprom, - "wpeeprom - Check/Enable/Disable I2C EEPROM write protection\n", + "Check/Enable/Disable I2C EEPROM write protection", "wpeeprom\n" diff --git a/board/esd/pf5200/pf5200.c b/board/esd/pf5200/pf5200.c index f7962af..f225f0e 100644 --- a/board/esd/pf5200/pf5200.c +++ b/board/esd/pf5200/pf5200.c @@ -296,3 +296,3 @@ int do_poweroff(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
-U_BOOT_CMD(poweroff, 1, 1, do_poweroff, "poweroff- Switch off power\n", NULL); +U_BOOT_CMD(poweroff, 1, 1, do_poweroff, "Switch off power", NULL);
@@ -340,3 +340,3 @@ int do_phypower(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(phypower, 2, 2, do_phypower, - "phypower- Switch power of ethernet phy\n", NULL); + "Switch power of ethernet phy", NULL);
@@ -371,3 +371,3 @@ int do_writepci(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(writepci, 3, 1, do_writepci, - "writepci- Write some data to pcibus\n", + "Write some data to pcibus", "<addr> <size>\n" " - Write some data to pcibus.\n"); diff --git a/board/esd/plu405/plu405.c b/board/esd/plu405/plu405.c index 61186a8..b7837b1 100644 --- a/board/esd/plu405/plu405.c +++ b/board/esd/plu405/plu405.c @@ -325,3 +325,3 @@ int do_eep_wren (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(eepwren, 2, 0, do_eep_wren, - "eepwren - Enable / disable / query EEPROM write access\n", + "Enable / disable / query EEPROM write access", NULL); diff --git a/board/esd/pmc405/pmc405.c b/board/esd/pmc405/pmc405.c index c0781dc..975b6d6 100644 --- a/board/esd/pmc405/pmc405.c +++ b/board/esd/pmc405/pmc405.c @@ -205,3 +205,3 @@ U_BOOT_CMD( cantest, 3, 1, do_cantest, - "cantest - Test CAN controller", + "Test CAN controller", NULL diff --git a/board/esd/pmc440/cmd_pmc440.c b/board/esd/pmc440/cmd_pmc440.c index 16c9c7e..7808d4d 100644 --- a/board/esd/pmc440/cmd_pmc440.c +++ b/board/esd/pmc440/cmd_pmc440.c @@ -100,3 +100,3 @@ U_BOOT_CMD( waithci, 1, 1, do_waithci, - "waithci - Wait for host control interrupt\n", + "Wait for host control interrupt", NULL @@ -260,3 +260,3 @@ U_BOOT_CMD( fifo, 5, 1, do_fifo, - "fifo - Fifo module operations\n", + "Fifo module operations", "wait\nfifo read\n" @@ -338,3 +338,3 @@ U_BOOT_CMD( sbe, 4, 0, do_setup_bootstrap_eeprom, - "sbe - setup bootstrap eeprom\n", + "setup bootstrap eeprom", "cpufreq:400|533|667 [console-uart:0|1 [<bringup delay (0..20s)>]]" @@ -401,3 +401,3 @@ U_BOOT_CMD( painit, 1, 1, do_painit, - "painit - prepare PciAccess system\n", + "prepare PciAccess system", NULL @@ -413,3 +413,3 @@ U_BOOT_CMD( selfreset, 1, 1, do_selfreset, - "selfreset- assert self-reset# signal\n", + "assert self-reset# signal", NULL @@ -450,3 +450,3 @@ U_BOOT_CMD( resetout, 2, 1, do_resetout, - "resetout - assert PMC-RESETOUT# signal\n", + "assert PMC-RESETOUT# signal", NULL @@ -482,3 +482,3 @@ U_BOOT_CMD( inta, 2, 1, do_inta, - "inta - Assert/Deassert or query INTA# state in non-monarch mode\n", + "Assert/Deassert or query INTA# state in non-monarch mode", NULL @@ -515,3 +515,3 @@ U_BOOT_CMD( pmm, 2, 1, do_pmm, - "pmm - Setup pmm[1] registers\n", + "Setup pmm[1] registers", "<pciaddr> (pciaddr will be aligned to 256MB)\n" @@ -551,3 +551,3 @@ int do_eep_wren(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(eepwren, 2, 0, do_eep_wren, - "eepwren - Enable / disable / query EEPROM write access\n", + "Enable / disable / query EEPROM write access", NULL); diff --git a/board/esd/tasreg/tasreg.c b/board/esd/tasreg/tasreg.c index 64e6d63..80ff237 100644 --- a/board/esd/tasreg/tasreg.c +++ b/board/esd/tasreg/tasreg.c @@ -250,3 +250,3 @@ U_BOOT_CMD( iploop, 2, 1, do_iploop, - "iploop - iprobe loop <addr>\n", + "iprobe loop <addr>", NULL @@ -303,3 +303,3 @@ U_BOOT_CMD( codec, 1, 1, do_codec, - "codec - Enable codec\n", + "Enable codec", NULL @@ -336,3 +336,3 @@ U_BOOT_CMD( saa, 5, 1, do_saa, - "saa - Write to SAA1064 <addr> <instr> <cntrl> <data>\n", + "Write to SAA1064 <addr> <instr> <cntrl> <data>", NULL @@ -375,3 +375,3 @@ U_BOOT_CMD( iwrite, 6, 1, do_iwrite, - "iwrite - Write n bytes to I2C-device\n", + "Write n bytes to I2C-device", "addr cnt data0 ... datan\n" @@ -407,3 +407,3 @@ U_BOOT_CMD( iread, 3, 1, do_iread, - "iread - Read from I2C <addr> <cnt>\n", + "Read from I2C <addr> <cnt>", NULL @@ -445,3 +445,3 @@ U_BOOT_CMD( ireadl, 2, 1, do_ireadl, - "ireadl - Read-loop from I2C <addr>\n", + "Read-loop from I2C <addr>", NULL diff --git a/board/esd/voh405/voh405.c b/board/esd/voh405/voh405.c index ec65ffd..5480105 100644 --- a/board/esd/voh405/voh405.c +++ b/board/esd/voh405/voh405.c @@ -394,3 +394,3 @@ int do_eep_wren (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(eepwren, 2, 0, do_eep_wren, - "eepwren - Enable / disable / query EEPROM write access\n", + "Enable / disable / query EEPROM write access", NULL); diff --git a/board/evb64260/zuma_pbb.c b/board/evb64260/zuma_pbb.c index 1d03570..aef9c27 100644 --- a/board/evb64260/zuma_pbb.c +++ b/board/evb64260/zuma_pbb.c @@ -204,3 +204,3 @@ U_BOOT_CMD( zinit, 1, 0, do_zuma_init_pbb, - "zinit - init zuma pbb\n", + "init zuma pbb", "\n" @@ -210,3 +210,3 @@ U_BOOT_CMD( zdtest, 3, 1, do_zuma_test_dma, - "zdtest - run dma test\n", + "run dma test", "[cmd [count]]\n" @@ -216,3 +216,3 @@ U_BOOT_CMD( zminit, 1, 0, do_zuma_init_mbox, - "zminit - init zuma mbox\n", + "init zuma mbox", "\n" diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c index 96820ac..eb76d93 100644 --- a/board/freescale/common/pixis.c +++ b/board/freescale/common/pixis.c @@ -282,3 +282,3 @@ U_BOOT_CMD( diswd, 1, 0, pixis_disable_watchdog_cmd, - "diswd - Disable watchdog timer \n", + "Disable watchdog timer", NULL); @@ -541,3 +541,3 @@ U_BOOT_CMD( pixis_reset, CONFIG_SYS_MAXARGS, 1, pixis_reset_cmd, - "pixis_reset - Reset the board using the FPGA sequencer\n", + "Reset the board using the FPGA sequencer", " pixis_reset\n" diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c index 2320c0f..2b2d5d7 100644 --- a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c +++ b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c @@ -140,3 +140,3 @@ U_BOOT_CMD( diufb, CONFIG_SYS_MAXARGS, 1, mpc8610diu_init_show_bmp, - "diufb - Init or Display BMP file\n", + "Init or Display BMP file", "init\n - initialize DIU\n" diff --git a/board/g2000/g2000.c b/board/g2000/g2000.c index 48fc643..b35038d 100644 --- a/board/g2000/g2000.c +++ b/board/g2000/g2000.c @@ -187,3 +187,3 @@ U_BOOT_CMD( dumpebc, 1, 1, do_dumpebc, - "dumpebc - Dump all EBC registers\n", + "Dump all EBC registers", NULL @@ -209,3 +209,3 @@ U_BOOT_CMD( dumpdcr, 1, 1, do_dumpdcr, - "dumpdcr - Dump all DCR registers\n", + "Dump all DCR registers", NULL @@ -273,3 +273,3 @@ U_BOOT_CMD( dumpspr, 1, 1, do_dumpspr, - "dumpspr - Dump all SPR registers\n", + "Dump all SPR registers", NULL diff --git a/board/hymod/bsp.c b/board/hymod/bsp.c index 54b3b86..092d368 100644 --- a/board/hymod/bsp.c +++ b/board/hymod/bsp.c @@ -279,3 +279,3 @@ U_BOOT_CMD( fpga, 6, 1, do_fpga, - "fpga - FPGA sub-system\n", + "FPGA sub-system", "load [type] addr size\n" @@ -338,3 +338,3 @@ U_BOOT_CMD( eeclear, 1, 0, do_eecl, - "eeclear - Clear the eeprom on a Hymod board \n", + "Clear the eeprom on a Hymod board", "[type]\n" diff --git a/board/keymile/common/keymile_hdlc_enet.c b/board/keymile/common/keymile_hdlc_enet.c index 141371b..5797880 100644 --- a/board/keymile/common/keymile_hdlc_enet.c +++ b/board/keymile/common/keymile_hdlc_enet.c @@ -592,3 +592,3 @@ U_BOOT_CMD( stest, 1, 1, hdlc_enet_stest, - "stest - simple send test for hdlc_enet\n", + "simple send test for hdlc_enet", "no arguments\n" @@ -614,3 +614,3 @@ U_BOOT_CMD( rtest, 1, 1, hdlc_enet_rtest, - "rtest - simple receive test for hdlc_enet\n", + "simple receive test for hdlc_enet", "no arguments\n" diff --git a/board/lwmon/lwmon.c b/board/lwmon/lwmon.c index 257f1cd..1b665a9 100644 --- a/board/lwmon/lwmon.c +++ b/board/lwmon/lwmon.c @@ -853,3 +853,3 @@ U_BOOT_CMD( pic, 4, 1, do_pic, - "pic - read and write PIC registers\n", + "read and write PIC registers", "read reg - read PIC register `reg'\n" @@ -912,3 +912,3 @@ U_BOOT_CMD( kbd, 1, 1, do_kbd, - "kbd - read keyboard status\n", + "read keyboard status", NULL @@ -984,3 +984,3 @@ U_BOOT_CMD( lsb, 2, 1, do_lsb, - "lsb - check and set LSB switch\n", + "check and set LSB switch", "on - switch LSB on\n" diff --git a/board/lwmon5/kbd.c b/board/lwmon5/kbd.c index 0a8787a..bafd39c 100644 --- a/board/lwmon5/kbd.c +++ b/board/lwmon5/kbd.c @@ -434,3 +434,3 @@ U_BOOT_CMD( kbd, 1, 1, do_kbd, - "kbd - read keyboard status\n", + "read keyboard status", NULL diff --git a/board/lwmon5/lwmon5.c b/board/lwmon5/lwmon5.c index adecad0..4c04b98 100644 --- a/board/lwmon5/lwmon5.c +++ b/board/lwmon5/lwmon5.c @@ -488,3 +488,3 @@ U_BOOT_CMD( eepromwp, 2, 0, do_eeprom_wp, - "eepromwp- eeprom write protect off/on\n", + "eeprom write protect off/on", "<on|off> - enable (on) or disable (off) I2C EEPROM write protect\n" diff --git a/board/mpl/mip405/cmd_mip405.c b/board/mpl/mip405/cmd_mip405.c index 6ad95b5..dc13804 100644 --- a/board/mpl/mip405/cmd_mip405.c +++ b/board/mpl/mip405/cmd_mip405.c @@ -57,3 +57,3 @@ U_BOOT_CMD( mip405, 8, 1, do_mip405, - "mip405 - MIP405 specific Cmds\n", + "MIP405 specific Cmds", "flash mem [SrcAddr] - updates U-Boot with image in memory\n" diff --git a/board/mpl/pati/cmd_pati.c b/board/mpl/pati/cmd_pati.c index 9d9531b..95bfdcc 100644 --- a/board/mpl/pati/cmd_pati.c +++ b/board/mpl/pati/cmd_pati.c @@ -429,3 +429,3 @@ U_BOOT_CMD( pati, 8, 1, do_pati, - "pati - PATI specific Cmds\n", + "PATI specific Cmds", "info - displays board information\n" diff --git a/board/mpl/pip405/cmd_pip405.c b/board/mpl/pip405/cmd_pip405.c index 945e5c9..ad5e0a1 100644 --- a/board/mpl/pip405/cmd_pip405.c +++ b/board/mpl/pip405/cmd_pip405.c @@ -62,3 +62,3 @@ U_BOOT_CMD( pip405, 6, 1, do_pip405, - "pip405 - PIP405 specific Cmds\n", + "PIP405 specific Cmds", "flash mem [SrcAddr] - updates U-Boot with image in memory\n" diff --git a/board/mpl/vcma9/cmd_vcma9.c b/board/mpl/vcma9/cmd_vcma9.c index d3629c5..2748fa9 100644 --- a/board/mpl/vcma9/cmd_vcma9.c +++ b/board/mpl/vcma9/cmd_vcma9.c @@ -177,3 +177,3 @@ U_BOOT_CMD( vcma9, 6, 1, do_vcma9, - "vcma9 - VCMA9 specific commands\n", + "VCMA9 specific commands", "flash mem [SrcAddr]\n - updates U-Boot with image in memory\n" diff --git a/board/pcippc2/pcippc2.c b/board/pcippc2/pcippc2.c index c706ca5..80c2cb5 100644 --- a/board/pcippc2/pcippc2.c +++ b/board/pcippc2/pcippc2.c @@ -238,3 +238,3 @@ U_BOOT_CMD( wd, 2, 1, do_wd, - "wd - check and set watchdog\n", + "check and set watchdog", "on - switch watchDog on\n" diff --git a/board/pcs440ep/pcs440ep.c b/board/pcs440ep/pcs440ep.c index 01ceece..5fd3291 100644 --- a/board/pcs440ep/pcs440ep.c +++ b/board/pcs440ep/pcs440ep.c @@ -763,3 +763,3 @@ U_BOOT_CMD( led, 2, 1, do_led, - "led - set the DIAG-LED\n", + "set the DIAG-LED", "[bitmask] 0x01 = DIAG 1 on\n" @@ -825,3 +825,3 @@ U_BOOT_CMD( sha1, 4, 1, do_sha1, - "sha1 - calculate the SHA1 Sum\n", + "calculate the SHA1 Sum", "address len [addr] calculate the SHA1 sum [save at addr]\n" diff --git a/board/pn62/cmd_pn62.c b/board/pn62/cmd_pn62.c index bb98fcf..10d0df6 100644 --- a/board/pn62/cmd_pn62.c +++ b/board/pn62/cmd_pn62.c @@ -55,3 +55,3 @@ U_BOOT_CMD( led , 3, 1, do_led, - "led - set LED 0..11 on the PN62 board\n", + "set LED 0..11 on the PN62 board", "i fun\n" @@ -176,3 +176,3 @@ U_BOOT_CMD( loadpci, 2, 1, do_loadpci, - "loadpci - load binary file over PCI\n", + "load binary file over PCI", "[addr]\n" diff --git a/board/prodrive/pdnb3/pdnb3.c b/board/prodrive/pdnb3/pdnb3.c index 9b87f6a..8777284 100644 --- a/board/prodrive/pdnb3/pdnb3.c +++ b/board/prodrive/pdnb3/pdnb3.c @@ -229,3 +229,3 @@ U_BOOT_CMD( fpga, 2, 0, do_fpga, - "fpga - boot FPGA\n", + "boot FPGA", "address size\n - boot FPGA with gzipped image at <address>\n" diff --git a/board/pxa255_idp/pxa_idp.c b/board/pxa255_idp/pxa_idp.c index b0aa8dd..aa598aa 100644 --- a/board/pxa255_idp/pxa_idp.c +++ b/board/pxa255_idp/pxa_idp.c @@ -130,3 +130,3 @@ int do_idpcmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(idpcmd, CONFIG_SYS_MAXARGS, 0, do_idpcmd, - "idpcmd - custom IDP command\n", + "custom IDP command", "no args at this time\n" diff --git a/board/r360mpi/r360mpi.c b/board/r360mpi/r360mpi.c index b502e4d..1871984 100644 --- a/board/r360mpi/r360mpi.c +++ b/board/r360mpi/r360mpi.c @@ -416,3 +416,3 @@ U_BOOT_CMD( kbd, 1, 1, do_kbd, - "kbd - read keyboard status\n", + "read keyboard status", NULL diff --git a/board/renesas/sh7785lcr/rtl8169_mac.c b/board/renesas/sh7785lcr/rtl8169_mac.c index 8b04453..6d0bbc0 100644 --- a/board/renesas/sh7785lcr/rtl8169_mac.c +++ b/board/renesas/sh7785lcr/rtl8169_mac.c @@ -325,3 +325,3 @@ U_BOOT_CMD( setmac, 2, 1, do_set_mac, - "setmac - write MAC address for RTL8110SCL\n", + "write MAC address for RTL8110SCL", "\n" @@ -344,3 +344,3 @@ U_BOOT_CMD( printmac, 1, 1, do_print_mac, - "printmac - print MAC address for RTL8110\n", + "print MAC address for RTL8110", "\n" diff --git a/board/renesas/sh7785lcr/selfcheck.c b/board/renesas/sh7785lcr/selfcheck.c index 22079fb..6dbb784 100644 --- a/board/renesas/sh7785lcr/selfcheck.c +++ b/board/renesas/sh7785lcr/selfcheck.c @@ -161,3 +161,3 @@ U_BOOT_CMD( hwtest, 2, 1, do_hw_test, - "hwtest - hardware test for R0P7785LC0011RL board\n", + "hardware test for R0P7785LC0011RL board", "\n" diff --git a/board/sandburst/common/ppc440gx_i2c.c b/board/sandburst/common/ppc440gx_i2c.c index 9af6b8d..c1af70c 100644 --- a/board/sandburst/common/ppc440gx_i2c.c +++ b/board/sandburst/common/ppc440gx_i2c.c @@ -502,3 +502,3 @@ U_BOOT_CMD( iprobe1, 1, 1, do_i2c1_probe, - "iprobe1 - probe to discover valid I2C chip addresses\n", + "probe to discover valid I2C chip addresses", "\n -discover valid I2C chip addresses\n" diff --git a/board/sandburst/karef/karef.c b/board/sandburst/karef/karef.c index 8d97a9c..9b94af5 100644 --- a/board/sandburst/karef/karef.c +++ b/board/sandburst/karef/karef.c @@ -580,5 +580,5 @@ int karefRecover(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(kasetup, 1, 1, karefSetupVars, - "kasetup - Set environment to factory defaults\n", NULL); + "Set environment to factory defaults", NULL);
U_BOOT_CMD(karecover, 1, 1, karefRecover, - "karecover - Set environment to allow for fs recovery\n", NULL); + "Set environment to allow for fs recovery", NULL); diff --git a/board/sandburst/metrobox/metrobox.c b/board/sandburst/metrobox/metrobox.c index 19302dc..ec4c451 100644 --- a/board/sandburst/metrobox/metrobox.c +++ b/board/sandburst/metrobox/metrobox.c @@ -546,5 +546,5 @@ int metroboxRecover(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(mbsetup, 1, 1, metroboxSetupVars, - "mbsetup - Set environment to factory defaults\n", NULL); + "Set environment to factory defaults", NULL);
U_BOOT_CMD(mbrecover, 1, 1, metroboxRecover, - "mbrecover - Set environment to allow for fs recovery\n", NULL); + "Set environment to allow for fs recovery", NULL); diff --git a/board/siemens/common/fpga.c b/board/siemens/common/fpga.c index 63aa179..c9a93e1 100644 --- a/board/siemens/common/fpga.c +++ b/board/siemens/common/fpga.c @@ -294,3 +294,3 @@ U_BOOT_CMD( fpga, 4, 1, do_fpga, - "fpga - access FPGA(s)\n", + "access FPGA(s)", "fpga status [name] - print FPGA status\n" diff --git a/board/siemens/pcu_e/pcu_e.c b/board/siemens/pcu_e/pcu_e.c index 25cf2bb..f87d6bc 100644 --- a/board/siemens/pcu_e/pcu_e.c +++ b/board/siemens/pcu_e/pcu_e.c @@ -406,3 +406,3 @@ int do_puma (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD (puma, 4, 1, do_puma, - "puma - access PUMA FPGA\n", + "access PUMA FPGA", "status - print PUMA status\n" diff --git a/board/ssv/common/cmd_sled.c b/board/ssv/common/cmd_sled.c index cb79698..99ff507 100644 --- a/board/ssv/common/cmd_sled.c +++ b/board/ssv/common/cmd_sled.c @@ -158,3 +158,3 @@ int do_sled (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD (sled, 3, 0, do_sled, - "sled - check and set status led\n", + "check and set status led", "sled [name [state]]\n" __NAME_STR " - state: on|off|blink\n"); diff --git a/board/ssv/common/wd_pio.c b/board/ssv/common/wd_pio.c index 8823ed1..9b38425 100644 --- a/board/ssv/common/wd_pio.c +++ b/board/ssv/common/wd_pio.c @@ -153,3 +153,3 @@ U_BOOT_CMD( wd, 2, 1, do_wd, - "wd - check and set watchdog\n", + "check and set watchdog", "on - switch watchDog on\n" diff --git a/board/tqc/tqm5200/cmd_stk52xx.c b/board/tqc/tqm5200/cmd_stk52xx.c index 6ef7fbe..20632a7 100644 --- a/board/tqc/tqm5200/cmd_stk52xx.c +++ b/board/tqc/tqm5200/cmd_stk52xx.c @@ -1196,3 +1196,3 @@ U_BOOT_CMD( sound , 5, 1, cmd_sound, - "sound - Sound sub-system\n", + "Sound sub-system", "saw [duration] [freq] [channel]\n" @@ -1208,3 +1208,3 @@ U_BOOT_CMD( wav , 3, 1, cmd_wav, - "wav - play wav file\n", + "play wav file", "[addr] [bytes]\n" @@ -1215,3 +1215,3 @@ U_BOOT_CMD( beep , 2, 1, cmd_beep, - "beep - play short beep\n", + "play short beep", "[channel]\n" @@ -1224,3 +1224,3 @@ U_BOOT_CMD( fkt , 4, 1, cmd_fkt, - "fkt - Function test routines\n", + "Function test routines", "led number on/off\n" @@ -1239,3 +1239,3 @@ U_BOOT_CMD( fkt , 3, 1, cmd_fkt, - "fkt - Function test routines\n", + "Function test routines", "fkt can\n" diff --git a/board/tqc/tqm5200/cmd_tb5200.c b/board/tqc/tqm5200/cmd_tb5200.c index 214dca6..b9c9e7e 100644 --- a/board/tqc/tqm5200/cmd_tb5200.c +++ b/board/tqc/tqm5200/cmd_tb5200.c @@ -92,3 +92,3 @@ U_BOOT_CMD( led , 2, 1, cmd_led, - "led - switch status LED on or off\n", + "switch status LED on or off", "on/off\n" @@ -98,3 +98,3 @@ U_BOOT_CMD( backlight , 2, 1, cmd_backlight, - "backlight - switch backlight on or off\n", + "switch backlight on or off", "on/off\n" diff --git a/board/tqc/tqm8272/tqm8272.c b/board/tqc/tqm8272/tqm8272.c index 5d0741d..5bc080f 100644 --- a/board/tqc/tqm8272/tqm8272.c +++ b/board/tqc/tqm8272/tqm8272.c @@ -868,3 +868,3 @@ U_BOOT_CMD( hwib, 1, 1, do_hwib_dump, - "hwib - dump HWIB'\n", + "dump HWIB'", "\n" diff --git a/board/trab/cmd_trab.c b/board/trab/cmd_trab.c index 5020d60..7e2a672 100644 --- a/board/trab/cmd_trab.c +++ b/board/trab/cmd_trab.c @@ -260,3 +260,3 @@ U_BOOT_CMD( burn_in, 1, 1, do_burn_in, - "burn_in - start burn-in test application on TRAB\n", + "start burn-in test application on TRAB", "\n" @@ -294,3 +294,3 @@ U_BOOT_CMD( dip, 1, 1, do_dip, - "dip - read dip switch on TRAB\n", + "read dip switch on TRAB", "\n" @@ -323,3 +323,3 @@ U_BOOT_CMD( vcc5v, 1, 1, do_vcc5v, - "vcc5v - read VCC5V on TRAB\n", + "read VCC5V on TRAB", "\n" @@ -348,3 +348,3 @@ U_BOOT_CMD( c_temp, 1, 1, do_contact_temp, - "c_temp - read contact temperature on TRAB\n", + "read contact temperature on TRAB", "\n" @@ -400,3 +400,3 @@ U_BOOT_CMD( bis, 1, 1, do_burn_in_status, - "bis - print burn in status on TRAB\n", + "print burn in status on TRAB", "\n" @@ -888,3 +888,3 @@ U_BOOT_CMD( tlog, 2, 1, do_temp_log, - "tlog - log contact temperature [1/100 C] to console (endlessly)\n", + "log contact temperature [1/100 C] to console (endlessly)", "delay\n" diff --git a/board/trab/trab.c b/board/trab/trab.c index 57ff718..7fcc450 100644 --- a/board/trab/trab.c +++ b/board/trab/trab.c @@ -324,3 +324,3 @@ U_BOOT_CMD( kbd, 1, 1, do_kbd, - "kbd - read keyboard status\n", + "read keyboard status", NULL diff --git a/board/trizepsiv/eeprom.c b/board/trizepsiv/eeprom.c index e11519a..63f1c6c 100644 --- a/board/trizepsiv/eeprom.c +++ b/board/trizepsiv/eeprom.c @@ -78,3 +78,3 @@ U_BOOT_CMD( dm9000ee,4,1,do_dm9000_eeprom, - "dm9000ee- Read/Write eeprom connected to Ethernet Controller\n", + "Read/Write eeprom connected to Ethernet Controller", "\ndm9000ee write <word offset> <value> \n" diff --git a/board/w7o/cmd_vpd.c b/board/w7o/cmd_vpd.c index 5202521..eaec940 100644 --- a/board/w7o/cmd_vpd.c +++ b/board/w7o/cmd_vpd.c @@ -60,3 +60,3 @@ U_BOOT_CMD( vpd, 2, 1, do_vpd, - "vpd - Read Vital Product Data\n", + "Read Vital Product Data", "[dev_addr]\n" diff --git a/board/zeus/update.c b/board/zeus/update.c index 2f2a127..ce1f34f 100644 --- a/board/zeus/update.c +++ b/board/zeus/update.c @@ -100,3 +100,3 @@ U_BOOT_CMD ( update_boot_eeprom, 1, 1, do_update_boot_eeprom, - "update_boot_eeprom - update boot eeprom content\n", + "update boot eeprom content", NULL diff --git a/board/zeus/zeus.c b/board/zeus/zeus.c index 974bdf2..3f329c2 100644 --- a/board/zeus/zeus.c +++ b/board/zeus/zeus.c @@ -329,3 +329,3 @@ U_BOOT_CMD( setdef, 4, 1, do_set_default, - "setdef - write board-specific values to EEPROM (ethaddr...)\n", + "write board-specific values to EEPROM (ethaddr...)", "ethaddr eth1addr serial#\n - write board-specific values to EEPROM\n" @@ -420,3 +420,3 @@ U_BOOT_CMD ( chkreset, 1, 1, do_chkreset, - "chkreset- Check for status of SW-reset button and act accordingly\n", + "Check for status of SW-reset button and act accordingly", NULL diff --git a/common/cmd_ambapp.c b/common/cmd_ambapp.c index 43427bb..06531f1 100644 --- a/common/cmd_ambapp.c +++ b/common/cmd_ambapp.c @@ -275,3 +275,3 @@ int ambapp_init_reloc(void) U_BOOT_CMD(ambapp, 1, 1, do_ambapp_print, - "ambapp - list AMBA Plug&Play information\n", + "list AMBA Plug&Play information", "ambapp\n" diff --git a/common/cmd_autoscript.c b/common/cmd_autoscript.c index 4517ac8..e5a9bc0 100644 --- a/common/cmd_autoscript.c +++ b/common/cmd_autoscript.c @@ -232,3 +232,3 @@ U_BOOT_CMD( autoscr, 2, 0, do_autoscript, - "autoscr - run script from memory\n", + "run script from memory", "[addr] - run script starting at addr" diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c index 6675241..20d650f 100644 --- a/common/cmd_bdinfo.c +++ b/common/cmd_bdinfo.c @@ -444,3 +444,3 @@ U_BOOT_CMD( bdinfo, 1, 1, do_bdinfo, - "bdinfo - print Board Info structure\n", + "print Board Info structure", NULL diff --git a/common/cmd_bedbug.c b/common/cmd_bedbug.c index 1dda193..cd9e720 100644 --- a/common/cmd_bedbug.c +++ b/common/cmd_bedbug.c @@ -109,3 +109,3 @@ int do_bedbug_dis (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD (ds, 3, 1, do_bedbug_dis, - "ds - disassemble memory\n", + "disassemble memory", "ds <address> [# instructions]\n"); @@ -162,3 +162,3 @@ int do_bedbug_asm (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD (as, 2, 0, do_bedbug_asm, - "as - assemble memory\n", "as <address>\n"); + "assemble memory", "as <address>\n"); @@ -179,3 +179,3 @@ int do_bedbug_break (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD (break, 3, 0, do_bedbug_break, - "break - set or clear a breakpoint\n", + "set or clear a breakpoint", " - Set or clear a breakpoint\n" @@ -279,3 +279,3 @@ int do_bedbug_continue (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD (continue, 1, 0, do_bedbug_continue, - "continue- continue from a breakpoint\n", + "continue from a breakpoint", " - continue from a breakpoint.\n"); @@ -310,3 +310,3 @@ int do_bedbug_step (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD (step, 1, 1, do_bedbug_step, - "step - single step execution.\n", + "single step execution.", " - single step execution.\n"); @@ -341,3 +341,3 @@ int do_bedbug_next (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD (next, 1, 1, do_bedbug_next, - "next - single step execution, stepping over subroutines.\n", + "single step execution, stepping over subroutines.", " - single step execution, stepping over subroutines.\n"); @@ -386,3 +386,3 @@ int do_bedbug_stack (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD (where, 1, 1, do_bedbug_stack, - "where - Print the running stack.\n", + "Print the running stack.", " - Print the running stack.\n"); @@ -407,3 +407,3 @@ int do_bedbug_rdump (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD (rdump, 1, 1, do_bedbug_rdump, - "rdump - Show registers.\n", " - Show registers.\n"); + "Show registers.", " - Show registers.\n"); /* ====================================================================== */ diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c index e60f18b..abbb070 100644 --- a/common/cmd_bmp.c +++ b/common/cmd_bmp.c @@ -141,3 +141,3 @@ U_BOOT_CMD( bmp, 5, 1, do_bmp, - "bmp - manipulate BMP image data\n", + "manipulate BMP image data", "info <imageAddr> - display image info\n" diff --git a/common/cmd_boot.c b/common/cmd_boot.c index 36106c7..efc1a02 100644 --- a/common/cmd_boot.c +++ b/common/cmd_boot.c @@ -66,3 +66,3 @@ U_BOOT_CMD( go, CONFIG_SYS_MAXARGS, 1, do_go, - "go - start application at address 'addr'\n", + "start application at address 'addr'", "addr [arg ...]\n - start application at address 'addr'\n" @@ -75,3 +75,3 @@ U_BOOT_CMD( reset, 1, 0, do_reset, - "reset - Perform RESET of the CPU\n", + "Perform RESET of the CPU", NULL diff --git a/common/cmd_bootldr.c b/common/cmd_bootldr.c index e6474aa..b525f0d 100644 --- a/common/cmd_bootldr.c +++ b/common/cmd_bootldr.c @@ -61,3 +61,3 @@ int do_bootldr(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(bootldr, 2, 0, do_bootldr, - "bootldr - boot ldr image from memory\n", + "boot ldr image from memory", "[addr]\n" diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 3466e72..f059356 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -915,3 +915,3 @@ U_BOOT_CMD( bootm, CONFIG_SYS_MAXARGS, 1, do_bootm, - "bootm - boot application image from memory\n", + "boot application image from memory", "[addr [arg ...]]\n - boot application image stored in memory\n" @@ -972,3 +972,3 @@ U_BOOT_CMD( boot, 1, 1, do_bootd, - "boot - boot default, i.e., run 'bootcmd'\n", + "boot default, i.e., run 'bootcmd'", NULL @@ -979,3 +979,3 @@ U_BOOT_CMD( bootd, 1, 1, do_bootd, - "bootd - boot default, i.e., run 'bootcmd'\n", + "boot default, i.e., run 'bootcmd'", NULL @@ -1064,3 +1064,3 @@ U_BOOT_CMD( iminfo, CONFIG_SYS_MAXARGS, 1, do_iminfo, - "iminfo - print header information for application image\n", + "print header information for application image", "addr [addr ...]\n" @@ -1132,3 +1132,3 @@ U_BOOT_CMD( imls, 1, 1, do_imls, - "imls - list all images found in flash\n", + "list all images found in flash", "\n" diff --git a/common/cmd_cache.c b/common/cmd_cache.c index caa56da..c0f2cba 100644 --- a/common/cmd_cache.c +++ b/common/cmd_cache.c @@ -99,3 +99,3 @@ U_BOOT_CMD( icache, 2, 1, do_icache, - "icache - enable or disable instruction cache\n", + "enable or disable instruction cache", "[on, off]\n" @@ -106,3 +106,3 @@ U_BOOT_CMD( dcache, 2, 1, do_dcache, - "dcache - enable or disable data cache\n", + "enable or disable data cache", "[on, off]\n" diff --git a/common/cmd_console.c b/common/cmd_console.c index e2bc2a3..f861f83 100644 --- a/common/cmd_console.c +++ b/common/cmd_console.c @@ -67,3 +67,3 @@ U_BOOT_CMD( coninfo, 3, 1, do_coninfo, - "coninfo - print console devices and information\n", + "print console devices and information", "" diff --git a/common/cmd_cplbinfo.c b/common/cmd_cplbinfo.c index b2bbec1..629e6a9 100644 --- a/common/cmd_cplbinfo.c +++ b/common/cmd_cplbinfo.c @@ -56,3 +56,3 @@ int do_cplbinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(cplbinfo, 1, 0, do_cplbinfo, - "cplbinfo- display current CPLB tables\n", + "display current CPLB tables", "\n" diff --git a/common/cmd_date.c b/common/cmd_date.c index d6bd931..3d78be2 100644 --- a/common/cmd_date.c +++ b/common/cmd_date.c @@ -216,3 +216,3 @@ U_BOOT_CMD( date, 2, 1, do_date, - "date - get/set/reset date & time\n", + "get/set/reset date & time", "[MMDDhhmm[[CC]YY][.ss]]\ndate reset\n" diff --git a/common/cmd_dcr.c b/common/cmd_dcr.c index 7d382bb..7aed06c 100644 --- a/common/cmd_dcr.c +++ b/common/cmd_dcr.c @@ -225,3 +225,3 @@ U_BOOT_CMD( getdcr, 2, 1, do_getdcr, - "getdcr - Get an AMCC PPC 4xx DCR's value\n", + "Get an AMCC PPC 4xx DCR's value", "dcrn - return a DCR's value.\n" @@ -230,3 +230,3 @@ U_BOOT_CMD( setdcr, 2, 1, do_setdcr, - "setdcr - Set an AMCC PPC 4xx DCR's value\n", + "Set an AMCC PPC 4xx DCR's value", "dcrn - set a DCR's value.\n" @@ -236,3 +236,3 @@ U_BOOT_CMD( getidcr, 3, 1, do_getidcr, - "getidcr - Get a register value via indirect DCR addressing\n", + "Get a register value via indirect DCR addressing", "adr_dcrn[.dat_dcrn] offset - write offset to adr_dcrn, read value from dat_dcrn.\n" @@ -242,3 +242,3 @@ U_BOOT_CMD( setidcr, 4, 1, do_setidcr, - "setidcr - Set a register value via indirect DCR addressing\n", + "Set a register value via indirect DCR addressing", "adr_dcrn[.dat_dcrn] offset value - write offset to adr_dcrn, write value to dat_dcrn.\n" diff --git a/common/cmd_df.c b/common/cmd_df.c index c85b7a6..d64f900 100644 --- a/common/cmd_df.c +++ b/common/cmd_df.c @@ -35,3 +35,3 @@ U_BOOT_CMD( sf, 2, 1, do_serial_flash, - "sf - Serial flash sub-system\n", + "Serial flash sub-system", "probe [bus:]cs - init flash device on given SPI bus and CS\n") diff --git a/common/cmd_diag.c b/common/cmd_diag.c index 13d4225..c2a6175 100644 --- a/common/cmd_diag.c +++ b/common/cmd_diag.c @@ -68,3 +68,3 @@ U_BOOT_CMD( diag, CONFIG_SYS_MAXARGS, 0, do_diag, - "diag - perform board diagnostics\n", + "perform board diagnostics", " - print list of available tests\n" diff --git a/common/cmd_display.c b/common/cmd_display.c index 982e09d..4102424 100644 --- a/common/cmd_display.c +++ b/common/cmd_display.c @@ -73,3 +73,3 @@ U_BOOT_CMD( display, CONFIG_SYS_MAXARGS, 1, do_display, - "display- display string on dot matrix display\n", + "display string on dot matrix display", "[<string>]\n" diff --git a/common/cmd_doc.c b/common/cmd_doc.c index f139d42..e2d4a42 100644 --- a/common/cmd_doc.c +++ b/common/cmd_doc.c @@ -193,3 +193,3 @@ U_BOOT_CMD( doc, 5, 1, do_doc, - "doc - Disk-On-Chip sub-system\n", + "Disk-On-Chip sub-system", "info - show available DOC devices\n" @@ -339,3 +339,3 @@ U_BOOT_CMD( docboot, 4, 1, do_docboot, - "docboot - boot from DOC device\n", + "boot from DOC device", "loadAddr dev\n" diff --git a/common/cmd_dtt.c b/common/cmd_dtt.c index c5b1d4d..7783c88 100644 --- a/common/cmd_dtt.c +++ b/common/cmd_dtt.c @@ -57,3 +57,3 @@ U_BOOT_CMD( dtt, 1, 1, do_dtt, - "dtt - Digital Thermometer and Thermostat\n", + "Digital Thermometer and Thermostat", " - Read temperature from digital thermometer and thermostat.\n" diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c index c59227d..e598bf1 100644 --- a/common/cmd_eeprom.c +++ b/common/cmd_eeprom.c @@ -427,3 +427,3 @@ U_BOOT_CMD( eeprom, 6, 1, do_eeprom, - "eeprom - EEPROM sub-system\n", + "EEPROM sub-system", "read devaddr addr off cnt\n" @@ -435,3 +435,3 @@ U_BOOT_CMD( eeprom, 5, 1, do_eeprom, - "eeprom - EEPROM sub-system\n", + "EEPROM sub-system", "read addr off cnt\n" diff --git a/common/cmd_elf.c b/common/cmd_elf.c index 27a4b73..19e1249 100644 --- a/common/cmd_elf.c +++ b/common/cmd_elf.c @@ -312,3 +312,3 @@ U_BOOT_CMD( bootelf, 2, 0, do_bootelf, - "bootelf - Boot from an ELF image in memory\n", + "Boot from an ELF image in memory", " [address] - load address of ELF image.\n" @@ -318,3 +318,3 @@ U_BOOT_CMD( bootvx, 2, 0, do_bootvx, - "bootvx - Boot vxWorks from an ELF image\n", + "Boot vxWorks from an ELF image", " [address] - load address of vxWorks ELF image.\n" diff --git a/common/cmd_ext2.c b/common/cmd_ext2.c index 05a053b..c2dcc64 100644 --- a/common/cmd_ext2.c +++ b/common/cmd_ext2.c @@ -118,3 +118,3 @@ U_BOOT_CMD( ext2ls, 4, 1, do_ext2ls, - "ext2ls - list files in a directory (default /)\n", + "list files in a directory (default /)", "<interface> <dev[:part]> [directory]\n" @@ -254,3 +254,3 @@ U_BOOT_CMD( ext2load, 6, 0, do_ext2load, - "ext2load- load binary file from a Ext2 filesystem\n", + "load binary file from a Ext2 filesystem", "<interface> <dev[:part]> [addr] [filename] [bytes]\n" diff --git a/common/cmd_fat.c b/common/cmd_fat.c index ebe9e09..4a26b80 100644 --- a/common/cmd_fat.c +++ b/common/cmd_fat.c @@ -90,3 +90,3 @@ U_BOOT_CMD( fatload, 6, 0, do_fat_fsload, - "fatload - load binary file from a dos filesystem\n", + "load binary file from a dos filesystem", "<interface> <dev[:part]> <addr> <filename> [bytes]\n" @@ -138,3 +138,3 @@ U_BOOT_CMD( fatls, 4, 1, do_fat_ls, - "fatls - list files in a directory (default /)\n", + "list files in a directory (default /)", "<interface> <dev[:part]> [directory]\n" @@ -176,3 +176,3 @@ U_BOOT_CMD( fatinfo, 3, 1, do_fat_fsinfo, - "fatinfo - print information about filesystem\n", + "print information about filesystem", "<interface> <dev[:part]>\n" diff --git a/common/cmd_fdc.c b/common/cmd_fdc.c index c6265c3..c043b97 100644 --- a/common/cmd_fdc.c +++ b/common/cmd_fdc.c @@ -904,3 +904,3 @@ U_BOOT_CMD( fdcboot, 3, 1, do_fdcboot, - "fdcboot - boot from floppy device\n", + "boot from floppy device", "loadAddr drive\n" diff --git a/common/cmd_fdos.c b/common/cmd_fdos.c index 514c049..bcf98d9 100644 --- a/common/cmd_fdos.c +++ b/common/cmd_fdos.c @@ -144,3 +144,3 @@ U_BOOT_CMD( fdosboot, 3, 0, do_fdosboot, - "fdosboot- boot from a dos floppy file\n", + "boot from a dos floppy file", "[loadAddr] [filename]\n" @@ -150,3 +150,3 @@ U_BOOT_CMD( fdosls, 2, 0, do_fdosls, - "fdosls - list files in a directory\n", + "list files in a directory", "[directory]\n" diff --git a/common/cmd_fdt.c b/common/cmd_fdt.c index a36ca20..0947b72 100644 --- a/common/cmd_fdt.c +++ b/common/cmd_fdt.c @@ -821,3 +821,3 @@ U_BOOT_CMD( fdt, 255, 0, do_fdt, - "fdt - flattened device tree utility commands\n", + "flattened device tree utility commands", "addr <addr> [<length>] - Set the fdt location to <addr>\n" diff --git a/common/cmd_flash.c b/common/cmd_flash.c index 2df40f0..510654e 100644 --- a/common/cmd_flash.c +++ b/common/cmd_flash.c @@ -712,3 +712,3 @@ U_BOOT_CMD( flinfo, 2, 1, do_flinfo, - "flinfo - print FLASH memory information\n", + "print FLASH memory information", "\n - print information for all FLASH memory banks\n" @@ -719,3 +719,3 @@ U_BOOT_CMD( erase, 3, 0, do_flerase, - "erase - erase FLASH memory\n", + "erase FLASH memory", "start end\n" @@ -733,3 +733,3 @@ U_BOOT_CMD( protect, 4, 0, do_protect, - "protect - enable or disable FLASH write protection\n", + "enable or disable FLASH write protection", "on start end\n" diff --git a/common/cmd_fpga.c b/common/cmd_fpga.c index 4abb86e..362bffd 100644 --- a/common/cmd_fpga.c +++ b/common/cmd_fpga.c @@ -352,3 +352,3 @@ static int fpga_get_op (char *opstr) U_BOOT_CMD (fpga, 6, 1, do_fpga, - "fpga - loadable FPGA image support\n", + "loadable FPGA image support", "fpga [operation type] [device number] [image address] [image size]\n" diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c index 170ebc7..16439ac 100644 --- a/common/cmd_i2c.c +++ b/common/cmd_i2c.c @@ -1305,3 +1305,3 @@ U_BOOT_CMD( i2c, 6, 1, do_i2c, - "i2c - I2C sub-system\n", + "I2C sub-system", #if defined(CONFIG_I2C_MUX) @@ -1328,3 +1328,3 @@ U_BOOT_CMD( imd, 4, 1, do_i2c_md, \ - "imd - i2c memory display\n", \ + "i2c memory display", \ "chip address[.0, .1, .2] [# of objects]\n - i2c memory display\n" \ @@ -1334,3 +1334,3 @@ U_BOOT_CMD( imm, 3, 1, do_i2c_mm, - "imm - i2c memory modify (auto-incrementing)\n", + "i2c memory modify (auto-incrementing)", "chip address[.0, .1, .2]\n" @@ -1340,3 +1340,3 @@ U_BOOT_CMD( inm, 3, 1, do_i2c_nm, - "inm - memory modify (constant address)\n", + "memory modify (constant address)", "chip address[.0, .1, .2]\n - memory modify, read and keep address\n" @@ -1346,3 +1346,3 @@ U_BOOT_CMD( imw, 5, 1, do_i2c_mw, - "imw - memory write (fill)\n", + "memory write (fill)", "chip address[.0, .1, .2] value [count]\n - memory write (fill)\n" @@ -1352,3 +1352,3 @@ U_BOOT_CMD( icrc32, 5, 1, do_i2c_crc, - "icrc32 - checksum calculation\n", + "checksum calculation", "chip address[.0, .1, .2] count\n - compute CRC32 checksum\n" @@ -1358,3 +1358,3 @@ U_BOOT_CMD( iprobe, 1, 1, do_i2c_probe, - "iprobe - probe to discover valid I2C chip addresses\n", + "probe to discover valid I2C chip addresses", "\n -discover valid I2C chip addresses\n" @@ -1367,3 +1367,3 @@ U_BOOT_CMD( iloop, 5, 1, do_i2c_loop, - "iloop - infinite loop on address range\n", + "infinite loop on address range", "chip address[.0, .1, .2] [# of objects]\n" @@ -1375,3 +1375,3 @@ U_BOOT_CMD( isdram, 2, 1, do_sdram, - "isdram - print SDRAM configuration information\n", + "print SDRAM configuration information", "chip\n - print SDRAM configuration information\n" diff --git a/common/cmd_ide.c b/common/cmd_ide.c index 3afa38d..c9b9a47 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -2142,3 +2142,3 @@ U_BOOT_CMD( ide, 5, 1, do_ide, - "ide - IDE sub-system\n", + "IDE sub-system", "reset - reset IDE controller\n" @@ -2155,3 +2155,3 @@ U_BOOT_CMD( diskboot, 3, 1, do_diskboot, - "diskboot- boot from IDE device\n", + "boot from IDE device", "loadAddr dev:part\n" diff --git a/common/cmd_immap.c b/common/cmd_immap.c index 13ad94e..c8367f0 100644 --- a/common/cmd_immap.c +++ b/common/cmd_immap.c @@ -616,3 +616,3 @@ U_BOOT_CMD( siuinfo, 1, 1, do_siuinfo, - "siuinfo - print System Interface Unit (SIU) registers\n", + "print System Interface Unit (SIU) registers", NULL @@ -622,3 +622,3 @@ U_BOOT_CMD( memcinfo, 1, 1, do_memcinfo, - "memcinfo- print Memory Controller registers\n", + "print Memory Controller registers", NULL @@ -628,3 +628,3 @@ U_BOOT_CMD( sitinfo, 1, 1, do_sitinfo, - "sitinfo - print System Integration Timers (SIT) registers\n", + "print System Integration Timers (SIT) registers", NULL @@ -635,3 +635,3 @@ U_BOOT_CMD( icinfo, 1, 1, do_icinfo, - "icinfo - print Interrupt Controller registers\n", + "print Interrupt Controller registers", NULL @@ -642,3 +642,3 @@ U_BOOT_CMD( carinfo, 1, 1, do_carinfo, - "carinfo - print Clocks and Reset registers\n", + "print Clocks and Reset registers", NULL @@ -648,3 +648,3 @@ U_BOOT_CMD( iopinfo, 1, 1, do_iopinfo, - "iopinfo - print I/O Port registers\n", + "print I/O Port registers", NULL @@ -654,3 +654,3 @@ U_BOOT_CMD( iopset, 5, 0, do_iopset, - "iopset - set I/O Port registers\n", + "set I/O Port registers", "PORT PIN CMD VALUE\nPORT: A-D, PIN: 0-31, CMD: [dat|dir|odr|sor], VALUE: 0|1" @@ -660,3 +660,3 @@ U_BOOT_CMD( dmainfo, 1, 1, do_dmainfo, - "dmainfo - print SDMA/IDMA registers\n", + "print SDMA/IDMA registers", NULL @@ -666,3 +666,3 @@ U_BOOT_CMD( fccinfo, 1, 1, do_fccinfo, - "fccinfo - print FCC registers\n", + "print FCC registers", NULL @@ -672,3 +672,3 @@ U_BOOT_CMD( brginfo, 1, 1, do_brginfo, - "brginfo - print Baud Rate Generator (BRG) registers\n", + "print Baud Rate Generator (BRG) registers", NULL @@ -678,3 +678,3 @@ U_BOOT_CMD( i2cinfo, 1, 1, do_i2cinfo, - "i2cinfo - print I2C registers\n", + "print I2C registers", NULL @@ -684,3 +684,3 @@ U_BOOT_CMD( sccinfo, 1, 1, do_sccinfo, - "sccinfo - print SCC registers\n", + "print SCC registers", NULL @@ -690,3 +690,3 @@ U_BOOT_CMD( smcinfo, 1, 1, do_smcinfo, - "smcinfo - print SMC registers\n", + "print SMC registers", NULL @@ -696,3 +696,3 @@ U_BOOT_CMD( spiinfo, 1, 1, do_spiinfo, - "spiinfo - print Serial Peripheral Interface (SPI) registers\n", + "print Serial Peripheral Interface (SPI) registers", NULL @@ -702,3 +702,3 @@ U_BOOT_CMD( muxinfo, 1, 1, do_muxinfo, - "muxinfo - print CPM Multiplexing registers\n", + "print CPM Multiplexing registers", NULL @@ -708,3 +708,3 @@ U_BOOT_CMD( siinfo, 1, 1, do_siinfo, - "siinfo - print Serial Interface (SI) registers\n", + "print Serial Interface (SI) registers", NULL @@ -714,3 +714,3 @@ U_BOOT_CMD( mccinfo, 1, 1, do_mccinfo, - "mccinfo - print MCC registers\n", + "print MCC registers", NULL diff --git a/common/cmd_irq.c b/common/cmd_irq.c index a47cde4..a21aede 100644 --- a/common/cmd_irq.c +++ b/common/cmd_irq.c @@ -46,3 +46,3 @@ U_BOOT_CMD( interrupts, 5, 0, do_interrupts, - "interrupts - enable or disable interrupts\n", + "enable or disable interrupts", "[on, off]\n" diff --git a/common/cmd_itest.c b/common/cmd_itest.c index b3025e3..309b08b 100644 --- a/common/cmd_itest.c +++ b/common/cmd_itest.c @@ -192,3 +192,3 @@ U_BOOT_CMD( itest, 4, 0, do_itest, - "itest\t- return true/false on integer compare\n", + "return true/false on integer compare", "[.b, .w, .l, .s] [*]value1 <op> [*]value2\n" diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c index cd4d24b..d19677c 100644 --- a/common/cmd_jffs2.c +++ b/common/cmd_jffs2.c @@ -2207,3 +2207,3 @@ U_BOOT_CMD( fsload, 3, 0, do_jffs2_fsload, - "fsload\t- load binary file from a filesystem image\n", + "load binary file from a filesystem image", "[ off ] [ filename ]\n" @@ -2214,3 +2214,3 @@ U_BOOT_CMD( ls, 2, 1, do_jffs2_ls, - "ls\t- list files in a directory (default /)\n", + "list files in a directory (default /)", "[ directory ]\n" @@ -2221,3 +2221,3 @@ U_BOOT_CMD( fsinfo, 1, 1, do_jffs2_fsinfo, - "fsinfo\t- print information about filesystems\n", + "print information about filesystems", " - print information about filesystems\n" @@ -2228,3 +2228,3 @@ U_BOOT_CMD( chpart, 2, 0, do_jffs2_chpart, - "chpart\t- change active partition\n", + "change active partition", "part-id\n" @@ -2235,3 +2235,3 @@ U_BOOT_CMD( mtdparts, 6, 0, do_jffs2_mtdparts, - "mtdparts- define flash/nand partitions\n", + "define flash/nand partitions", "\n" diff --git a/common/cmd_license.c b/common/cmd_license.c index 301af8d..c3c3496 100644 --- a/common/cmd_license.c +++ b/common/cmd_license.c @@ -55,3 +55,3 @@ int do_license(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(license, 1, 1, do_license, - "license - print GPL license text\n", + "print GPL license text", NULL); diff --git a/common/cmd_load.c b/common/cmd_load.c index 350d7a3..88fba88 100644 --- a/common/cmd_load.c +++ b/common/cmd_load.c @@ -1047,3 +1047,3 @@ U_BOOT_CMD( loads, 3, 0, do_load_serial, - "loads - load S-Record file over serial line\n", + "load S-Record file over serial line", "[ off ] [ baud ]\n" @@ -1056,3 +1056,3 @@ U_BOOT_CMD( loads, 2, 0, do_load_serial, - "loads - load S-Record file over serial line\n", + "load S-Record file over serial line", "[ off ]\n" @@ -1071,3 +1071,3 @@ U_BOOT_CMD( saves, 4, 0, do_save_serial, - "saves - save S-Record file over serial line\n", + "save S-Record file over serial line", "[ off ] [size] [ baud ]\n" @@ -1079,3 +1079,3 @@ U_BOOT_CMD( saves, 3, 0, do_save_serial, - "saves - save S-Record file over serial line\n", + "save S-Record file over serial line", "[ off ] [size]\n" @@ -1091,3 +1091,3 @@ U_BOOT_CMD( loadb, 3, 0, do_load_serial_bin, - "loadb - load binary file over serial line (kermit mode)\n", + "load binary file over serial line (kermit mode)", "[ off ] [ baud ]\n" @@ -1099,3 +1099,3 @@ U_BOOT_CMD( loady, 3, 0, do_load_serial_bin, - "loady - load binary file over serial line (ymodem mode)\n", + "load binary file over serial line (ymodem mode)", "[ off ] [ baud ]\n" @@ -1131,3 +1131,3 @@ U_BOOT_CMD( hwflow, 2, 0, do_hwflow, - "hwflow - turn the harwdare flow control on/off\n", + "turn the harwdare flow control on/off", "[on|off]\n - change RTS/CTS hardware flow control over serial line\n" diff --git a/common/cmd_log.c b/common/cmd_log.c index 6f8a27f..a03835d 100644 --- a/common/cmd_log.c +++ b/common/cmd_log.c @@ -254,3 +254,3 @@ U_BOOT_CMD( log, 255, 1, do_log, - "log - manipulate logbuffer\n", + "manipulate logbuffer", "info - show pointer details\n" diff --git a/common/cmd_mac.c b/common/cmd_mac.c index 4453299..cf601e4 100644 --- a/common/cmd_mac.c +++ b/common/cmd_mac.c @@ -30,3 +30,3 @@ U_BOOT_CMD( mac, 3, 1, do_mac, - "mac - display and program the system ID and MAC addresses in EEPROM\n", + "display and program the system ID and MAC addresses in EEPROM", "[read|save|id|num|errata|date|ports|0|1|2|3|4|5|6|7]\n" diff --git a/common/cmd_mem.c b/common/cmd_mem.c index 67bbf8d..12a8c64 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -1199,3 +1199,3 @@ U_BOOT_CMD( md, 3, 1, do_mem_md, - "md - memory display\n", + "memory display", "[.b, .w, .l] address [# of objects]\n - memory display\n" @@ -1206,3 +1206,3 @@ U_BOOT_CMD( mm, 2, 1, do_mem_mm, - "mm - memory modify (auto-incrementing)\n", + "memory modify (auto-incrementing)", "[.b, .w, .l] address\n" " - memory modify, auto increment address\n" @@ -1213,3 +1213,3 @@ U_BOOT_CMD( nm, 2, 1, do_mem_nm, - "nm - memory modify (constant address)\n", + "memory modify (constant address)", "[.b, .w, .l] address\n - memory modify, read and keep address\n" @@ -1219,3 +1219,3 @@ U_BOOT_CMD( mw, 4, 1, do_mem_mw, - "mw - memory write (fill)\n", + "memory write (fill)", "[.b, .w, .l] address value [count]\n - write memory\n" @@ -1225,3 +1225,3 @@ U_BOOT_CMD( cp, 4, 1, do_mem_cp, - "cp - memory copy\n", + "memory copy", "[.b, .w, .l] source target count\n - copy memory\n" @@ -1231,3 +1231,3 @@ U_BOOT_CMD( cmp, 4, 1, do_mem_cmp, - "cmp - memory compare\n", + "memory compare", "[.b, .w, .l] addr1 addr2 count\n - compare memory\n" @@ -1239,3 +1239,3 @@ U_BOOT_CMD( crc32, 4, 1, do_mem_crc, - "crc32 - checksum calculation\n", + "checksum calculation", "address count [addr]\n - compute CRC32 checksum [save at addr]\n" @@ -1247,3 +1247,3 @@ U_BOOT_CMD( crc32, 5, 1, do_mem_crc, - "crc32 - checksum calculation\n", + "checksum calculation", "address count [addr]\n - compute CRC32 checksum [save at addr]\n" @@ -1256,3 +1256,3 @@ U_BOOT_CMD( base, 2, 1, do_mem_base, - "base - print or set address offset\n", + "print or set address offset", "\n - print address offset for memory commands\n" @@ -1263,3 +1263,3 @@ U_BOOT_CMD( loop, 3, 1, do_mem_loop, - "loop - infinite loop on address range\n", + "infinite loop on address range", "[.b, .w, .l] address number_of_objects\n" @@ -1271,3 +1271,3 @@ U_BOOT_CMD( loopw, 4, 1, do_mem_loopw, - "loopw - infinite write loop on address range\n", + "infinite write loop on address range", "[.b, .w, .l] address number_of_objects data_to_write\n" @@ -1279,3 +1279,3 @@ U_BOOT_CMD( mtest, 4, 1, do_mem_mtest, - "mtest - simple RAM test\n", + "simple RAM test", "[start [end [pattern]]]\n" @@ -1287,3 +1287,3 @@ U_BOOT_CMD( mdc, 4, 1, do_mem_mdc, - "mdc - memory display cyclic\n", + "memory display cyclic", "[.b, .w, .l] address count delay(ms)\n - memory display cyclic\n" @@ -1293,3 +1293,3 @@ U_BOOT_CMD( mwc, 4, 1, do_mem_mwc, - "mwc - memory write cyclic\n", + "memory write cyclic", "[.b, .w, .l] address value delay(ms)\n - memory write cyclic\n" @@ -1301,3 +1301,3 @@ U_BOOT_CMD( unzip, 4, 1, do_unzip, - "unzip - unzip a memory region\n", + "unzip a memory region", "srcaddr dstaddr [dstsize]\n" diff --git a/common/cmd_mfsl.c b/common/cmd_mfsl.c index db2a994..6470bac 100644 --- a/common/cmd_mfsl.c +++ b/common/cmd_mfsl.c @@ -391,3 +391,3 @@ int do_rspr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD (frd, 3, 1, do_frd, - "frd - read data from FSL\n", + "read data from FSL", "- [fslnum [0|1|2|3]]\n" @@ -400,3 +400,3 @@ U_BOOT_CMD (frd, 3, 1, do_frd, U_BOOT_CMD (fwr, 4, 1, do_fwr, - "fwr - write data to FSL\n", + "write data to FSL", "- [fslnum [0|1|2|3]]\n" @@ -408,3 +408,3 @@ U_BOOT_CMD (fwr, 4, 1, do_fwr, U_BOOT_CMD (rspr, 3, 1, do_rspr, - "rspr - read/write special purpose register\n", + "read/write special purpose register", "- reg_num [write value] read/write special purpose register\n" diff --git a/common/cmd_mii.c b/common/cmd_mii.c index 19a7fbd..d70031a 100644 --- a/common/cmd_mii.c +++ b/common/cmd_mii.c @@ -455,3 +455,3 @@ U_BOOT_CMD( mii, 5, 1, do_mii, - "mii - MII utility commands\n", + "MII utility commands", "device - list available devices\n" diff --git a/common/cmd_misc.c b/common/cmd_misc.c index c29f52b..024299a 100644 --- a/common/cmd_misc.c +++ b/common/cmd_misc.c @@ -57,3 +57,3 @@ U_BOOT_CMD( irqinfo, 1, 1, do_irqinfo, - "irqinfo - print information about IRQs\n", + "print information about IRQs", NULL @@ -64,3 +64,3 @@ U_BOOT_CMD( sleep , 2, 1, do_sleep, - "sleep - delay execution for some time\n", + "delay execution for some time", "N\n" diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c index 25c9702..473825e 100644 --- a/common/cmd_mmc.c +++ b/common/cmd_mmc.c @@ -38,3 +38,3 @@ U_BOOT_CMD( mmcinit, 1, 0, do_mmc, - "mmcinit - init mmc card\n", + "init mmc card", NULL diff --git a/common/cmd_mp.c b/common/cmd_mp.c index d8e3ab2..a0839c2 100644 --- a/common/cmd_mp.c +++ b/common/cmd_mp.c @@ -85,3 +85,3 @@ U_BOOT_CMD( cpu, CONFIG_SYS_MAXARGS, 1, cpu_cmd, - "cpu - Multiprocessor CPU boot manipulation and release\n", + "Multiprocessor CPU boot manipulation and release", "<num> reset - Reset cpu <num>\n" diff --git a/common/cmd_nand.c b/common/cmd_nand.c index a2a2202..e636f58 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -471,3 +471,3 @@ usage: U_BOOT_CMD(nand, 5, 1, do_nand, - "nand - NAND sub-system\n", + "NAND sub-system", "info - show available NAND devices\n" @@ -664,3 +664,3 @@ usage: U_BOOT_CMD(nboot, 4, 1, do_nandboot, - "nboot - boot from NAND device\n", + "boot from NAND device", "[partition] | [[[loadAddr] dev] offset]\n"); @@ -924,3 +924,3 @@ U_BOOT_CMD( nand, 5, 1, do_nand, - "nand - legacy NAND sub-system\n", + "legacy NAND sub-system", "info - show available NAND devices\n" @@ -1073,3 +1073,3 @@ U_BOOT_CMD( nboot, 4, 1, do_nandboot, - "nboot - boot from NAND device\n", + "boot from NAND device", "loadAddr dev\n" diff --git a/common/cmd_net.c b/common/cmd_net.c index b627c38..a687849 100644 --- a/common/cmd_net.c +++ b/common/cmd_net.c @@ -41,3 +41,3 @@ U_BOOT_CMD( bootp, 3, 1, do_bootp, - "bootp\t- boot image via network using BOOTP/TFTP protocol\n", + "boot image via network using BOOTP/TFTP protocol", "[loadAddress] [[hostIPaddr:]bootfilename]\n" @@ -52,3 +52,3 @@ U_BOOT_CMD( tftpboot, 3, 1, do_tftpb, - "tftpboot- boot image via network using TFTP protocol\n", + "boot image via network using TFTP protocol", "[loadAddress] [[hostIPaddr:]bootfilename]\n" @@ -63,3 +63,3 @@ U_BOOT_CMD( rarpboot, 3, 1, do_rarpb, - "rarpboot- boot image via network using RARP/TFTP protocol\n", + "boot image via network using RARP/TFTP protocol", "[loadAddress] [[hostIPaddr:]bootfilename]\n" @@ -75,3 +75,3 @@ U_BOOT_CMD( dhcp, 3, 1, do_dhcp, - "dhcp\t- boot image via network using DHCP/TFTP protocol\n", + "boot image via network using DHCP/TFTP protocol", "[loadAddress] [[hostIPaddr:]bootfilename]\n" @@ -88,3 +88,3 @@ U_BOOT_CMD( nfs, 3, 1, do_nfs, - "nfs\t- boot image via network using NFS protocol\n", + "boot image via network using NFS protocol", "[loadAddress] [[hostIPaddr:]bootfilename]\n" @@ -269,3 +269,3 @@ U_BOOT_CMD( ping, 2, 1, do_ping, - "ping\t- send ICMP ECHO_REQUEST to network host\n", + "send ICMP ECHO_REQUEST to network host", "pingAddress\n" @@ -313,3 +313,3 @@ U_BOOT_CMD( cdp, 1, 1, do_cdp, - "cdp\t- Perform CDP network configuration\n", + "Perform CDP network configuration", ); @@ -350,3 +350,3 @@ U_BOOT_CMD( sntp, 2, 1, do_sntp, - "sntp\t- synchronize RTC via network\n", + "synchronize RTC via network", "[NTP server IP]\n" diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index abcc914..6864b9e 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -589,3 +589,3 @@ U_BOOT_CMD( printenv, CONFIG_SYS_MAXARGS, 1, do_printenv, - "printenv- print environment variables\n", + "print environment variables", "\n - print values of all environment variables\n" @@ -597,3 +597,3 @@ U_BOOT_CMD( setenv, CONFIG_SYS_MAXARGS, 0, do_setenv, - "setenv - set environment variables\n", + "set environment variables", "name value ...\n" @@ -611,3 +611,3 @@ U_BOOT_CMD( saveenv, 1, 0, do_saveenv, - "saveenv - save environment variables to persistent storage\n", + "save environment variables to persistent storage", NULL @@ -621,3 +621,3 @@ U_BOOT_CMD( askenv, CONFIG_SYS_MAXARGS, 1, do_askenv, - "askenv - get environment variables from stdin\n", + "get environment variables from stdin", "name [message] [size]\n" @@ -638,3 +638,3 @@ U_BOOT_CMD( run, CONFIG_SYS_MAXARGS, 1, do_run, - "run - run commands in an environment variable\n", + "run commands in an environment variable", "var [...]\n" diff --git a/common/cmd_onenand.c b/common/cmd_onenand.c index b0f6fee..6e6c72b 100644 --- a/common/cmd_onenand.c +++ b/common/cmd_onenand.c @@ -168,3 +168,3 @@ U_BOOT_CMD( onenand, 6, 1, do_onenand, - "onenand - OneNAND sub-system\n", + "OneNAND sub-system", "info - show available OneNAND devices\n" diff --git a/common/cmd_otp.c b/common/cmd_otp.c index bdf2e6a..e27bb29 100644 --- a/common/cmd_otp.c +++ b/common/cmd_otp.c @@ -157,3 +157,3 @@ int do_otp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(otp, 6, 0, do_otp, - "otp - One-Time-Programmable sub-system\n", + "One-Time-Programmable sub-system", "read <addr> <page> [count] [half]\n" diff --git a/common/cmd_pci.c b/common/cmd_pci.c index 110415e..4a9317f 100644 --- a/common/cmd_pci.c +++ b/common/cmd_pci.c @@ -545,3 +545,3 @@ U_BOOT_CMD( pci, 5, 1, do_pci, - "pci - list and access PCI Configuration Space\n", + "list and access PCI Configuration Space", "[bus] [long]\n" diff --git a/common/cmd_pcmcia.c b/common/cmd_pcmcia.c index 23fad3b..e448456 100644 --- a/common/cmd_pcmcia.c +++ b/common/cmd_pcmcia.c @@ -90,3 +90,3 @@ U_BOOT_CMD( pinit, 2, 0, do_pinit, - "pinit - PCMCIA sub-system\n", + "PCMCIA sub-system", "on - power on PCMCIA socket\n" diff --git a/common/cmd_portio.c b/common/cmd_portio.c index b318ff0..41b1991 100644 --- a/common/cmd_portio.c +++ b/common/cmd_portio.c @@ -95,3 +95,3 @@ U_BOOT_CMD( out, 3, 1, do_portio_out, - "out - write datum to IO port\n", + "write datum to IO port", "[.b, .w, .l] port value\n - output to IO port\n" @@ -159,3 +159,3 @@ U_BOOT_CMD( in, 2, 1, do_portio_in, - "in - read data from an IO port\n", + "read data from an IO port", "[.b, .w, .l] port\n" diff --git a/common/cmd_reginfo.c b/common/cmd_reginfo.c index 4c8e61a..0e28c05 100644 --- a/common/cmd_reginfo.c +++ b/common/cmd_reginfo.c @@ -384,3 +384,3 @@ U_BOOT_CMD( reginfo, 2, 1, do_reginfo, - "reginfo - print register information\n", + "print register information", ); diff --git a/common/cmd_reiser.c b/common/cmd_reiser.c index a2f2286..14e4bd4 100644 --- a/common/cmd_reiser.c +++ b/common/cmd_reiser.c @@ -104,3 +104,3 @@ U_BOOT_CMD( reiserls, 4, 1, do_reiserls, - "reiserls- list files in a directory (default /)\n", + "list files in a directory (default /)", "<interface> <dev[:part]> [directory]\n" @@ -234,3 +234,3 @@ U_BOOT_CMD( reiserload, 6, 0, do_reiserload, - "reiserload- load binary file from a Reiser filesystem\n", + "load binary file from a Reiser filesystem", "<interface> <dev[:part]> [addr] [filename] [bytes]\n" diff --git a/common/cmd_sata.c b/common/cmd_sata.c index 2d976df..e60908b 100644 --- a/common/cmd_sata.c +++ b/common/cmd_sata.c @@ -187,3 +187,3 @@ U_BOOT_CMD( sata, 5, 1, do_sata, - "sata - SATA sub system\n", + "SATA sub system", "sata info - show available SATA devices\n" diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c index 8aae9fc..dd2c1ae 100644 --- a/common/cmd_scsi.c +++ b/common/cmd_scsi.c @@ -618,3 +618,3 @@ U_BOOT_CMD( scsi, 5, 1, do_scsi, - "scsi - SCSI sub-system\n", + "SCSI sub-system", "reset - reset SCSI controller\n" @@ -630,3 +630,3 @@ U_BOOT_CMD( scsiboot, 3, 1, do_scsiboot, - "scsiboot- boot from SCSI device\n", + "boot from SCSI device", "loadAddr dev:part\n" diff --git a/common/cmd_setexpr.c b/common/cmd_setexpr.c index 4125b18..9a5e720 100644 --- a/common/cmd_setexpr.c +++ b/common/cmd_setexpr.c @@ -65,3 +65,3 @@ U_BOOT_CMD( setexpr, 5, 0, do_setexpr, - "setexpr - set environment variable as the result of eval expression\n", + "set environment variable as the result of eval expression", "name value1 <op> value2\n" diff --git a/common/cmd_sf.c b/common/cmd_sf.c index 6dc522d..6a60b16 100644 --- a/common/cmd_sf.c +++ b/common/cmd_sf.c @@ -183,3 +183,3 @@ U_BOOT_CMD( sf, 5, 1, do_spi_flash, - "sf - SPI flash sub-system\n", + "SPI flash sub-system", "probe [bus:]cs [hz] [mode] - init flash device on given SPI bus\n" diff --git a/common/cmd_spi.c b/common/cmd_spi.c index 1f0727b..746d14f 100644 --- a/common/cmd_spi.c +++ b/common/cmd_spi.c @@ -140,3 +140,3 @@ U_BOOT_CMD( sspi, 5, 1, do_spi, - "sspi - SPI utility commands\n", + "SPI utility commands", "<device> <bit_len> <dout> - Send <bit_len> bits from <dout> out the SPI\n" diff --git a/common/cmd_strings.c b/common/cmd_strings.c index 6f0cbca..4517ba2 100644 --- a/common/cmd_strings.c +++ b/common/cmd_strings.c @@ -43,3 +43,3 @@ int do_strings(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(strings, 3, 1, do_strings, - "strings - display strings\n", + "display strings", "<addr> [byte count]\n" diff --git a/common/cmd_terminal.c b/common/cmd_terminal.c index 67a2546..fd3dd48 100644 --- a/common/cmd_terminal.c +++ b/common/cmd_terminal.c @@ -89,3 +89,3 @@ U_BOOT_CMD( terminal, 3, 1, do_terminal, - "terminal - start terminal emulator\n", + "start terminal emulator", "" diff --git a/common/cmd_ubi.c b/common/cmd_ubi.c index 305e2e1..b99fd58 100644 --- a/common/cmd_ubi.c +++ b/common/cmd_ubi.c @@ -602,3 +602,3 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(ubi, 6, 1, do_ubi, - "ubi - ubi commands\n", + "ubi commands", "part [nand|nor|onenand] [part]" diff --git a/common/cmd_universe.c b/common/cmd_universe.c index ea97782..bfb91b5 100644 --- a/common/cmd_universe.c +++ b/common/cmd_universe.c @@ -366,3 +366,3 @@ U_BOOT_CMD( universe, 8, 1, do_universe, - "universe- initialize and configure Turndra Universe\n", + "initialize and configure Turndra Universe", "init\n" diff --git a/common/cmd_usb.c b/common/cmd_usb.c index 46d6eea..423a29f 100644 --- a/common/cmd_usb.c +++ b/common/cmd_usb.c @@ -668,3 +668,3 @@ U_BOOT_CMD( usb, 5, 1, do_usb, - "usb - USB sub-system\n", + "USB sub-system", "reset - reset (rescan) USB controller\n" @@ -684,3 +684,3 @@ U_BOOT_CMD( usbboot, 3, 1, do_usbboot, - "usbboot - boot from USB device\n", + "boot from USB device", "loadAddr dev:part\n" @@ -691,3 +691,3 @@ U_BOOT_CMD( usb, 5, 1, do_usb, - "usb - USB sub-system\n", + "USB sub-system", "reset - reset (rescan) USB controller\n" diff --git a/common/cmd_vfd.c b/common/cmd_vfd.c index ef4dd83..84d9530 100644 --- a/common/cmd_vfd.c +++ b/common/cmd_vfd.c @@ -69,3 +69,3 @@ U_BOOT_CMD( vfd, 2, 0, do_vfd, - "vfd - load a bitmap to the VFDs on TRAB\n", + "load a bitmap to the VFDs on TRAB", "/N\n" diff --git a/common/cmd_ximg.c b/common/cmd_ximg.c index 2753389..a45d248 100644 --- a/common/cmd_ximg.c +++ b/common/cmd_ximg.c @@ -182,3 +182,3 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(imxtract, 4, 1, do_imgextract, - "imxtract- extract a part of a multi-image\n", + "extract a part of a multi-image", "addr part [dest]\n" diff --git a/common/cmd_yaffs2.c b/common/cmd_yaffs2.c index 3732f7f..c47ea76 100644 --- a/common/cmd_yaffs2.c +++ b/common/cmd_yaffs2.c @@ -144,3 +144,3 @@ U_BOOT_CMD( ymount, 3, 0, do_ymount, - "ymount\t- mount yaffs\n", + "mount yaffs", "\n" @@ -150,3 +150,3 @@ U_BOOT_CMD( yumount, 3, 0, do_yumount, - "yumount\t- unmount yaffs\n", + "unmount yaffs", "\n" @@ -156,3 +156,3 @@ U_BOOT_CMD( yls, 4, 0, do_yls, - "yls\t- yaffs ls\n", + "yaffs ls", "[-l] name\n" @@ -162,3 +162,3 @@ U_BOOT_CMD( yrd, 2, 0, do_yrd, - "yrd\t- read file from yaffs\n", + "read file from yaffs", "filename\n" @@ -168,3 +168,3 @@ U_BOOT_CMD( ywr, 4, 0, do_ywr, - "ywr\t- write file to yaffs\n", + "write file to yaffs", "filename value num_vlues\n" @@ -174,3 +174,3 @@ U_BOOT_CMD( yrdm, 3, 0, do_yrdm, - "yrdm\t- read file to memory from yaffs\n", + "read file to memory from yaffs", "filename offset\n" @@ -180,3 +180,3 @@ U_BOOT_CMD( ywrm, 4, 0, do_ywrm, - "ywrm\t- write file from memory to yaffs\n", + "write file from memory to yaffs", "filename offset size\n" @@ -186,3 +186,3 @@ U_BOOT_CMD( ymkdir, 2, 0, do_ymkdir, - "ymkdir\t- YAFFS mkdir\n", + "YAFFS mkdir", "dirname\n" @@ -192,3 +192,3 @@ U_BOOT_CMD( yrmdir, 2, 0, do_yrmdir, - "yrmdir\t- YAFFS rmdir\n", + "YAFFS rmdir", "dirname\n" @@ -198,3 +198,3 @@ U_BOOT_CMD( yrm, 2, 0, do_yrm, - "yrm\t- YAFFS rm\n", + "YAFFS rm", "path\n" @@ -204,3 +204,3 @@ U_BOOT_CMD( ymv, 4, 0, do_ymv, - "ymv\t- YAFFS mv\n", + "YAFFS mv", "oldPath newPath\n" @@ -210,3 +210,3 @@ U_BOOT_CMD( ydump, 2, 0, do_ydump, - "ydump\t- YAFFS device struct\n", + "YAFFS device struct", "dirname\n" diff --git a/common/command.c b/common/command.c index c396648..05875a4 100644 --- a/common/command.c +++ b/common/command.c @@ -40,3 +40,3 @@ U_BOOT_CMD( version, 1, 1, do_version, - "version - print monitor version\n", + "print monitor version", NULL @@ -73,3 +73,3 @@ U_BOOT_CMD( echo, CONFIG_SYS_MAXARGS, 1, do_echo, - "echo - echo args to console\n", + "echo args to console", "[args..]\n" @@ -205,3 +205,3 @@ U_BOOT_CMD( test, CONFIG_SYS_MAXARGS, 1, do_test, - "test - minimal test like /bin/sh\n", + "minimal test like /bin/sh", "[args..]\n" @@ -224,3 +224,3 @@ U_BOOT_CMD( exit, 2, 1, do_exit, - "exit - exit script\n", + "exit script", " - exit functionality\n" @@ -279,3 +279,4 @@ int do_help (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) continue; - puts (usage); + printf("%-*s- %s\n", CONFIG_SYS_HELP_CMD_WIDTH, + cmd_array[i]->name, usage); } @@ -301,3 +302,3 @@ int do_help (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) if (cmdtp->usage) - puts (cmdtp->usage); + printf ("%s - %s\n", cmdtp->name, cmdtp->usage); #endif /* CONFIG_SYS_LONGHELP */ @@ -317,3 +318,3 @@ U_BOOT_CMD( help, CONFIG_SYS_MAXARGS, 1, do_help, - "help - print online help\n", + "print online help", "[command ...]\n" @@ -330,3 +331,3 @@ cmd_tbl_t __u_boot_cmd_question_mark Struct_Section = { "?", CONFIG_SYS_MAXARGS, 1, do_help, - "? - alias for 'help'\n", + "alias for 'help'", NULL @@ -336,3 +337,3 @@ cmd_tbl_t __u_boot_cmd_question_mark Struct_Section = { "?", CONFIG_SYS_MAXARGS, 1, do_help, - "? - alias for 'help'\n" + "alias for 'help'" }; @@ -383,3 +384,3 @@ void cmd_usage(cmd_tbl_t *cmdtp) { - printf("Usage:\n%s\n", cmdtp->usage); + printf("Usage:%s - %s\n\n", cmdtp->name, cmdtp->usage); } diff --git a/common/hush.c b/common/hush.c index dbb4035..01b74d7 100644 --- a/common/hush.c +++ b/common/hush.c @@ -3627,3 +3627,3 @@ U_BOOT_CMD( showvar, CONFIG_SYS_MAXARGS, 1, do_showvar, - "showvar- print local hushshell variables\n", + "print local hushshell variables", "\n - print values of all hushshell variables\n" diff --git a/common/kgdb.c b/common/kgdb.c index adc15dd..888b96b 100644 --- a/common/kgdb.c +++ b/common/kgdb.c @@ -577,3 +577,3 @@ U_BOOT_CMD( kgdb, CONFIG_SYS_MAXARGS, 1, do_kgdb, - "kgdb - enter gdb remote debug mode\n", + "enter gdb remote debug mode", "[arg0 arg1 .. argN]\n" diff --git a/common/lcd.c b/common/lcd.c index ae79051..5f73247 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -428,3 +428,3 @@ U_BOOT_CMD( cls, 1, 1, lcd_clear, - "cls - clear screen\n", + "clear screen", NULL diff --git a/cpu/mpc512x/speed.c b/cpu/mpc512x/speed.c index 542bf21..5992111 100644 --- a/cpu/mpc512x/speed.c +++ b/cpu/mpc512x/speed.c @@ -139,3 +139,3 @@ int do_clocks (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(clocks, 1, 0, do_clocks, - "clocks - print clock configuration\n", + "print clock configuration", " clocks\n" diff --git a/cpu/mpc83xx/ecc.c b/cpu/mpc83xx/ecc.c index 47c8937..f3942b4 100644 --- a/cpu/mpc83xx/ecc.c +++ b/cpu/mpc83xx/ecc.c @@ -357,3 +357,3 @@ int do_ecc(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(ecc, 4, 0, do_ecc, - "ecc - support for DDR ECC features\n", + "support for DDR ECC features", "status - print out status info\n" diff --git a/cpu/mpc83xx/speed.c b/cpu/mpc83xx/speed.c index bf9bf36..7bc055b 100644 --- a/cpu/mpc83xx/speed.c +++ b/cpu/mpc83xx/speed.c @@ -546,3 +546,3 @@ int do_clocks (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD(clocks, 1, 0, do_clocks, - "clocks - print clock configuration\n", + "print clock configuration", " clocks\n" diff --git a/cpu/nios2/sysid.c b/cpu/nios2/sysid.c index afd5d83..251204b 100644 --- a/cpu/nios2/sysid.c +++ b/cpu/nios2/sysid.c @@ -54,3 +54,3 @@ U_BOOT_CMD( sysid, 1, 1, do_sysid, - "sysid - display Nios-II system id\n\n", + "display Nios-II system id", "\n - display Nios-II system id\n" diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c index f80baeb..1c5e314 100644 --- a/drivers/gpio/pca953x.c +++ b/drivers/gpio/pca953x.c @@ -211,3 +211,3 @@ U_BOOT_CMD( pca953x, 5, 1, do_pca953x, - "pca953x - pca953x gpio access\n", + "pca953x gpio access", "device [dev]\n" diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c index 7b29fd7..e90a4a5 100644 --- a/drivers/qe/qe.c +++ b/drivers/qe/qe.c @@ -463,3 +463,3 @@ U_BOOT_CMD( qe, 4, 0, qe_cmd, - "qe - QUICC Engine commands\n", + "QUICC Engine commands", "fw <addr> [<length>] - Upload firmware binary at address <addr> to " diff --git a/include/command.h b/include/command.h index 58992e9..d7321af 100644 --- a/include/command.h +++ b/include/command.h @@ -35,2 +35,7 @@
+/* Default to a width of 8 characters for help message command width */ +#ifndef CONFIG_SYS_HELP_CMD_WIDTH +#define CONFIG_SYS_HELP_CMD_WIDTH 8 +#endif + #ifndef __ASSEMBLY__

Dear Peter Tyser,
In message 1230746884-6510-1-git-send-email-ptyser@xes-inc.com you wrote:
This patch series attempts to clean up how the "usage" field of the cmd_tbl_s structure is used. It does 3 things:
- Adds a cmd_usage() function to print a command's usage
- Removes the command name from the usage field for all commands
- Removes newlines from the usage field of all commands
The benefits of these changes are:
- Command formatting in the "help" command output will always be properly aligned. A fair number of commands currently aren't properly formated, eg "cmd1 - description" vs "cmd2 - description".
- Command definitions are reduced in size/complexity. The patch shaved off 1.1KB from the XPedite5370 image for example.
Most of the changes were done via scripts, so let me know if anything looks fishy.
Dear Peter, unfortunately this patch series does not apply any more. Patch # 3 (Standardize command usage messages with cmd_usage()) bails out:
Applying: Standardize command usage messages with cmd_usage() error: patch failed: common/cmd_nand.c:464 error: common/cmd_nand.c: patch does not apply error: patch failed: common/cmd_onenand.c:28 error: common/cmd_onenand.c: patch does not apply Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merged common/cmd_bootm.c Auto-merged common/cmd_jffs2.c Auto-merged common/cmd_mem.c Auto-merged common/cmd_nand.c Auto-merged common/cmd_nvedit.c Auto-merged common/cmd_onenand.c CONFLICT (content): Merge conflict in common/cmd_onenand.c Auto-merged common/main.c Failed to merge in the changes. Patch failed at 0003.
Can you please rebase these patches and resubmit?
Best regards,
Wolfgang Denk
participants (2)
-
Peter Tyser
-
Wolfgang Denk