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>

84 files changed, 252 insertions, 240 deletions

diff --git a/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c b/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c
index 02a095ef8d..73dfb3d52b 100644
--- a/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c
+++ b/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c
@@ -156,7 +156,7 @@ int do_vcimage (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	vcimage,	2,	0,	do_vcimage,
 	"loads an image to Display",
-	"vcimage addr\n"
+	"vcimage addr"
 );
 
 /* EOF EB+MCF-EV123c */
diff --git a/board/ads5121/ads5121_diu.c b/board/ads5121/ads5121_diu.c
index 41a135314f..1dd60afa4f 100644
--- a/board/ads5121/ads5121_diu.c
+++ b/board/ads5121/ads5121_diu.c
@@ -131,7 +131,7 @@ U_BOOT_CMD(
 	diufb, CONFIG_SYS_MAXARGS, 1, ads5121diu_init_show_bmp,
 	"Init or Display BMP file",
 	"init\n    - initialize DIU\n"
-	"addr\n    - display bmp at address 'addr'\n"
+	"addr\n    - display bmp at address 'addr'"
 	);
 
 
diff --git a/board/amcc/acadia/cmd_acadia.c b/board/amcc/acadia/cmd_acadia.c
index d47cf1af57..c427f9ebc6 100644
--- a/board/amcc/acadia/cmd_acadia.c
+++ b/board/amcc/acadia/cmd_acadia.c
@@ -97,5 +97,5 @@ static int do_bootstrap(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 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 30046fee3a..6dc2ccae96 100644
--- a/board/amcc/canyonlands/bootstrap.c
+++ b/board/amcc/canyonlands/bootstrap.c
@@ -191,5 +191,5 @@ static int do_bootstrap(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 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 2c2849b015..335d30c368 100644
--- a/board/amcc/katmai/cmd_katmai.c
+++ b/board/amcc/katmai/cmd_katmai.c
@@ -214,5 +214,5 @@ static int do_bootstrap(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 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 6b38493e59..9bae67e563 100644
--- a/board/amcc/kilauea/cmd_pll.c
+++ b/board/amcc/kilauea/cmd_pll.c
@@ -291,7 +291,7 @@ U_BOOT_CMD(
 	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 d2a3b9ec3d..7d02d904e0 100644
--- a/board/amcc/luan/luan.c
+++ b/board/amcc/luan/luan.c
@@ -331,5 +331,5 @@ U_BOOT_CMD(
 	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 6b38493e59..9bae67e563 100644
--- a/board/amcc/makalu/cmd_pll.c
+++ b/board/amcc/makalu/cmd_pll.c
@@ -291,7 +291,7 @@ U_BOOT_CMD(
 	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 6dfd8ba381..01dd97c84d 100644
--- a/board/amcc/sequoia/cmd_sequoia.c
+++ b/board/amcc/sequoia/cmd_sequoia.c
@@ -227,5 +227,5 @@ static int do_bootstrap(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 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 6b68f33563..c3dc9837b5 100644
--- a/board/amcc/taihu/lcd.c
+++ b/board/amcc/taihu/lcd.c
@@ -233,25 +233,25 @@ static int do_lcd_cur (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 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 669429b67f..d8806ac32d 100644
--- a/board/amcc/taihu/taihu.c
+++ b/board/amcc/taihu/taihu.c
@@ -94,8 +94,8 @@ static int do_sw_stat(cmd_tbl_t* cmd_tp, int flags, int argc, char *argv[])
 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 @@ U_BOOT_CMD (
 	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 8e969056cc..f9c31b3927 100644
--- a/board/amcc/taihu/update.c
+++ b/board/amcc/taihu/update.c
@@ -128,5 +128,5 @@ static int update_boot_eeprom(cmd_tbl_t* cmdtp, int flag, int argc, char *argv[]
 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 e4d070570a..d432cc3d05 100644
--- a/board/amcc/taishan/lcd.c
+++ b/board/amcc/taishan/lcd.c
@@ -254,18 +254,18 @@ static int do_lcd_cur(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 	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 @@ 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,
-	   "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 b471c956e4..2a78a22e65 100644
--- a/board/amcc/taishan/showinfo.c
+++ b/board/amcc/taishan/showinfo.c
@@ -168,7 +168,7 @@ 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,
-	   "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 @@ 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,
-	   "Show PCIX Device info", NULL);
+	   "Show PCIX Device info", "");
 
 extern void show_reset_reg(void);
 
@@ -233,4 +233,4 @@ 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,
-	   "Show Reset REG info", NULL);
+	   "Show Reset REG info", "");
diff --git a/board/amcc/taishan/update.c b/board/amcc/taishan/update.c
index 63f874488e..aab3a6577c 100644
--- a/board/amcc/taishan/update.c
+++ b/board/amcc/taishan/update.c
@@ -74,5 +74,5 @@ 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 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 d2ca2572d7..ed6daa3899 100644
--- a/board/amcc/yucca/cmd_yucca.c
+++ b/board/amcc/yucca/cmd_yucca.c
@@ -282,5 +282,5 @@ static int setBootStrapClock(cmd_tbl_t *cmdtp, int incrflag, int flag,
 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"
 );
diff --git a/board/amirix/ap1000/ap1000.c b/board/amirix/ap1000/ap1000.c
index fcf26984ff..cadfe0b5bc 100644
--- a/board/amirix/ap1000/ap1000.c
+++ b/board/amirix/ap1000/ap1000.c
@@ -670,14 +670,14 @@ U_BOOT_CMD (temp, 6, 0, do_temp_sensor,
 	    "        - Set config options.\n"
 	    "\n"
 	    "All values can be decimal or hex (hex preceded with 0x).\n"
-	    "Only whole numbers are supported for external limits.\n");
+	    "Only whole numbers are supported for external limits.");
 
 #if 0
 U_BOOT_CMD (loadace, 2, 0, do_loadace,
 	    "load fpga configuration from System ACE compact flash",
 	    "N\n"
 	    "    - Load configuration N (0-7) from System ACE compact flash\n"
-	    "loadace\n" "    - loads default configuration\n");
+	    "loadace\n" "    - loads default configuration");
 #endif
 
 U_BOOT_CMD (swconfig, 2, 0, do_swconfigbyte,
@@ -685,19 +685,19 @@ U_BOOT_CMD (swconfig, 2, 0, do_swconfigbyte,
 	    "N [ADDRESS]\n"
 	    "    - set software configuration byte to N, optionally use ADDRESS as\n"
 	    "      location of buffer for flash copy\n"
-	    "swconfig\n" "    - display software configuration byte\n");
+	    "swconfig\n" "    - display software configuration byte");
 
 U_BOOT_CMD (pause, 2, 0, do_pause,
 	    "sleep processor until any key is pressed with poll time of N seconds",
 	    "N\n"
 	    "    - sleep processor until any key is pressed with poll time of N seconds\n"
 	    "pause\n"
-	    "    - sleep processor until any key is pressed with poll time of 1 second\n");
+	    "    - sleep processor until any key is pressed with poll time of 1 second");
 
 U_BOOT_CMD (swrecon, 1, 0, do_swreconfig,
 	    "trigger a board reconfigure to the software selected configuration",
 	    "\n"
-	    "    - trigger a board reconfigure to the software selected configuration\n");
+	    "    - trigger a board reconfigure to the software selected configuration");
 
 int board_eth_init(bd_t *bis)
 {
diff --git a/board/amirix/ap1000/powerspan.c b/board/amirix/ap1000/powerspan.c
index f727061df7..28e2bbc478 100644
--- a/board/amirix/ap1000/powerspan.c
+++ b/board/amirix/ap1000/powerspan.c
@@ -487,7 +487,7 @@ U_BOOT_CMD (eeprom, 4, 0, do_eeprom,
 	    "    - store contents of eeprom at address ADD\n"
 	    "eeprom p ADD\n"
 	    "    - put data stored at address ADD into the eeprom\n"
-	    "eeprom d\n" "    - return eeprom to default contents\n");
+	    "eeprom d\n" "    - return eeprom to default contents");
 
 unsigned int PowerSpanRead (unsigned int theOffset)
 {
diff --git a/board/barco/barco.c b/board/barco/barco.c
index a19e1edabb..d7a00782b8 100644
--- a/board/barco/barco.c
+++ b/board/barco/barco.c
@@ -307,19 +307,19 @@ int barcobcd_boot_image (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD (
 		try_working, 1, 1, barcobcd_boot_image,
 		"check flash value and boot the appropriate image",
-		"\n"
+		""
 	  );
 
 U_BOOT_CMD (
 		boot_working, 1, 1, barcobcd_boot_image,
 		"check flash value and boot the appropriate image",
-		"\n"
+		""
 	  );
 
 U_BOOT_CMD (
 		boot_default, 1, 1, barcobcd_boot_image,
 		"check flash value and boot the appropriate image",
-		"\n"
+		""
 	  );
 /*
  * We are not using serial communication, so just provide empty functions
diff --git a/board/bc3450/cmd_bc3450.c b/board/bc3450/cmd_bc3450.c
index aa46e5812f..271ffb1d1f 100644
--- a/board/bc3450/cmd_bc3450.c
+++ b/board/bc3450/cmd_bc3450.c
@@ -198,7 +198,7 @@ U_BOOT_CMD (dip, 1, 1, cmd_dip,
 	    "\n"
 	    "     - prints the state of the dip switch and/or\n"
 	    "       external configuration inputs as hex value.\n"
-	    "     - \"Config 1\" is the LSB\n");
+	    "     - \"Config 1\" is the LSB");
 
 
 /*
@@ -229,7 +229,7 @@ static int cmd_buz (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD (buz, 2, 1, cmd_buz,
 	    "turns buzzer on/off",
-	    "\n" "buz <on/off>\n" "     - turns the buzzer on or off\n");
+	    "\n" "buz <on/off>\n" "     - turns the buzzer on or off");
 #endif /* CONFIG_BC3450_BUZZER */
 
 
@@ -326,14 +326,14 @@ U_BOOT_CMD (fp, 3, 1, cmd_fp,
 	    "\n"
 	    "fp bl <on/off>\n"
 	    "     - turns the CCFL backlight of the display on/off\n"
-	    "fp <on/off>\n" "     - turns the whole display on/off\n"
+	    "fp <on/off>\n" "     - turns the whole display on/off"
 #ifdef CONFIG_BC3450_CRT
+	    "\n"
 	    "fp crt <on/off>\n"
-	    "     - enables/disables the crt output (debug only)\n"
+	    "     - enables/disables the crt output (debug only)"
 #endif /* CONFIG_BC3450_CRT */
 	);
 
-
 /*
  * temp - DS1620 thermometer
  */
@@ -524,7 +524,7 @@ static int cmd_temp (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD (temp, 3, 1, cmd_temp,
 	    "print current temperature",
-	    "\n" "temp\n" "     - print current temperature\n");
+	    "\n" "temp\n" "     - print current temperature");
 
 #ifdef CONFIG_BC3450_CAN
 /*
@@ -818,10 +818,11 @@ int cmd_test (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD (test, 2, 1, cmd_test, "unit test routines", "\n"
 #ifdef CONFIG_BC3450_CAN
-	    "test can\n"
-	    "     - connect CAN1 (X8) with CAN2 (X9) for this test\n"
+	"test can\n"
+	"     - connect CAN1 (X8) with CAN2 (X9) for this test\n"
 #endif /* CONFIG_BC3450_CAN */
-	    "test unit-off\n"
-	    "     - turns off the BC3450 unit\n"
-	    "       WARNING: Unsaved environment variables will be lost!\n");
+	"test unit-off\n"
+	"     - turns off the BC3450 unit\n"
+	"       WARNING: Unsaved environment variables will be lost!"
+);
 #endif
diff --git a/board/bf537-stamp/cmd_bf537led.c b/board/bf537-stamp/cmd_bf537led.c
index e77bb0cb19..e65c4f8359 100644
--- a/board/bf537-stamp/cmd_bf537led.c
+++ b/board/bf537-stamp/cmd_bf537led.c
@@ -33,7 +33,7 @@
 	"led <number> <action>\n" \
 	"    <number>  - Index (0-5) of LED to change, or \"all\"\n" \
 	"    <action>  - Must be one of:\n" \
-	"		on off toggle\n"
+	"		on off toggle"
 
 /* Number of LEDs supported by the board */
 #define NUMBER_LEDS     6
@@ -191,7 +191,7 @@ void set_led_state(int index, int state)
 /* Display usage information */
 void show_cmd_usage()
 {
-	printf("Usage:\n%s", USAGE_LONG);
+	printf("Usage:\n%s\n", USAGE_LONG);
 }
 
 /* Register information for u-boot to find this command */
diff --git a/board/cm5200/cmd_cm5200.c b/board/cm5200/cmd_cm5200.c
index f009eede27..cd98ae219f 100644
--- a/board/cm5200/cmd_cm5200.c
+++ b/board/cm5200/cmd_cm5200.c
@@ -443,6 +443,6 @@ U_BOOT_CMD(
 	"fkt rs232 number\n"
 	"     - Test RS232 (loopback plug(s) for RS232 required)\n"
 	"fkt usb\n"
-	"     - Test USB communication\n"
+	"     - Test USB communication"
 );
 #endif /* CONFIG_CMD_BSP */
diff --git a/board/delta/delta.c b/board/delta/delta.c
index 73e6c3e374..84ff47e53c 100644
--- a/board/delta/delta.c
+++ b/board/delta/delta.c
@@ -260,7 +260,7 @@ int do_kbd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	   kbd,	1,	1,	do_kbd,
 	   "read keyboard status",
-	   NULL
+	   ""
 );
 
 #endif /* DELTA_CHECK_KEYBD */
diff --git a/board/esd/ar405/ar405.c b/board/esd/ar405/ar405.c
index 14520e11a6..9d1b6d2644 100644
--- a/board/esd/ar405/ar405.c
+++ b/board/esd/ar405/ar405.c
@@ -247,9 +247,8 @@ int do_digtest(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	digtest,	3,	1,	do_digtest,
 	"Test digital in-/output",
-	NULL
-	);
-
+	""
+);
 
 #define ERROR_DELTA     256
 
@@ -341,8 +340,8 @@ int do_anatest(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	anatest,	2,	1,	do_anatest,
 	"Test analog in-/output",
-	NULL
-	);
+	""
+);
 
 
 int counter = 0;
