General help message cleanup
Many of the help messages were not really helpful; for example, many
commands that take no arguments would not print a correct synopsis
line, but "No additional help available." which is not exactly wrong,
but not helpful either.
Commit ``Make "usage" messages more helpful.'' changed this
partially. But it also became clear that lots of "Usage" and "Help"
messages (fields "usage" and "help" in struct cmd_tbl_s respective)
were actually redundant.
This patch cleans this up - for example:
Before:
=> help dtt
dtt - Digital Thermometer and Thermostat
Usage:
dtt - Read temperature from digital thermometer and thermostat.
After:
=> help dtt
dtt - Read temperature from Digital Thermometer and Thermostat
Usage:
dtt
Signed-off-by: Wolfgang Denk <wd@denx.de>
diff --git a/board/esd/ar405/ar405.c b/board/esd/ar405/ar405.c
index 14520e1..9d1b6d2 100644
--- a/board/esd/ar405/ar405.c
+++ b/board/esd/ar405/ar405.c
@@ -247,9 +247,8 @@
U_BOOT_CMD(
digtest, 3, 1, do_digtest,
"Test digital in-/output",
- NULL
- );
-
+ ""
+);
#define ERROR_DELTA 256
@@ -341,8 +340,8 @@
U_BOOT_CMD(
anatest, 2, 1, do_anatest,
"Test analog in-/output",
- NULL
- );
+ ""
+);
int counter = 0;
@@ -408,6 +407,6 @@
U_BOOT_CMD(
inctest, 3, 1, do_inctest,
"Test incremental encoder inputs",
- NULL
- );
+ ""
+);
#endif
diff --git a/board/esd/cms700/cms700.c b/board/esd/cms700/cms700.c
index 658a267..01b1223 100644
--- a/board/esd/cms700/cms700.c
+++ b/board/esd/cms700/cms700.c
@@ -189,8 +189,9 @@
}
U_BOOT_CMD(eepwren, 2, 0, do_eep_wren,
- "Enable / disable / query EEPROM write access",
- NULL);
+ "Enable / disable / query EEPROM write access",
+ ""
+);
#endif /* #if defined(CONFIG_SYS_EEPROM_WREN) */
/* ------------------------------------------------------------------------- */
diff --git a/board/esd/common/auto_update.c b/board/esd/common/auto_update.c
index 8593125..33aeb46 100644
--- a/board/esd/common/auto_update.c
+++ b/board/esd/common/auto_update.c
@@ -551,6 +551,6 @@
U_BOOT_CMD(
autoupd, 1, 1, auto_update,
"Automatically update images",
- NULL
+ ""
);
#endif /* CONFIG_AUTO_UPDATE */
diff --git a/board/esd/common/cmd_loadpci.c b/board/esd/common/cmd_loadpci.c
index c779f79..47e946f 100644
--- a/board/esd/common/cmd_loadpci.c
+++ b/board/esd/common/cmd_loadpci.c
@@ -124,7 +124,7 @@
U_BOOT_CMD(
loadpci, 1, 1, do_loadpci,
"Wait for pci bootcmd and boot it",
- NULL
- );
+ ""
+);
#endif
diff --git a/board/esd/common/lcd.c b/board/esd/common/lcd.c
index 066df74..5c50b4c 100644
--- a/board/esd/common/lcd.c
+++ b/board/esd/common/lcd.c
@@ -373,5 +373,5 @@
U_BOOT_CMD(
esdbmp, 2, 1, do_esdbmp,
"display BMP image",
- "<imageAddr> - display image\n"
+ "<imageAddr> - display image"
);
diff --git a/board/esd/common/xilinx_jtag/micro.c b/board/esd/common/xilinx_jtag/micro.c
index 37ac0cc..414e821 100644
--- a/board/esd/common/xilinx_jtag/micro.c
+++ b/board/esd/common/xilinx_jtag/micro.c
@@ -1869,4 +1869,4 @@
cpld, 2, 1, do_cpld,
"program onboard CPLD",
"<xsvf-addr>"
- );
+);
diff --git a/board/esd/cpci2dp/cpci2dp.c b/board/esd/cpci2dp/cpci2dp.c
index aba240f..cd57ed4 100644
--- a/board/esd/cpci2dp/cpci2dp.c
+++ b/board/esd/cpci2dp/cpci2dp.c
@@ -183,6 +183,6 @@
U_BOOT_CMD(
eepwren, 2, 0, do_eep_wren,
"Enable / disable / query EEPROM write access",
- NULL
- );
+ ""
+);
#endif /* #if defined(CONFIG_SYS_EEPROM_WREN) */
diff --git a/board/esd/cpci405/cpci405.c b/board/esd/cpci405/cpci405.c
index ccbe245..a677c62 100644
--- a/board/esd/cpci405/cpci405.c
+++ b/board/esd/cpci405/cpci405.c
@@ -690,8 +690,8 @@
U_BOOT_CMD(
onewire, 1, 1, do_onewire,
"Read 1-write ID",
- NULL
- );
+ ""
+);
#define CONFIG_SYS_I2C_EEPROM_ADDR_2 0x51 /* EEPROM CAT24WC32 */
#define CONFIG_ENV_SIZE_2 0x800 /* 2048 bytes may be used for env vars */
@@ -751,8 +751,8 @@
U_BOOT_CMD(
getbpip, 1, 1, do_get_bpip,
"Update IP-Address with Backplane IP-Address",
- NULL
- );
+ ""
+);
/*
* Set and print backplane ip...
@@ -787,7 +787,7 @@
U_BOOT_CMD(
setbpip, 2, 1, do_set_bpip,
"Write Backplane IP-Address",
- NULL
- );
+ ""
+);
#endif /* CONFIG_CPCI405AB */
diff --git a/board/esd/cpci5200/cpci5200.c b/board/esd/cpci5200/cpci5200.c
index b6b50fb..36fcf7f 100644
--- a/board/esd/cpci5200/cpci5200.c
+++ b/board/esd/cpci5200/cpci5200.c
@@ -295,4 +295,6 @@
U_BOOT_CMD(writepci, 3, 1, do_writepci,
"Write some data to pcibus",
- "<addr> <size>\n" " - Write some data to pcibus.\n");
+ "<addr> <size>\n"
+ ""
+);
diff --git a/board/esd/cpci750/cpci750.c b/board/esd/cpci750/cpci750.c
index 4826633..258d8b2 100644
--- a/board/esd/cpci750/cpci750.c
+++ b/board/esd/cpci750/cpci750.c
@@ -994,5 +994,5 @@
U_BOOT_CMD(
show_config, 1, 1, do_show_config,
"Show Marvell strapping register",
- "Show Marvell strapping register (ResetSampleLow ResetSampleHigh)\n"
- );
+ "Show Marvell strapping register (ResetSampleLow ResetSampleHigh)"
+);
diff --git a/board/esd/dasa_sim/cmd_dasa_sim.c b/board/esd/dasa_sim/cmd_dasa_sim.c
index 0310c47..675e507 100644
--- a/board/esd/dasa_sim/cmd_dasa_sim.c
+++ b/board/esd/dasa_sim/cmd_dasa_sim.c
@@ -230,7 +230,7 @@
pci9054, 3, 1, do_pci9054,
"PLX PCI9054 EEPROM access",
"pci9054 info - print EEPROM values\n"
- "pci9054 update - updates EEPROM with default values\n"
+ "pci9054 update - updates EEPROM with default values"
);
/* ------------------------------------------------------------------------- */
diff --git a/board/esd/du440/du440.c b/board/esd/du440/du440.c
index 45dfa6f..0ec519b 100644
--- a/board/esd/du440/du440.c
+++ b/board/esd/du440/du440.c
@@ -607,8 +607,8 @@
U_BOOT_CMD(
dcf77, 1, 1, do_dcf77,
"Check DCF77 receiver",
- NULL
- );
+ ""
+);
/*
* initialize USB hub via I2C1
@@ -657,8 +657,8 @@
U_BOOT_CMD(
hubinit, 1, 1, do_hubinit,
"Initialize USB hub",
- NULL
- );
+ ""
+);
#endif /* CONFIG_I2C_MULTI_BUS */
#define CONFIG_SYS_BOOT_EEPROM_PAGE_WRITE_BITS 3
@@ -790,8 +790,8 @@
U_BOOT_CMD(
sbe, 2, 0, do_setup_boot_eeprom,
"setup boot eeprom",
- NULL
- );
+ ""
+);
#if defined(CONFIG_SYS_EEPROM_WREN)
/*
@@ -863,8 +863,9 @@
}
U_BOOT_CMD(eepwren, 2, 0, do_eep_wren,
- "Enable / disable / query EEPROM write access",
- NULL);
+ "Enable / disable / query EEPROM write access",
+ ""
+);
#endif /* #if defined(CONFIG_SYS_EEPROM_WREN) */
static int got_pldirq;
@@ -916,8 +917,8 @@
U_BOOT_CMD(
wpi, 1, 1, do_waitpwrirq,
"Wait for power change interrupt",
- NULL
- );
+ ""
+);
/*
* initialize DVI panellink transmitter
@@ -961,8 +962,8 @@
U_BOOT_CMD(
dviinit, 1, 1, do_dviinit,
"Initialize DVI Panellink transmitter",
- NULL
- );
+ ""
+);
/*
* TODO: 'time' command might be useful for others as well.
@@ -1001,8 +1002,8 @@
U_BOOT_CMD(
time, CONFIG_SYS_MAXARGS, 1, do_time,
"run command and output execution time",
- NULL
- );
+ ""
+);
extern void video_hw_rectfill (
unsigned int bpp, /* bytes per pixel */
@@ -1051,5 +1052,5 @@
U_BOOT_CMD(
gfxdemo, CONFIG_SYS_MAXARGS, 1, do_gfxdemo,
"demo",
- NULL
- );
+ ""
+);
diff --git a/board/esd/hh405/hh405.c b/board/esd/hh405/hh405.c
index eab952c..5ae4c75 100644
--- a/board/esd/hh405/hh405.c
+++ b/board/esd/hh405/hh405.c
@@ -769,8 +769,9 @@
}
U_BOOT_CMD(eepwren, 2, 0, do_eep_wren,
- "Enable / disable / query EEPROM write access",
- NULL);
+ "Enable / disable / query EEPROM write access",
+ ""
+);
#endif /* #if defined(CONFIG_SYS_EEPROM_WREN) */
diff --git a/board/esd/ocrtc/cmd_ocrtc.c b/board/esd/ocrtc/cmd_ocrtc.c
index db2c548..5f3254d 100644
--- a/board/esd/ocrtc/cmd_ocrtc.c
+++ b/board/esd/ocrtc/cmd_ocrtc.c
@@ -55,7 +55,7 @@
U_BOOT_CMD(
setdevice, 1, 1, do_setdevice,
"Set device number on pci adapter boards",
- NULL
+ ""
);
@@ -78,7 +78,7 @@
U_BOOT_CMD(
getdevice, 1, 1, do_getdevice,
"Get device number and set slot env variable",
- NULL
+ ""
);
#endif
diff --git a/board/esd/pci405/cmd_pci405.c b/board/esd/pci405/cmd_pci405.c
index a0d1f3f..1d14611 100644
--- a/board/esd/pci405/cmd_pci405.c
+++ b/board/esd/pci405/cmd_pci405.c
@@ -109,6 +109,6 @@
U_BOOT_CMD(
loadpci, 1, 1, do_loadpci,
"Wait for pci-image and boot it",
- NULL
+ ""
);
#endif
diff --git a/board/esd/pci405/pci405.c b/board/esd/pci405/pci405.c
index 8973f97..56184ca 100644
--- a/board/esd/pci405/pci405.c
+++ b/board/esd/pci405/pci405.c
@@ -381,5 +381,5 @@
"wpeeprom 1\n"
" - enable I2C EEPROM write protection\n"
"wpeeprom 0\n"
- " - disable I2C EEPROM write protection\n"
- );
+ " - disable I2C EEPROM write protection"
+);
diff --git a/board/esd/pf5200/pf5200.c b/board/esd/pf5200/pf5200.c
index f225f0e..4e64e83 100644
--- a/board/esd/pf5200/pf5200.c
+++ b/board/esd/pf5200/pf5200.c
@@ -294,7 +294,7 @@
return (0);
}
-U_BOOT_CMD(poweroff, 1, 1, do_poweroff, "Switch off power", NULL);
+U_BOOT_CMD(poweroff, 1, 1, do_poweroff, "Switch off power", "");
int phypower(int flag)
{
@@ -338,7 +338,7 @@
}
U_BOOT_CMD(phypower, 2, 2, do_phypower,
- "Switch power of ethernet phy", NULL);
+ "Switch power of ethernet phy", "");
int do_writepci(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
{
@@ -369,5 +369,7 @@
}
U_BOOT_CMD(writepci, 3, 1, do_writepci,
- "Write some data to pcibus",
- "<addr> <size>\n" " - Write some data to pcibus.\n");
+ "Write some data to pcibus",
+ "<addr> <size>\n"
+ ""
+);
diff --git a/board/esd/plu405/plu405.c b/board/esd/plu405/plu405.c
index a94604a..fdacbf6 100644
--- a/board/esd/plu405/plu405.c
+++ b/board/esd/plu405/plu405.c
@@ -333,6 +333,7 @@
}
U_BOOT_CMD(eepwren, 2, 0, do_eep_wren,
- "Enable / disable / query EEPROM write access",
- NULL);
+ "Enable / disable / query EEPROM write access",
+ ""
+);
#endif /* #if defined(CONFIG_SYS_EEPROM_WREN) */
diff --git a/board/esd/pmc440/cmd_pmc440.c b/board/esd/pmc440/cmd_pmc440.c
index 0fbc3dc..1af431b 100644
--- a/board/esd/pmc440/cmd_pmc440.c
+++ b/board/esd/pmc440/cmd_pmc440.c
@@ -99,8 +99,8 @@
U_BOOT_CMD(
waithci, 1, 1, do_waithci,
"Wait for host control interrupt",
- NULL
- );
+ ""
+);
void dump_fifo(pmc440_fpga_t *fpga, int f, int *n)
{
@@ -266,8 +266,8 @@
" - with 'wait' argument: interrupt driven read from all fifos\n"
" - with 'read' argument: read current contents from all fifos\n"
" - with 'write' argument: write 'data' 'cnt' times to "
- "'fifo' or 'address'\n"
- );
+ "'fifo' or 'address'"
+);
int do_setup_bootstrap_eeprom(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
@@ -338,7 +338,7 @@
sbe, 4, 0, do_setup_bootstrap_eeprom,
"setup bootstrap eeprom",
"<cpufreq:400|533|667> [<console-uart:0|1> [<bringup delay (0..20s)>]]"
- );
+);
#if defined(CONFIG_PRAM)
#include <environment.h>
@@ -400,8 +400,8 @@
U_BOOT_CMD(
painit, 1, 1, do_painit,
"prepare PciAccess system",
- NULL
- );
+ ""
+);
#endif /* CONFIG_PRAM */
int do_selfreset(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -412,8 +412,8 @@
U_BOOT_CMD(
selfreset, 1, 1, do_selfreset,
"assert self-reset# signal",
- NULL
- );
+ ""
+);
int do_resetout(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
@@ -449,8 +449,8 @@
U_BOOT_CMD(
resetout, 2, 1, do_resetout,
"assert PMC-RESETOUT# signal",
- NULL
- );
+ ""
+);
int do_inta(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
@@ -481,8 +481,8 @@
U_BOOT_CMD(
inta, 2, 1, do_inta,
"Assert/Deassert or query INTA# state in non-monarch mode",
- NULL
- );
+ ""
+);
/* test-only */
int do_pmm(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -514,8 +514,8 @@
U_BOOT_CMD(
pmm, 2, 1, do_pmm,
"Setup pmm[1] registers",
- "<pciaddr> (pciaddr will be aligned to 256MB)\n"
- );
+ "<pciaddr> (pciaddr will be aligned to 256MB)"
+);
#if defined(CONFIG_SYS_EEPROM_WREN)
int do_eep_wren(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -549,8 +549,9 @@
return state;
}
U_BOOT_CMD(eepwren, 2, 0, do_eep_wren,
- "Enable / disable / query EEPROM write access",
- NULL);
+ "Enable / disable / query EEPROM write access",
+ ""
+);
#endif /* #if defined(CONFIG_SYS_EEPROM_WREN) */
#endif /* CONFIG_CMD_BSP */
diff --git a/board/esd/tasreg/tasreg.c b/board/esd/tasreg/tasreg.c
index 9602ee5..1844442 100644
--- a/board/esd/tasreg/tasreg.c
+++ b/board/esd/tasreg/tasreg.c
@@ -250,8 +250,8 @@
U_BOOT_CMD(
iploop, 2, 1, do_iploop,
"i2c probe loop <addr>",
- NULL
- );
+ ""
+);
/*
*/
@@ -303,8 +303,8 @@
U_BOOT_CMD(
codec, 1, 1, do_codec,
"Enable codec",
- NULL
- );
+ ""
+);
/*
*/
@@ -336,8 +336,8 @@
U_BOOT_CMD(
saa, 5, 1, do_saa,
"Write to SAA1064 <addr> <instr> <cntrl> <data>",
- NULL
- );
+ ""
+);
/*
*/
@@ -375,8 +375,8 @@
U_BOOT_CMD(
iwrite, 6, 1, do_iwrite,
"Write n bytes to I2C-device",
- "addr cnt data0 ... datan\n"
- );
+ "addr cnt data0 ... datan"
+);
/*
*/
@@ -407,8 +407,8 @@
U_BOOT_CMD(
iread, 3, 1, do_iread,
"Read from I2C <addr> <cnt>",
- NULL
- );
+ ""
+);
/*
*/
@@ -445,6 +445,6 @@
U_BOOT_CMD(
ireadl, 2, 1, do_ireadl,
"Read-loop from I2C <addr>",
- NULL
- );
+ ""
+);
#endif
diff --git a/board/esd/voh405/voh405.c b/board/esd/voh405/voh405.c
index 96a04b3..9127550 100644
--- a/board/esd/voh405/voh405.c
+++ b/board/esd/voh405/voh405.c
@@ -392,6 +392,7 @@
}
U_BOOT_CMD(eepwren, 2, 0, do_eep_wren,
- "Enable / disable / query EEPROM write access",
- NULL);
+ "Enable / disable / query EEPROM write access",
+ ""
+);
#endif /* #if defined(CONFIG_SYS_EEPROM_WREN) */