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/amcc/acadia/cmd_acadia.c b/board/amcc/acadia/cmd_acadia.c
index d47cf1a..c427f9e 100644
--- a/board/amcc/acadia/cmd_acadia.c
+++ b/board/amcc/acadia/cmd_acadia.c
@@ -97,5 +97,5 @@
U_BOOT_CMD(
bootstrap, 3, 0, do_bootstrap,
"program the I2C bootstrap EEPROM",
- "<cpu-freq> <nor|nand> - program the I2C bootstrap EEPROM\n"
- );
+ "<cpu-freq> <nor|nand> - program the I2C bootstrap EEPROM"
+);
diff --git a/board/amcc/canyonlands/bootstrap.c b/board/amcc/canyonlands/bootstrap.c
index 30046fe..6dc2cca 100644
--- a/board/amcc/canyonlands/bootstrap.c
+++ b/board/amcc/canyonlands/bootstrap.c
@@ -191,5 +191,5 @@
U_BOOT_CMD(
bootstrap, 2, 0, do_bootstrap,
"program the I2C bootstrap EEPROM",
- "<nand|nor> - strap to boot from NAND or NOR flash\n"
- );
+ "<nand|nor> - strap to boot from NAND or NOR flash"
+);
diff --git a/board/amcc/katmai/cmd_katmai.c b/board/amcc/katmai/cmd_katmai.c
index 2c2849b..335d30c 100644
--- a/board/amcc/katmai/cmd_katmai.c
+++ b/board/amcc/katmai/cmd_katmai.c
@@ -214,5 +214,5 @@
U_BOOT_CMD(
bootstrap, 3, 1, do_bootstrap,
"program the serial device strap",
- "wrclk [prom0|prom1] - program the serial device strap\n"
- );
+ "wrclk [prom0|prom1] - program the serial device strap"
+);
diff --git a/board/amcc/kilauea/cmd_pll.c b/board/amcc/kilauea/cmd_pll.c
index 6b38493..9bae67e 100644
--- a/board/amcc/kilauea/cmd_pll.c
+++ b/board/amcc/kilauea/cmd_pll.c
@@ -291,7 +291,7 @@
RCONF: Read current eeprom configuration. \n\
-----------------------------------------------\n\
WTEST: Test EEPROM write with predefined values\n\
- -----------------------------------------------\n"
- );
+ -----------------------------------------------"
+);
#endif /* CONFIG_CMD_EEPROM */
diff --git a/board/amcc/luan/luan.c b/board/amcc/luan/luan.c
index d2a3b9e..7d02d90 100644
--- a/board/amcc/luan/luan.c
+++ b/board/amcc/luan/luan.c
@@ -331,5 +331,5 @@
l2cache, 2, 1, do_l2cache,
"enable or disable L2 cache",
"[on, off]\n"
- " - enable or disable L2 cache\n"
- );
+ " - enable or disable L2 cache"
+);
diff --git a/board/amcc/makalu/cmd_pll.c b/board/amcc/makalu/cmd_pll.c
index 6b38493..9bae67e 100644
--- a/board/amcc/makalu/cmd_pll.c
+++ b/board/amcc/makalu/cmd_pll.c
@@ -291,7 +291,7 @@
RCONF: Read current eeprom configuration. \n\
-----------------------------------------------\n\
WTEST: Test EEPROM write with predefined values\n\
- -----------------------------------------------\n"
- );
+ -----------------------------------------------"
+);
#endif /* CONFIG_CMD_EEPROM */
diff --git a/board/amcc/sequoia/cmd_sequoia.c b/board/amcc/sequoia/cmd_sequoia.c
index 6dfd8ba..01dd97c 100644
--- a/board/amcc/sequoia/cmd_sequoia.c
+++ b/board/amcc/sequoia/cmd_sequoia.c
@@ -227,5 +227,5 @@
U_BOOT_CMD(
bootstrap, 2, 0, do_bootstrap,
"program the I2C bootstrap EEPROM",
- "<nand|nor> - strap to boot from NAND or NOR flash\n"
- );
+ "<nand|nor> - strap to boot from NAND or NOR flash"
+);
diff --git a/board/amcc/taihu/lcd.c b/board/amcc/taihu/lcd.c
index 6b68f33..c3dc983 100644
--- a/board/amcc/taihu/lcd.c
+++ b/board/amcc/taihu/lcd.c
@@ -233,25 +233,25 @@
U_BOOT_CMD(
lcd_cls, 1, 1, do_lcd_clear,
"lcd clear display",
- NULL
- );
+ ""
+);
U_BOOT_CMD(
lcd_puts, 2, 1, do_lcd_puts,
"display string on lcd",
- "<string> - <string> to be displayed\n"
- );
+ "<string> - <string> to be displayed"
+);
U_BOOT_CMD(
lcd_putc, 2, 1, do_lcd_putc,
"display char on lcd",
- "<char> - <char> to be displayed\n"
- );
+ "<char> - <char> to be displayed"
+);
U_BOOT_CMD(
lcd_cur, 3, 1, do_lcd_cur,
"shift cursor on lcd",
"<count> <dir> - shift cursor on lcd <count> times, direction is <dir> \n"
" <count> - 0..31\n"
- " <dir> - 0=backward 1=forward\n"
- );
+ " <dir> - 0=backward 1=forward"
+);
diff --git a/board/amcc/taihu/taihu.c b/board/amcc/taihu/taihu.c
index 669429b..d8806ac 100644
--- a/board/amcc/taihu/taihu.c
+++ b/board/amcc/taihu/taihu.c
@@ -94,8 +94,8 @@
U_BOOT_CMD (
sw2_stat, 1, 1, do_sw_stat,
"show status of switch 2",
- NULL
- );
+ ""
+);
static int do_led_ctl(cmd_tbl_t* cmd_tp, int flags, int argc, char *argv[])
{
@@ -134,8 +134,8 @@
led_ctl, 3, 1, do_led_ctl,
"make led 1 or 2 on or off",
"<led_no> <on/off> - make led <led_no> on/off,\n"
- "\tled_no is 1 or 2\t"
- );
+ "\tled_no is 1 or 2"
+);
#define SPI_CS_GPIO0 0
#define SPI_SCLK_GPIO14 14
diff --git a/board/amcc/taihu/update.c b/board/amcc/taihu/update.c
index 8e96905..f9c31b3 100644
--- a/board/amcc/taihu/update.c
+++ b/board/amcc/taihu/update.c
@@ -128,5 +128,5 @@
U_BOOT_CMD (
update_boot_eeprom, 1, 1, update_boot_eeprom,
"update boot eeprom content",
- NULL
- );
+ ""
+);
diff --git a/board/amcc/taishan/lcd.c b/board/amcc/taishan/lcd.c
index e4d0705..d432cc3 100644
--- a/board/amcc/taishan/lcd.c
+++ b/board/amcc/taishan/lcd.c
@@ -254,18 +254,18 @@
return 0;
}
-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_test, 1, 1, do_lcd_test, "lcd test display", "");
+U_BOOT_CMD(lcd_cls, 1, 1, do_lcd_clear, "lcd clear display", "");
U_BOOT_CMD(lcd_puts, 2, 1, do_lcd_puts,
"display string on lcd",
- "<string> - <string> to be displayed\n");
+ "<string> - <string> to be displayed");
U_BOOT_CMD(lcd_putc, 2, 1, do_lcd_putc,
"display char on lcd",
- "<char> - <char> to be displayed\n");
+ "<char> - <char> to be displayed");
U_BOOT_CMD(lcd_cur, 3, 1, do_lcd_cur,
"shift cursor on lcd",
"<count> <dir>- shift cursor on lcd <count> times, direction is <dir> \n"
- " <count> - 0~31\n" " <dir> - 0,backward; 1, forward\n");
+ " <count> - 0~31\n" " <dir> - 0,backward; 1, forward");
#if 0 /* test-only */
void set_phy_loopback_mode(void)
@@ -373,8 +373,8 @@
}
U_BOOT_CMD(ledon, 1, 1, do_led_test_on,
- "led test light on", NULL);
+ "led test light on", "");
U_BOOT_CMD(ledoff, 1, 1, do_led_test_off,
- "led test light off", NULL);
+ "led test light off", "");
#endif
diff --git a/board/amcc/taishan/showinfo.c b/board/amcc/taishan/showinfo.c
index b471c95..2a78a22 100644
--- a/board/amcc/taishan/showinfo.c
+++ b/board/amcc/taishan/showinfo.c
@@ -168,7 +168,7 @@
}
U_BOOT_CMD(xbriinfo, 1, 1, do_show_xbridge_info,
- "Show PCIX bridge info", NULL);
+ "Show PCIX bridge info", "");
#define TAISHAN_PCI_DEV_ID0 0x800
#define TAISHAN_PCI_DEV_ID1 0x1000
@@ -222,7 +222,7 @@
}
U_BOOT_CMD(xdevinfo, 1, 1, do_show_pcix_device_info,
- "Show PCIX Device info", NULL);
+ "Show PCIX Device info", "");
extern void show_reset_reg(void);
@@ -233,4 +233,4 @@
}
U_BOOT_CMD(resetinfo, 1, 1, do_show_reset_reg_info,
- "Show Reset REG info", NULL);
+ "Show Reset REG info", "");
diff --git a/board/amcc/taishan/update.c b/board/amcc/taishan/update.c
index 63f8744..aab3a65 100644
--- a/board/amcc/taishan/update.c
+++ b/board/amcc/taishan/update.c
@@ -74,5 +74,5 @@
}
U_BOOT_CMD(update_boot_eeprom, 1, 1, do_update_boot_eeprom,
- "update bootstrap eeprom content", NULL);
+ "update bootstrap eeprom content", "");
#endif
diff --git a/board/amcc/yucca/cmd_yucca.c b/board/amcc/yucca/cmd_yucca.c
index d2ca257..ed6daa3 100644
--- a/board/amcc/yucca/cmd_yucca.c
+++ b/board/amcc/yucca/cmd_yucca.c
@@ -282,5 +282,5 @@
U_BOOT_CMD(
evb440spe, 3, 1, do_evb440spe,
"program the serial device strap",
- "wrclk [prom0|prom1] - program the serial device strap\n"
+ "wrclk [prom0|prom1] - program the serial device strap"
);