@@ -408,6 +407,6 @@ int do_inctest(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 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 658a26796a..01b12232b1 100644
--- a/board/esd/cms700/cms700.c
+++ b/board/esd/cms700/cms700.c
@@ -189,8 +189,9 @@ int do_eep_wren (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 
 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 8593125ef1..33aeb46d26 100644
--- a/board/esd/common/auto_update.c
+++ b/board/esd/common/auto_update.c
@@ -551,6 +551,6 @@ int auto_update(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 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 c779f793d8..47e946f116 100644
--- a/board/esd/common/cmd_loadpci.c
+++ b/board/esd/common/cmd_loadpci.c
@@ -124,7 +124,7 @@ int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 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 066df74bf3..5c50b4c8dc 100644
--- a/board/esd/common/lcd.c
+++ b/board/esd/common/lcd.c
@@ -373,5 +373,5 @@ int do_esdbmp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 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 37ac0cc4eb..414e82135c 100644
--- a/board/esd/common/xilinx_jtag/micro.c
+++ b/board/esd/common/xilinx_jtag/micro.c
@@ -1869,4 +1869,4 @@ U_BOOT_CMD(
 	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 aba240f172..cd57ed4598 100644
--- a/board/esd/cpci2dp/cpci2dp.c
+++ b/board/esd/cpci2dp/cpci2dp.c
@@ -183,6 +183,6 @@ int do_eep_wren (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 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 ccbe245d76..a677c623f7 100644
--- a/board/esd/cpci405/cpci405.c
+++ b/board/esd/cpci405/cpci405.c
@@ -690,8 +690,8 @@ int do_onewire(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 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 @@ int do_get_bpip(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 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 @@ int do_set_bpip(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 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 b6b50fb46e..36fcf7f87d 100644
--- a/board/esd/cpci5200/cpci5200.c
+++ b/board/esd/cpci5200/cpci5200.c
@@ -295,4 +295,6 @@ int do_writepci(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 
 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 482663398a..258d8b234b 100644
--- a/board/esd/cpci750/cpci750.c
+++ b/board/esd/cpci750/cpci750.c
@@ -994,5 +994,5 @@ int do_show_config(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 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 0310c47cf1..675e5071d7 100644
--- a/board/esd/dasa_sim/cmd_dasa_sim.c
+++ b/board/esd/dasa_sim/cmd_dasa_sim.c
@@ -230,7 +230,7 @@ U_BOOT_CMD(
 	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 45dfa6fd77..0ec519b8db 100644
--- a/board/esd/du440/du440.c
+++ b/board/esd/du440/du440.c
@@ -607,8 +607,8 @@ int do_dcf77(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	dcf77, 1, 1, do_dcf77,
 	"Check DCF77 receiver",
-	NULL
-	);
+	""
+);
 
 /*
  * initialize USB hub via I2C1
@@ -657,8 +657,8 @@ int do_hubinit(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 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 @@ int do_setup_boot_eeprom(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	sbe, 2, 0, do_setup_boot_eeprom,
 	"setup boot eeprom",
-	NULL
-	);
+	""
+);
 
 #if defined(CONFIG_SYS_EEPROM_WREN)
 /*
@@ -863,8 +863,9 @@ int do_eep_wren (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 
 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 @@ int do_waitpwrirq(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	wpi,	1,	1,	do_waitpwrirq,
 	"Wait for power change interrupt",
-	NULL
-	);
+	""
+);
 
 /*
  * initialize DVI panellink transmitter
@@ -961,8 +962,8 @@ int do_dviinit(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 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 @@ int do_time(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 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 @@ int do_gfxdemo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 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 eab952c566..5ae4c75861 100644
--- a/board/esd/hh405/hh405.c
+++ b/board/esd/hh405/hh405.c
@@ -769,8 +769,9 @@ int do_eep_wren (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 
 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 db2c548421..5f3254d252 100644
--- a/board/esd/ocrtc/cmd_ocrtc.c
+++ b/board/esd/ocrtc/cmd_ocrtc.c
@@ -55,7 +55,7 @@ int do_setdevice(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	setdevice,	1,	1,	do_setdevice,
 	"Set device number on pci adapter boards",
-	NULL
+	""
 );
 
 
@@ -78,7 +78,7 @@ int do_getdevice(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 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 a0d1f3f0d1..1d14611293 100644
--- a/board/esd/pci405/cmd_pci405.c
+++ b/board/esd/pci405/cmd_pci405.c
@@ -109,6 +109,6 @@ int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 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 8973f97095..56184caa8f 100644
--- a/board/esd/pci405/pci405.c
+++ b/board/esd/pci405/pci405.c
@@ -381,5 +381,5 @@ U_BOOT_CMD(
 	"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 f225f0e196..4e64e83bf6 100644
--- a/board/esd/pf5200/pf5200.c
+++ b/board/esd/pf5200/pf5200.c
@@ -294,7 +294,7 @@ int do_poweroff(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 	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 @@ int do_phypower(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 }
 
 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 @@ int do_writepci(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 }
 
 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 a94604a2f2..fdacbf6f6b 100644
--- a/board/esd/plu405/plu405.c
+++ b/board/esd/plu405/plu405.c
@@ -333,6 +333,7 @@ int do_eep_wren (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 
 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 0fbc3dc239..1af431bd7d 100644
--- a/board/esd/pmc440/cmd_pmc440.c
+++ b/board/esd/pmc440/cmd_pmc440.c
@@ -99,8 +99,8 @@ int do_waithci(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 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 @@ U_BOOT_CMD(
 	"  - 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 @@ U_BOOT_CMD(
 	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 @@ int do_painit(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 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 @@ int do_selfreset(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 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 @@ int do_resetout(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 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 @@ int do_inta(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 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 @@ int do_pmm(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 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 @@ int do_eep_wren(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	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 9602ee59fd..18444427fe 100644
--- a/board/esd/tasreg/tasreg.c
+++ b/board/esd/tasreg/tasreg.c
@@ -250,8 +250,8 @@ int do_iploop(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	iploop,	2,	1,	do_iploop,
 	"i2c probe loop <addr>",
-	NULL
-	);
+	""
+);
 
 /*
  */
@@ -303,8 +303,8 @@ int do_codec(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	codec,	1,	1,	do_codec,
 	"Enable codec",
-	NULL
-	);
+	""
+);
 
 /*
  */
@@ -336,8 +336,8 @@ int do_saa(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	saa,	5,	1,	do_saa,
 	"Write to SAA1064 <addr> <instr> <cntrl> <data>",
-	NULL
-	);
+	""
+);
 
 /*
  */
@@ -375,8 +375,8 @@ int do_iwrite(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 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 @@ int do_iread(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	iread,	3,	1,	do_iread,
 	"Read from I2C <addr> <cnt>",
-	NULL
-	);
+	""
+);
 
 /*
  */
@@ -445,6 +445,6 @@ int do_ireadl(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 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 96a04b3ff8..91275507e0 100644
--- a/board/esd/voh405/voh405.c
+++ b/board/esd/voh405/voh405.c
@@ -392,6 +392,7 @@ int do_eep_wren (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 
 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/evb64260/zuma_pbb.c b/board/evb64260/zuma_pbb.c
index aef9c27e79..cab4fcae17 100644
--- a/board/evb64260/zuma_pbb.c
+++ b/board/evb64260/zuma_pbb.c
@@ -204,19 +204,17 @@ U_BOOT_CMD(
 	zinit,	 1,	 0,	 do_zuma_init_pbb,
 	"init zuma pbb",
 	"\n"
-	"    - init zuma pbb\n"
 );
 U_BOOT_CMD(
 	zdtest,	  3,	  1,	  do_zuma_test_dma,
 	"run dma test",
 	"[cmd [count]]\n"
-	"    - run dma cmd (w=0,v=1,cp=2,cmp=3,wi=4,vi=5), count bytes\n"
+	"    - run dma cmd (w=0,v=1,cp=2,cmp=3,wi=4,vi=5), count bytes"
 );
 U_BOOT_CMD(
 	zminit,	  1,	  0,	  do_zuma_init_mbox,
 	"init zuma mbox",
 	"\n"
-	"    - init zuma mbox\n"
 );
 
 #endif
diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c
index eb76d937f8..4851f066e7 100644
--- a/board/freescale/common/pixis.c
+++ b/board/freescale/common/pixis.c
@@ -279,9 +279,10 @@ int pixis_disable_watchdog_cmd(cmd_tbl_t *cmdtp,
 }
 
 U_BOOT_CMD(
-	   diswd, 1, 0, pixis_disable_watchdog_cmd,
-	   "Disable watchdog timer",
-	   NULL);
+	diswd, 1, 0, pixis_disable_watchdog_cmd,
+	"Disable watchdog timer",
+	""
+);
 
 #ifdef CONFIG_PIXIS_SGMII_CMD
 int pixis_set_sgmii(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -343,14 +344,15 @@ int pixis_set_sgmii(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 
 U_BOOT_CMD(
-		pixis_set_sgmii, CONFIG_SYS_MAXARGS, 1, pixis_set_sgmii,
-		"pixis_set_sgmii"
-		" - Enable or disable SGMII mode for a given TSEC \n",
-		"\npixis_set_sgmii [TSEC num] <on|off|switch>\n"
-		"    TSEC num: 1,2,3,4 or 'all'.  'all' is default.\n"
-		"    on - enables SGMII\n"
-		"    off - disables SGMII\n"
-		"    switch - use switch settings\n");
+	pixis_set_sgmii, CONFIG_SYS_MAXARGS, 1, pixis_set_sgmii,
+	"pixis_set_sgmii"
+	" - Enable or disable SGMII mode for a given TSEC \n",
+	"\npixis_set_sgmii [TSEC num] <on|off|switch>\n"
+	"    TSEC num: 1,2,3,4 or 'all'.  'all' is default.\n"
+	"    on - enables SGMII\n"
+	"    off - disables SGMII\n"
+	"    switch - use switch settings"
+);
 #endif
 
 /*
@@ -544,5 +546,5 @@ U_BOOT_CMD(
 	"    pixis_reset [altbank]\n"
 	"    pixis_reset altbank wd\n"
 	"    pixis_reset altbank cf <SYSCLK freq> <COREPLL ratio> <MPXPLL ratio>\n"
-	"    pixis_reset cf <SYSCLK freq> <COREPLL ratio> <MPXPLL ratio>\n"
-	);
+	"    pixis_reset cf <SYSCLK freq> <COREPLL ratio> <MPXPLL ratio>"
+);
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
index 2b2d5d7ec2..0ad878c293 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
@@ -140,8 +140,8 @@ U_BOOT_CMD(
 	diufb, CONFIG_SYS_MAXARGS, 1, mpc8610diu_init_show_bmp,
 	"Init or Display BMP file",
 	"init\n    - initialize DIU\n"
-	"addr\n    - display bmp at address 'addr'\n"
-	);
+	"addr\n    - display bmp at address 'addr'"
+);
 
 
 #if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE)
diff --git a/board/g2000/g2000.c b/board/g2000/g2000.c
index b35038dc43..218f1bebf7 100644
--- a/board/g2000/g2000.c
+++ b/board/g2000/g2000.c
@@ -186,7 +186,7 @@ int do_dumpebc(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	dumpebc,	1,	1,	do_dumpebc,
 	"Dump all EBC registers",
-	NULL
+	""
 );
 
 
@@ -208,7 +208,7 @@ int do_dumpdcr(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	dumpdcr,	1,	1,	do_dumpdcr,
 	"Dump all DCR registers",
-	NULL
+	""
 );
 
 
@@ -272,6 +272,6 @@ int do_dumpspr(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	dumpspr,	1,	1,	do_dumpspr,
 	"Dump all SPR registers",
-	NULL
+	""
 );
 #endif
diff --git a/board/hymod/bsp.c b/board/hymod/bsp.c
index 092d368440..262070fdff 100644
--- a/board/hymod/bsp.c
+++ b/board/hymod/bsp.c
@@ -297,7 +297,7 @@ U_BOOT_CMD(
 	"fpga info\n"
 	"  - print information about the Hymod FPGA, namely the\n"
 	"    memory addresses at which the four FPGA local bus\n"
-	"    address spaces appear in the physical address space\n"
+	"    address spaces appear in the physical address space"
 );
 /* ------------------------------------------------------------------------- */
 int
@@ -340,7 +340,7 @@ U_BOOT_CMD(
 	"[type]\n"
 	"  - write zeroes into the EEPROM on the board of type `type'\n"
 	"    (`type' is either `main' or `mezz' - default `main')\n"
-	"    Note: the EEPROM write enable jumper must be installed\n"
+	"    Note: the EEPROM write enable jumper must be installed"
 );
 
 /* ------------------------------------------------------------------------- */
diff --git a/board/inka4x0/inkadiag.c b/board/inka4x0/inkadiag.c
index 12c0a85d6e..3761ef66d4 100644
--- a/board/inka4x0/inkadiag.c
+++ b/board/inka4x0/inkadiag.c
@@ -439,14 +439,14 @@ static int do_inkadiag_help(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 
 cmd_tbl_t cmd_inkadiag_sub[] = {
 	U_BOOT_CMD_MKENT(io, 1, 1, do_inkadiag_io, "read digital input",
-	 "<drawer1|drawer2|other> [value] - get or set specified signal\n"),
+	 "<drawer1|drawer2|other> [value] - get or set specified signal"),
 	U_BOOT_CMD_MKENT(serial, 4, 1, do_inkadiag_serial, "test serial port",
 	 "<num> <mode> <baudrate> <msg>  - test uart num [0..11] in mode\n"
-	 "and baudrate with msg\n"),
+	 "and baudrate with msg"),
 	U_BOOT_CMD_MKENT(buzzer, 2, 1, do_inkadiag_buzzer, "activate buzzer",
-	 "<period> <freq> - turn buzzer on for period ms with freq hz\n"),
+	 "<period> <freq> - turn buzzer on for period ms with freq hz"),
 	U_BOOT_CMD_MKENT(help, 4, 1, do_inkadiag_help, "get help",
-	 "[command] - get help for command\n"),
+	 "[command] - get help for command"),
 };
 
 static int do_inkadiag_help(cmd_tbl_t *cmdtp, int flag,
@@ -483,7 +483,7 @@ U_BOOT_CMD(inkadiag, 6, 1, do_inkadiag,
 	   "inkadiag - inka diagnosis\n",
 	   "[inkadiag what ...]\n"
 	   "    - perform a diagnosis on inka hardware\n"
-	   "'inkadiag' performs hardware tests.\n\n");
+	   "'inkadiag' performs hardware tests.");
 
 /* Relocate the command table function pointers when running in RAM */
 int inkadiag_init_r (void) {
diff --git a/board/keymile/common/keymile_hdlc_enet.c b/board/keymile/common/keymile_hdlc_enet.c
index 57978800f6..2e913adc55 100644
--- a/board/keymile/common/keymile_hdlc_enet.c
+++ b/board/keymile/common/keymile_hdlc_enet.c
@@ -591,7 +591,7 @@ int hdlc_enet_stest(struct cmd_tbl_s *a, int b, int c, char **d)
 U_BOOT_CMD(
 	stest, 1, 1, hdlc_enet_stest,
 	"simple send test for hdlc_enet",
-	"no arguments\n"
+	""
 );
 /* simple receive test routine */
 int hdlc_enet_rtest(struct cmd_tbl_s *a, int b, int c, char **d)
@@ -613,7 +613,7 @@ int hdlc_enet_rtest(struct cmd_tbl_s *a, int b, int c, char **d)
 U_BOOT_CMD(
 	rtest, 1, 1, hdlc_enet_rtest,
 	"simple receive test for hdlc_enet",
-	"no arguments\n"
+	""
 );
 #endif
 
diff --git a/board/lwmon/lwmon.c b/board/lwmon/lwmon.c
index 1b665a9188..75b32090d1 100644
--- a/board/lwmon/lwmon.c
+++ b/board/lwmon/lwmon.c
@@ -853,7 +853,7 @@ U_BOOT_CMD(
 	pic,	4,	1,	do_pic,
 	"read and write PIC registers",
 	"read  reg      - read PIC register `reg'\n"
-	"pic write reg val  - write value `val' to PIC register `reg'\n"
+	"pic write reg val  - write value `val' to PIC register `reg'"
 );
 
 /***********************************************************************
@@ -911,7 +911,7 @@ int do_kbd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	kbd,	1,	1,	do_kbd,
 	"read keyboard status",
-	NULL
+	""
 );
 
 /* Read and set LSB switch */
@@ -985,7 +985,7 @@ U_BOOT_CMD(
 	"check and set LSB switch",
 	"on  - switch LSB on\n"
 	"lsb off - switch LSB off\n"
-	"lsb     - print current setting\n"
+	"lsb     - print current setting"
 );
 
 #endif
diff --git a/board/lwmon5/kbd.c b/board/lwmon5/kbd.c
index bafd39c62a..be1a1dfeb5 100644
--- a/board/lwmon5/kbd.c
+++ b/board/lwmon5/kbd.c
@@ -433,7 +433,7 @@ int do_kbd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	kbd,	1,	1,	do_kbd,
 	"read keyboard status",
-	NULL
+	""
 );
 
 /*----------------------------- Utilities -----------------------------*/
diff --git a/board/lwmon5/lwmon5.c b/board/lwmon5/lwmon5.c
index 4c04b98419..9b76e7663c 100644
--- a/board/lwmon5/lwmon5.c
+++ b/board/lwmon5/lwmon5.c
@@ -487,7 +487,7 @@ int do_eeprom_wp(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	eepromwp,	2,	0,	do_eeprom_wp,
 	"eeprom write protect off/on",
-	"<on|off> - enable (on) or disable (off) I2C EEPROM write protect\n"
+	"<on|off> - enable (on) or disable (off) I2C EEPROM write protect"
 );
 
 #if defined(CONFIG_VIDEO)
diff --git a/board/micronas/vct/smc_eeprom.c b/board/micronas/vct/smc_eeprom.c
index 2bc7ad4c4b..6587f13e2f 100644
--- a/board/micronas/vct/smc_eeprom.c
+++ b/board/micronas/vct/smc_eeprom.c
@@ -384,11 +384,11 @@ static int do_eeprom_save_mac(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]
 }
 
 U_BOOT_CMD(smcee, 1, 0, do_eeprom_erase_all,
-	   "smcee   - Erase content of SMC EEPROM\n",);
+	   "smcee   - Erase content of SMC EEPROM",);
 
 U_BOOT_CMD(smced, 1, 0, do_eeprom_dump,
-	   "smced   - Dump content of SMC EEPROM\n",);
+	   "smced   - Dump content of SMC EEPROM",);
 
 U_BOOT_CMD(smcew, 2, 0, do_eeprom_save_mac,
 	   "smcew   - Write MAC address to SMC EEPROM\n",
-	   "aa:bb:cc:dd:ee:ff  new mac address\n");
+	   "aa:bb:cc:dd:ee:ff  new mac address");
diff --git a/board/mpl/mip405/cmd_mip405.c b/board/mpl/mip405/cmd_mip405.c
index dc1380445a..cd93a7ca0b 100644
--- a/board/mpl/mip405/cmd_mip405.c
+++ b/board/mpl/mip405/cmd_mip405.c
@@ -60,7 +60,7 @@ U_BOOT_CMD(
 	"mip405 flash mps - updates U-Boot with image from MPS\n"
 	"mip405 info      - displays board information\n"
 	"mip405 led <on>  - switches LED on (on=1) or off (on=0)\n"
-	"mip405 mem [cnt] - Memory Test <cnt>-times, <cnt> = -1 loop forever\n"
+	"mip405 mem [cnt] - Memory Test <cnt>-times, <cnt> = -1 loop forever"
 );
 
 /* ------------------------------------------------------------------------- */
diff --git a/board/mpl/pati/cmd_pati.c b/board/mpl/pati/cmd_pati.c
index 95bfdcc8c8..0682323ae1 100644
--- a/board/mpl/pati/cmd_pati.c
+++ b/board/mpl/pati/cmd_pati.c
@@ -443,7 +443,7 @@ U_BOOT_CMD(
 	"    era   - erase PCI EEPROM (write all word to 0xffff)\n"
 	"    reload- Reload PCI Bridge with EEPROM Values\n"
 	"    NOTE: <addr> must start on word boundary\n"
-	"          <offset> and <size> must be even byte values\n"
+	"          <offset> and <size> must be even byte values"
 );
 
 /* ------------------------------------------------------------------------- */
diff --git a/board/mpl/pip405/cmd_pip405.c b/board/mpl/pip405/cmd_pip405.c
index ad5e0a1e18..6bbae89e5d 100644
--- a/board/mpl/pip405/cmd_pip405.c
+++ b/board/mpl/pip405/cmd_pip405.c
@@ -63,7 +63,7 @@ U_BOOT_CMD(
 	"PIP405 specific Cmds",
 	"flash mem [SrcAddr] - updates U-Boot with image in memory\n"
 	"pip405 flash floppy [SrcAddr] - updates U-Boot with image from floppy\n"
-	"pip405 flash mps - updates U-Boot with image from MPS\n"
+	"pip405 flash mps - updates U-Boot with image from MPS"
 );
 
 /* ------------------------------------------------------------------------- */
diff --git a/board/mpl/vcma9/cmd_vcma9.c b/board/mpl/vcma9/cmd_vcma9.c
index cbe7fe256e..0160774395 100644
--- a/board/mpl/vcma9/cmd_vcma9.c
+++ b/board/mpl/vcma9/cmd_vcma9.c
@@ -174,5 +174,5 @@ int do_vcma9(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	vcma9, 6, 1, do_vcma9,
 	"VCMA9 specific commands",
-	"flash mem [SrcAddr]\n    - updates U-Boot with image in memory\n"
+	"flash mem [SrcAddr]\n    - updates U-Boot with image in memory"
 );
diff --git a/board/pcippc2/pcippc2.c b/board/pcippc2/pcippc2.c
index 80c2cb58e2..7985f7d711 100644
--- a/board/pcippc2/pcippc2.c
+++ b/board/pcippc2/pcippc2.c
@@ -239,7 +239,7 @@ U_BOOT_CMD(
 	"check and set watchdog",
 	"on   - switch watchDog on\n"
 	"wd off  - switch watchdog off\n"
-	"wd      - print current status\n"
+	"wd      - print current status"
 );
 
 #endif
diff --git a/board/pcs440ep/pcs440ep.c b/board/pcs440ep/pcs440ep.c
index 9cc3f5b640..47d6391469 100644
--- a/board/pcs440ep/pcs440ep.c
+++ b/board/pcs440ep/pcs440ep.c
@@ -763,7 +763,7 @@ U_BOOT_CMD(
 	"              0x02 = DIAG 2 on\n"
 	"              0x04 = DIAG 3 on\n"
 	"              0x08 = DIAG 4 on\n"
-	"              > 0x100 set the LED, who are on, to state blinking\n"
+	"              > 0x100 set the LED, who are on, to state blinking"
 );
 
 #if defined(CONFIG_SHA1_CHECK_UB_IMG)
@@ -823,7 +823,7 @@ U_BOOT_CMD(
 	"calculate the SHA1 Sum",
 	"address len [addr]  calculate the SHA1 sum [save at addr]\n"
 	"     -p calculate the SHA1 sum from the U-Boot image in flash and print\n"
-	"     -c check the U-Boot image in flash\n"
+	"     -c check the U-Boot image in flash"
 );
 #endif
 
diff --git a/board/pn62/cmd_pn62.c b/board/pn62/cmd_pn62.c
index ff5d63ee12..a989351722 100644
--- a/board/pn62/cmd_pn62.c
+++ b/board/pn62/cmd_pn62.c
@@ -54,8 +54,8 @@ int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	led    ,	3,	1,	do_led,
 	"set LED 0..11 on the PN62 board",
-	"i fun\n"
-	"    - set 'i'th LED to function 'fun'\n"
+	"i fun"
+	"    - set 'i'th LED to function 'fun'"
 );
 
 /*
@@ -177,7 +177,7 @@ U_BOOT_CMD(
 	loadpci,	2,	1,	do_loadpci,
 	"load binary file over PCI",
 	"[addr]\n"
-	"    - load binary file over PCI to address 'addr'\n"
+	"    - load binary file over PCI to address 'addr'"
 );
 
 #endif
diff --git a/board/prodrive/pdnb3/pdnb3.c b/board/prodrive/pdnb3/pdnb3.c
index 877728403f..c323456d60 100644
--- a/board/prodrive/pdnb3/pdnb3.c
+++ b/board/prodrive/pdnb3/pdnb3.c
@@ -228,7 +228,7 @@ int do_fpga(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	fpga,     2,     0,      do_fpga,
 	"boot FPGA",
-	"address size\n    - boot FPGA with gzipped image at <address>\n"
+	"address size\n    - boot FPGA with gzipped image at <address>"
 );
 
 #if defined(CONFIG_CMD_PCI) || defined(CONFIG_PCI)
diff --git a/board/pxa255_idp/pxa_idp.c b/board/pxa255_idp/pxa_idp.c
index aa598aaa44..e9e479c4ba 100644
--- a/board/pxa255_idp/pxa_idp.c
+++ b/board/pxa255_idp/pxa_idp.c
@@ -129,7 +129,7 @@ int do_idpcmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(idpcmd, CONFIG_SYS_MAXARGS, 0, do_idpcmd,
 	   "custom IDP command",
-	   "no args at this time\n"
+	   "no args at this time"
 );
 
 #endif
diff --git a/board/r360mpi/r360mpi.c b/board/r360mpi/r360mpi.c
index 1871984a69..703af73aad 100644
--- a/board/r360mpi/r360mpi.c
+++ b/board/r360mpi/r360mpi.c
@@ -415,5 +415,5 @@ int do_kbd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	kbd,	1,	1,	do_kbd,
 	"read keyboard status",
-	NULL
+	""
 );
diff --git a/board/renesas/sh7785lcr/rtl8169_mac.c b/board/renesas/sh7785lcr/rtl8169_mac.c
index 6d0bbc0c2f..634efb42a8 100644
--- a/board/renesas/sh7785lcr/rtl8169_mac.c
+++ b/board/renesas/sh7785lcr/rtl8169_mac.c
@@ -325,7 +325,7 @@ U_BOOT_CMD(
 	setmac,	2,	1,	do_set_mac,
 	"write MAC address for RTL8110SCL",
 	"\n"
-	"setmac <mac address> - write MAC address for RTL8110SCL\n"
+	"setmac <mac address> - write MAC address for RTL8110SCL"
 );
 
 int do_print_mac(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -344,5 +344,5 @@ U_BOOT_CMD(
 	printmac,	1,	1,	do_print_mac,
 	"print MAC address for RTL8110",
 	"\n"
-	"    - print MAC address for RTL8110\n"
+	"    - print MAC address for RTL8110"
 );
diff --git a/board/renesas/sh7785lcr/selfcheck.c b/board/renesas/sh7785lcr/selfcheck.c
index 6dbb7842e4..e803b3c9c1 100644
--- a/board/renesas/sh7785lcr/selfcheck.c
+++ b/board/renesas/sh7785lcr/selfcheck.c
@@ -168,5 +168,5 @@ U_BOOT_CMD(
 	"hwtest sm107 - output SM107 version\n"
 	"hwtest net   - check RTL8110 ID\n"
 	"hwtest sata  - check SiI3512 ID\n"
-	"hwtest pci   - output PCI slot device ID\n"
+	"hwtest pci   - output PCI slot device ID"
 );
diff --git a/board/renesas/sh7785lcr/sh7785lcr.c b/board/renesas/sh7785lcr/sh7785lcr.c
index 6bdf3c067a..9948d04eae 100644
--- a/board/renesas/sh7785lcr/sh7785lcr.c
+++ b/board/renesas/sh7785lcr/sh7785lcr.c
@@ -82,6 +82,6 @@ U_BOOT_CMD(
 	pmb,	1,	1,	do_pmb,
 	"pmb     - PMB setting\n",
 	"\n"
-	"    - PMB setting for all SDRAM mapping\n"
+	"    - PMB setting for all SDRAM mapping"
 );
 #endif
diff --git a/board/sandburst/common/ppc440gx_i2c.c b/board/sandburst/common/ppc440gx_i2c.c
index c1af70ceab..bc88e5a7eb 100644
--- a/board/sandburst/common/ppc440gx_i2c.c
+++ b/board/sandburst/common/ppc440gx_i2c.c
@@ -501,7 +501,7 @@ int do_i2c1_probe(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	iprobe1,	1,	1,	do_i2c1_probe,
 	"probe to discover valid I2C chip addresses",
-	"\n    -discover valid I2C chip addresses\n"
+	""
 );
 
 #endif	/* CONFIG_I2C_BUS1 */
diff --git a/board/sandburst/karef/karef.c b/board/sandburst/karef/karef.c
index b8ae68fcd6..92f5247565 100644
--- a/board/sandburst/karef/karef.c
+++ b/board/sandburst/karef/karef.c
@@ -611,7 +611,7 @@ int karefRecover(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 
 U_BOOT_CMD(kasetup, 1, 1, karefSetupVars,
-	   "Set environment to factory defaults", NULL);
+	   "Set environment to factory defaults", "");
 
 U_BOOT_CMD(karecover, 1, 1, karefRecover,
-	   "Set environment to allow for fs recovery", NULL);
+	   "Set environment to allow for fs recovery", "");
diff --git a/board/sandburst/metrobox/metrobox.c b/board/sandburst/metrobox/metrobox.c
index fc136c89c4..27d7f74088 100644
--- a/board/sandburst/metrobox/metrobox.c
+++ b/board/sandburst/metrobox/metrobox.c
@@ -577,7 +577,7 @@ int metroboxRecover(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 
 U_BOOT_CMD(mbsetup, 1, 1, metroboxSetupVars,
-	   "Set environment to factory defaults", NULL);
+	   "Set environment to factory defaults", "");
 
 U_BOOT_CMD(mbrecover, 1, 1, metroboxRecover,
-	   "Set environment to allow for fs recovery", NULL);
+	   "Set environment to allow for fs recovery", "");
diff --git a/board/siemens/common/fpga.c b/board/siemens/common/fpga.c
index c9a93e1589..4b45902aa2 100644
--- a/board/siemens/common/fpga.c
+++ b/board/siemens/common/fpga.c
@@ -295,7 +295,7 @@ U_BOOT_CMD(
 	"access FPGA(s)",
 	"fpga status [name] - print FPGA status\n"
 	"fpga reset  [name] - reset FPGA\n"
-	"fpga load [name] addr - load FPGA configuration data\n"
+	"fpga load [name] addr - load FPGA configuration data"
 );
 
 #endif
diff --git a/board/siemens/pcu_e/pcu_e.c b/board/siemens/pcu_e/pcu_e.c
index f87d6bc00f..827578c3a9 100644
--- a/board/siemens/pcu_e/pcu_e.c
+++ b/board/siemens/pcu_e/pcu_e.c
@@ -404,10 +404,10 @@ int do_puma (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 }
 
 U_BOOT_CMD (puma, 4, 1, do_puma,
-	    "access PUMA FPGA",
-	    "status - print PUMA status\n"
-	    "puma load addr len - load PUMA configuration data\n");
-
+	"access PUMA FPGA",
+	"status - print PUMA status\n"
+	"puma load addr len - load PUMA configuration data"
+);
 #endif
 
 /* . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . */
diff --git a/board/ssv/common/cmd_sled.c b/board/ssv/common/cmd_sled.c
index 99ff507608..449c1a4994 100644
--- a/board/ssv/common/cmd_sled.c
+++ b/board/ssv/common/cmd_sled.c
@@ -157,6 +157,6 @@ int do_sled (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD (sled, 3, 0, do_sled,
 	    "check and set status led",
-	    "sled [name [state]]\n" __NAME_STR "    - state: on|off|blink\n");
+	    "sled [name [state]]\n" __NAME_STR "    - state: on|off|blink");
 #endif
 #endif	/* CONFIG_STATUS_LED */
diff --git a/board/ssv/common/wd_pio.c b/board/ssv/common/wd_pio.c
index 9b384259e4..eaf1d2526c 100644
--- a/board/ssv/common/wd_pio.c
+++ b/board/ssv/common/wd_pio.c
@@ -154,7 +154,7 @@ U_BOOT_CMD(
 	"check and set watchdog",
 	"on   - switch watchDog on\n"
 	"wd off  - switch watchdog off\n"
-	"wd      - print current status\n"
+	"wd      - print current status"
 );
 #endif
 #endif	/* CONFIG_HW_WATCHDOG */
diff --git a/board/tqc/tqm5200/cmd_stk52xx.c b/board/tqc/tqm5200/cmd_stk52xx.c
index 20632a7f1e..e309beb1dc 100644
--- a/board/tqc/tqm5200/cmd_stk52xx.c
+++ b/board/tqc/tqm5200/cmd_stk52xx.c
@@ -1201,21 +1201,21 @@ U_BOOT_CMD(
 	"sound square [duration] [freq] [channel]\n"
 	"    - generate squarewave for 'duration' ms with frequency 'freq'\n"
 	"      on left \"l\" or right \"r\" channel\n"
-	"pcm1772 reg val\n"
+	"pcm1772 reg val"
 );
 
 U_BOOT_CMD(
 	wav ,    3,    1,     cmd_wav,
 	"play wav file",
 	"[addr] [bytes]\n"
-	"    - play wav file at address 'addr' with length 'bytes'\n"
+	"    - play wav file at address 'addr' with length 'bytes'"
 );
 
 U_BOOT_CMD(
 	beep ,    2,    1,     cmd_beep,
 	"play short beep",
 	"[channel]\n"
-	"    - play short beep on \"l\"eft or \"r\"ight channel\n"
+	"    - play short beep on \"l\"eft or \"r\"ight channel"
 );
 #endif /* CONFIG_STK52XX  || CONFIG_FO300 */
 
@@ -1228,10 +1228,11 @@ U_BOOT_CMD(
 	"fkt can\n"
 	"     - loopback plug for X83 required\n"
 	"fkt rs232 number\n"
-	"     - loopback plug(s) for X2 required\n"
+	"     - loopback plug(s) for X2 required"
 #ifndef CONFIG_TQM5200S
+	"\n"
 	"fkt backlight on/off\n"
-	"     - switch backlight on or off\n"
+	"     - switch backlight on or off"
 #endif /* !CONFIG_TQM5200S */
 );
 #elif defined(CONFIG_FO300)
@@ -1241,7 +1242,7 @@ U_BOOT_CMD(
 	"fkt can\n"
 	"     - loopback plug for X16/X29 required\n"
 	"fkt rs232 number\n"
-	"     - loopback plug(s) for X21/X22 required\n"
+	"     - loopback plug(s) for X21/X22 required"
 );
 #endif
 #endif
diff --git a/board/tqc/tqm5200/cmd_tb5200.c b/board/tqc/tqm5200/cmd_tb5200.c
index b9c9e7e194..578e716e7a 100644
--- a/board/tqc/tqm5200/cmd_tb5200.c
+++ b/board/tqc/tqm5200/cmd_tb5200.c
@@ -91,13 +91,13 @@ int cmd_backlight(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	led ,	2,	1,	cmd_led,
 	"switch status LED on or off",
-	"on/off\n"
+	"on/off"
 );
 
 U_BOOT_CMD(
 	backlight ,	2,	1,	cmd_backlight,
 	"switch backlight on or off",
-	"on/off\n"
+	"on/off"
 	);
 
 #endif /* CONFIG_STK52XX */
diff --git a/board/tqc/tqm8272/tqm8272.c b/board/tqc/tqm8272/tqm8272.c
index 5bc080ff81..92f74a39cc 100644
--- a/board/tqc/tqm8272/tqm8272.c
+++ b/board/tqc/tqm8272/tqm8272.c
@@ -867,7 +867,7 @@ int do_hwib_dump (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	  hwib, 1,	1,	do_hwib_dump,
 	  "dump HWIB'",
-	  "\n"
+	  ""
 );
 
 #ifdef CONFIG_SYS_UPDATE_FLASH_SIZE
diff --git a/board/trab/cmd_trab.c b/board/trab/cmd_trab.c
index 7e2a672348..d0465fb7e6 100644
--- a/board/trab/cmd_trab.c
+++ b/board/trab/cmd_trab.c
@@ -262,7 +262,7 @@ U_BOOT_CMD(
 	"\n"
 	"    -  start burn-in test application\n"
 	"       The burn-in test could took a while to finish!\n"
-	"       The content of the onboard EEPROM is modified!\n"
+	"       The content of the onboard EEPROM is modified!"
 );
 
 
@@ -295,7 +295,7 @@ U_BOOT_CMD(
 	"read dip switch on TRAB",
 	"\n"
 	"    - read state of dip switch (S1) on TRAB board\n"
-	"      read sequence: 1-2-3-4; ON=1; OFF=0; e.g.: \"0100\"\n"
+	"      read sequence: 1-2-3-4; ON=1; OFF=0; e.g.: \"0100\""
 );
 
 
@@ -323,7 +323,7 @@ U_BOOT_CMD(
 	vcc5v,	1,	1,	do_vcc5v,
 	"read VCC5V on TRAB",
 	"\n"
-	"    - read actual value of voltage VCC5V\n"
+	"    - read actual value of voltage VCC5V"
 );
 
 
@@ -347,7 +347,7 @@ int do_contact_temp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	c_temp,	1,	1,	do_contact_temp,
 	"read contact temperature on TRAB",
-	"\n"
+	""
 	"    -  reads the onboard temperature (=contact temperature)\n"
 );
 
@@ -401,7 +401,7 @@ U_BOOT_CMD(
 	"print burn in status on TRAB",
 	"\n"
 	"    -  prints the status variables of the last burn in test\n"
-	"       stored in the onboard EEPROM on TRAB board\n"
+	"       stored in the onboard EEPROM on TRAB board"
 );
 
 static int read_dip (void)
@@ -890,7 +890,7 @@ U_BOOT_CMD(
 	"delay\n"
 	"    - contact temperature [1/100 C] is printed endlessly to console\n"
 	"      <delay> specifies the seconds to wait between two measurements\n"
-	"      For each measurment a timestamp is printeted\n"
+	"      For each measurment a timestamp is printeted"
 );
 
 #endif
diff --git a/board/trab/trab.c b/board/trab/trab.c
index 53590650f1..ddf6abf7b4 100644
--- a/board/trab/trab.c
+++ b/board/trab/trab.c
@@ -323,7 +323,7 @@ int do_kbd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	kbd,	1,	1,	do_kbd,
 	"read keyboard status",
-	NULL
+	""
 );
 
 #ifdef CONFIG_MODEM_SUPPORT
diff --git a/board/trizepsiv/eeprom.c b/board/trizepsiv/eeprom.c
index 9fa7aef9a2..b6b16bf680 100644
--- a/board/trizepsiv/eeprom.c
+++ b/board/trizepsiv/eeprom.c
@@ -81,4 +81,5 @@ U_BOOT_CMD(
 	"\tdm9000ee read \n"
 	"\tword:\t\t00-02 : MAC Address\n"
 	"\t\t\t03-07 : DM9000 Configuration\n"
-	"\t\t\t08-63 : User data\n");
+	"\t\t\t08-63 : User data"
+);
diff --git a/board/w7o/cmd_vpd.c b/board/w7o/cmd_vpd.c
index eaec940e67..013fc791f2 100644
--- a/board/w7o/cmd_vpd.c
+++ b/board/w7o/cmd_vpd.c
@@ -60,7 +60,7 @@ U_BOOT_CMD(
 	  vpd,	2,	1,	do_vpd,
 	  "Read Vital Product Data",
 	  "[dev_addr]\n"
-	  "        - Read VPD Data from default address, or device address 'dev_addr'.\n"
+	  "        - Read VPD Data from default address, or device address 'dev_addr'."
 );
 
 #endif
diff --git a/board/zeus/update.c b/board/zeus/update.c
index ce1f34fee2..c8487e58f8 100644
--- a/board/zeus/update.c
+++ b/board/zeus/update.c
@@ -99,7 +99,7 @@ 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 content",
-	NULL
+	""
 );
 
 #endif
diff --git a/board/zeus/zeus.c b/board/zeus/zeus.c
index 3f329c2fc9..9bc390f837 100644
--- a/board/zeus/zeus.c
+++ b/board/zeus/zeus.c
@@ -328,7 +328,7 @@ int do_set_default(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
 	setdef,	4,	1,	do_set_default,
 	"write board-specific values to EEPROM (ethaddr...)",
-	"ethaddr eth1addr serial#\n    - write board-specific values to EEPROM\n"
+	"ethaddr eth1addr serial#\n    - write board-specific values to EEPROM"
 	);
 
 static inline int sw_reset_pressed(void)
@@ -419,7 +419,7 @@ int do_chkreset(cmd_tbl_t* cmdtp, int flag, int argc, char* argv[])
 U_BOOT_CMD (
 	chkreset, 1, 1, do_chkreset,
 	"Check for status of SW-reset button and act accordingly",
-	NULL
+	""
 );
 
 #if defined(CONFIG_POST)