diff --git a/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c b/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c
index 02a095e..73dfb3d 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 @@
 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 41a1353..1dd60af 100644
--- a/board/ads5121/ads5121_diu.c
+++ b/board/ads5121/ads5121_diu.c
@@ -131,7 +131,7 @@
 	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 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"
 );
diff --git a/board/amirix/ap1000/ap1000.c b/board/amirix/ap1000/ap1000.c
index fcf2698..cadfe0b 100644
--- a/board/amirix/ap1000/ap1000.c
+++ b/board/amirix/ap1000/ap1000.c
@@ -670,14 +670,14 @@
 	    "        - 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 @@
 	    "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 f727061..28e2bbc 100644
--- a/board/amirix/ap1000/powerspan.c
+++ b/board/amirix/ap1000/powerspan.c
@@ -487,7 +487,7 @@
 	    "    - 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 a19e1ed..d7a0078 100644
--- a/board/barco/barco.c
+++ b/board/barco/barco.c
@@ -307,19 +307,19 @@
 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 aa46e58..271ffb1 100644
--- a/board/bc3450/cmd_bc3450.c
+++ b/board/bc3450/cmd_bc3450.c
@@ -198,7 +198,7 @@
 	    "\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 @@
 
 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 @@
 	    "\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 @@
 
 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 @@
 
 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 e77bb0c..e65c4f8 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 @@
 /* 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 f009eed..cd98ae2 100644
--- a/board/cm5200/cmd_cm5200.c
+++ b/board/cm5200/cmd_cm5200.c
@@ -443,6 +443,6 @@
 	"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 73e6c3e..84ff47e 100644
--- a/board/delta/delta.c
+++ b/board/delta/delta.c
@@ -260,7 +260,7 @@
 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 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) */
diff --git a/board/evb64260/zuma_pbb.c b/board/evb64260/zuma_pbb.c
index aef9c27..cab4fca 100644
--- a/board/evb64260/zuma_pbb.c
+++ b/board/evb64260/zuma_pbb.c
@@ -204,19 +204,17 @@
 	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 eb76d93..4851f06 100644
--- a/board/freescale/common/pixis.c
+++ b/board/freescale/common/pixis.c
@@ -279,9 +279,10 @@
 }
 
 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 @@
 }
 
 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 @@
 	"    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 2b2d5d7..0ad878c 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
@@ -140,8 +140,8 @@
 	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 b35038d..218f1be 100644
--- a/board/g2000/g2000.c
+++ b/board/g2000/g2000.c
@@ -186,7 +186,7 @@
 U_BOOT_CMD(
 	dumpebc,	1,	1,	do_dumpebc,
 	"Dump all EBC registers",
-	NULL
+	""
 );
 
 
@@ -208,7 +208,7 @@
 U_BOOT_CMD(
 	dumpdcr,	1,	1,	do_dumpdcr,
 	"Dump all DCR registers",
-	NULL
+	""
 );
 
 
@@ -272,6 +272,6 @@
 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 092d368..262070f 100644
--- a/board/hymod/bsp.c
+++ b/board/hymod/bsp.c
@@ -297,7 +297,7 @@
 	"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 @@
 	"[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 12c0a85..3761ef6 100644
--- a/board/inka4x0/inkadiag.c
+++ b/board/inka4x0/inkadiag.c
@@ -439,14 +439,14 @@
 
 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 @@
 	   "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 5797880..2e913ad 100644
--- a/board/keymile/common/keymile_hdlc_enet.c
+++ b/board/keymile/common/keymile_hdlc_enet.c
@@ -591,7 +591,7 @@
 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 @@
 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 1b665a9..75b3209 100644
--- a/board/lwmon/lwmon.c
+++ b/board/lwmon/lwmon.c
@@ -853,7 +853,7 @@
 	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 @@
 U_BOOT_CMD(
 	kbd,	1,	1,	do_kbd,
 	"read keyboard status",
-	NULL
+	""
 );
 
 /* Read and set LSB switch */
@@ -985,7 +985,7 @@
 	"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 bafd39c..be1a1df 100644
--- a/board/lwmon5/kbd.c
+++ b/board/lwmon5/kbd.c
@@ -433,7 +433,7 @@
 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 4c04b98..9b76e76 100644
--- a/board/lwmon5/lwmon5.c
+++ b/board/lwmon5/lwmon5.c
@@ -487,7 +487,7 @@
 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 2bc7ad4..6587f13 100644
--- a/board/micronas/vct/smc_eeprom.c
+++ b/board/micronas/vct/smc_eeprom.c
@@ -384,11 +384,11 @@
 }
 
 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 dc13804..cd93a7c 100644
--- a/board/mpl/mip405/cmd_mip405.c
+++ b/board/mpl/mip405/cmd_mip405.c
@@ -60,7 +60,7 @@
 	"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 95bfdcc..0682323 100644
--- a/board/mpl/pati/cmd_pati.c
+++ b/board/mpl/pati/cmd_pati.c
@@ -443,7 +443,7 @@
 	"    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 ad5e0a1..6bbae89 100644
--- a/board/mpl/pip405/cmd_pip405.c
+++ b/board/mpl/pip405/cmd_pip405.c
@@ -63,7 +63,7 @@
 	"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 cbe7fe2..0160774 100644
--- a/board/mpl/vcma9/cmd_vcma9.c
+++ b/board/mpl/vcma9/cmd_vcma9.c
@@ -174,5 +174,5 @@
 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 80c2cb5..7985f7d 100644
--- a/board/pcippc2/pcippc2.c
+++ b/board/pcippc2/pcippc2.c
@@ -239,7 +239,7 @@
 	"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 9cc3f5b..47d6391 100644
--- a/board/pcs440ep/pcs440ep.c
+++ b/board/pcs440ep/pcs440ep.c
@@ -763,7 +763,7 @@
 	"              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 @@
 	"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 ff5d63e..a989351 100644
--- a/board/pn62/cmd_pn62.c
+++ b/board/pn62/cmd_pn62.c
@@ -54,8 +54,8 @@
 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 @@
 	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 8777284..c323456 100644
--- a/board/prodrive/pdnb3/pdnb3.c
+++ b/board/prodrive/pdnb3/pdnb3.c
@@ -228,7 +228,7 @@
 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 aa598aa..e9e479c 100644
--- a/board/pxa255_idp/pxa_idp.c
+++ b/board/pxa255_idp/pxa_idp.c
@@ -129,7 +129,7 @@
 
 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 1871984..703af73 100644
--- a/board/r360mpi/r360mpi.c
+++ b/board/r360mpi/r360mpi.c
@@ -415,5 +415,5 @@
 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 6d0bbc0..634efb4 100644
--- a/board/renesas/sh7785lcr/rtl8169_mac.c
+++ b/board/renesas/sh7785lcr/rtl8169_mac.c
@@ -325,7 +325,7 @@
 	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 @@
 	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 6dbb784..e803b3c 100644
--- a/board/renesas/sh7785lcr/selfcheck.c
+++ b/board/renesas/sh7785lcr/selfcheck.c
@@ -168,5 +168,5 @@
 	"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 6bdf3c0..9948d04 100644
--- a/board/renesas/sh7785lcr/sh7785lcr.c
+++ b/board/renesas/sh7785lcr/sh7785lcr.c
@@ -82,6 +82,6 @@
 	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 c1af70c..bc88e5a 100644
--- a/board/sandburst/common/ppc440gx_i2c.c
+++ b/board/sandburst/common/ppc440gx_i2c.c
@@ -501,7 +501,7 @@
 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 b8ae68f..92f5247 100644
--- a/board/sandburst/karef/karef.c
+++ b/board/sandburst/karef/karef.c
@@ -611,7 +611,7 @@
 }
 
 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 fc136c8..27d7f74 100644
--- a/board/sandburst/metrobox/metrobox.c
+++ b/board/sandburst/metrobox/metrobox.c
@@ -577,7 +577,7 @@
 }
 
 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 c9a93e1..4b45902 100644
--- a/board/siemens/common/fpga.c
+++ b/board/siemens/common/fpga.c
@@ -295,7 +295,7 @@
 	"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 f87d6bc..827578c 100644
--- a/board/siemens/pcu_e/pcu_e.c
+++ b/board/siemens/pcu_e/pcu_e.c
@@ -404,10 +404,10 @@
 }
 
 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 99ff507..449c1a4 100644
--- a/board/ssv/common/cmd_sled.c
+++ b/board/ssv/common/cmd_sled.c
@@ -157,6 +157,6 @@
 
 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 9b38425..eaf1d25 100644
--- a/board/ssv/common/wd_pio.c
+++ b/board/ssv/common/wd_pio.c
@@ -154,7 +154,7 @@
 	"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 20632a7..e309beb 100644
--- a/board/tqc/tqm5200/cmd_stk52xx.c
+++ b/board/tqc/tqm5200/cmd_stk52xx.c
@@ -1201,21 +1201,21 @@
 	"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 @@
 	"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 @@
 	"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 b9c9e7e..578e716 100644
--- a/board/tqc/tqm5200/cmd_tb5200.c
+++ b/board/tqc/tqm5200/cmd_tb5200.c
@@ -91,13 +91,13 @@
 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 5bc080f..92f74a3 100644
--- a/board/tqc/tqm8272/tqm8272.c
+++ b/board/tqc/tqm8272/tqm8272.c
@@ -867,7 +867,7 @@
 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 7e2a672..d0465fb 100644
--- a/board/trab/cmd_trab.c
+++ b/board/trab/cmd_trab.c
@@ -262,7 +262,7 @@
 	"\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 @@
 	"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 @@
 	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 @@
 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 @@
 	"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 @@
 	"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 5359065..ddf6abf 100644
--- a/board/trab/trab.c
+++ b/board/trab/trab.c
@@ -323,7 +323,7 @@
 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 9fa7aef..b6b16bf 100644
--- a/board/trizepsiv/eeprom.c
+++ b/board/trizepsiv/eeprom.c
@@ -81,4 +81,5 @@
 	"\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 eaec940..013fc79 100644
--- a/board/w7o/cmd_vpd.c
+++ b/board/w7o/cmd_vpd.c
@@ -60,7 +60,7 @@
 	  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 ce1f34f..c8487e5 100644
--- a/board/zeus/update.c
+++ b/board/zeus/update.c
@@ -99,7 +99,7 @@
 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 3f329c2..9bc390f 100644
--- a/board/zeus/zeus.c
+++ b/board/zeus/zeus.c
@@ -328,7 +328,7 @@
 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 @@
 U_BOOT_CMD (
 	chkreset, 1, 1, do_chkreset,
 	"Check for status of SW-reset button and act accordingly",
-	NULL
+	""
 );
 
 #if defined(CONFIG_POST)
diff --git a/common/cmd_ambapp.c b/common/cmd_ambapp.c
index 06531f1..bb20ab5 100644
--- a/common/cmd_ambapp.c
+++ b/common/cmd_ambapp.c
@@ -273,6 +273,7 @@
 }
 
 U_BOOT_CMD(ambapp, 1, 1, do_ambapp_print,
-	   "list AMBA Plug&Play information",
-	   "ambapp\n"
-	   "    - lists AMBA (AHB & APB) Plug&Play devices present on the system\n");
+	"list AMBA Plug&Play information",
+	"ambapp\n"
+	"    - lists AMBA (AHB & APB) Plug&Play devices present on the system"
+);
diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c
index b230924..11c1547 100644
--- a/common/cmd_bdinfo.c
+++ b/common/cmd_bdinfo.c
@@ -384,5 +384,5 @@
 U_BOOT_CMD(
 	bdinfo,	1,	1,	do_bdinfo,
 	"print Board Info structure",
-	NULL
+	""
 );
diff --git a/common/cmd_bedbug.c b/common/cmd_bedbug.c
index cd9e720..8be1c25 100644
--- a/common/cmd_bedbug.c
+++ b/common/cmd_bedbug.c
@@ -108,7 +108,7 @@
 
 U_BOOT_CMD (ds, 3, 1, do_bedbug_dis,
 	    "disassemble memory",
-	    "ds <address> [# instructions]\n");
+	    "ds <address> [# instructions]");
 
 /* ======================================================================
  * Entry point from the interpreter to the assembler.  Assembles
@@ -160,7 +160,7 @@
 }				/* do_bedbug_asm */
 
 U_BOOT_CMD (as, 2, 0, do_bedbug_asm,
-	    "assemble memory", "as <address>\n");
+	    "assemble memory", "as <address>");
 
 /* ======================================================================
  * Used to set a break point from the interpreter.  Simply calls into the
@@ -181,7 +181,7 @@
 	    " - Set or clear a breakpoint\n"
 	    "break <address> - Break at an address\n"
 	    "break off <bp#> - Disable breakpoint.\n"
-	    "break show      - List breakpoints.\n");
+	    "break show      - List breakpoints.");
 
 /* ======================================================================
  * Called from the debug interrupt routine.  Simply calls the CPU-specific
@@ -278,7 +278,7 @@
 
 U_BOOT_CMD (continue, 1, 0, do_bedbug_continue,
 	    "continue from a breakpoint",
-	    " - continue from a breakpoint.\n");
+	    "");
 
 /* ======================================================================
  * Interpreter command to continue to the next instruction, stepping into
@@ -309,7 +309,7 @@
 
 U_BOOT_CMD (step, 1, 1, do_bedbug_step,
 	    "single step execution.",
-	    " - single step execution.\n");
+	    "");
 
 /* ======================================================================
  * Interpreter command to continue to the next instruction, stepping over
@@ -340,7 +340,7 @@
 
 U_BOOT_CMD (next, 1, 1, do_bedbug_next,
 	    "single step execution, stepping over subroutines.",
-	    " - single step execution, stepping over subroutines.\n");
+	    "");
 
 /* ======================================================================
  * Interpreter command to print the current stack.  This assumes an EABI
@@ -385,7 +385,7 @@
 
 U_BOOT_CMD (where, 1, 1, do_bedbug_stack,
 	    "Print the running stack.",
-	    " - Print the running stack.\n");
+	    "");
 
 /* ======================================================================
  * Interpreter command to dump the registers.  Calls the CPU-specific
@@ -405,7 +405,7 @@
 }				/* do_bedbug_rdump */
 
 U_BOOT_CMD (rdump, 1, 1, do_bedbug_rdump,
-	    "Show registers.", " - Show registers.\n");
+	    "Show registers.", "");
 /* ====================================================================== */
 
 
diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c
index abbb070..fc8462e 100644
--- a/common/cmd_bmp.c
+++ b/common/cmd_bmp.c
@@ -141,7 +141,7 @@
 	bmp,	5,	1,	do_bmp,
 	"manipulate BMP image data",
 	"info <imageAddr>          - display image info\n"
-	"bmp display <imageAddr> [x y] - display image at x,y\n"
+	"bmp display <imageAddr> [x y] - display image at x,y"
 );
 
 /*
diff --git a/common/cmd_boot.c b/common/cmd_boot.c
index efc1a02..bfc1db2 100644
--- a/common/cmd_boot.c
+++ b/common/cmd_boot.c
@@ -66,7 +66,7 @@
 	go, CONFIG_SYS_MAXARGS, 1,	do_go,
 	"start application at address 'addr'",
 	"addr [arg ...]\n    - start application at address 'addr'\n"
-	"      passing 'arg' as arguments\n"
+	"      passing 'arg' as arguments"
 );
 
 extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
@@ -74,5 +74,5 @@
 U_BOOT_CMD(
 	reset, 1, 0,	do_reset,
 	"Perform RESET of the CPU",
-	NULL
+	""
 );
diff --git a/common/cmd_bootldr.c b/common/cmd_bootldr.c
index 48d113f..b2a8b0e 100644
--- a/common/cmd_bootldr.c
+++ b/common/cmd_bootldr.c
@@ -170,4 +170,5 @@
 U_BOOT_CMD(bootldr, 2, 0, do_bootldr,
 	"boot ldr image from memory",
 	"[addr]\n"
-	"    - boot ldr image stored in memory\n");
+	""
+);
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index bd1813a..367d5a7 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -948,7 +948,7 @@
 	"\tbdt     - OS specific bd_t processing\n"
 	"\tcmdline - OS specific command line processing/setup\n"
 	"\tprep    - OS specific prep before relocation or go\n"
-	"\tgo      - start OS\n"
+	"\tgo      - start OS"
 );
 
 /*******************************************************************/
@@ -973,14 +973,14 @@
 U_BOOT_CMD(
 	boot,	1,	1,	do_bootd,
 	"boot default, i.e., run 'bootcmd'",
-	NULL
+	""
 );
 
 /* keep old command name "bootd" for backward compatibility */
 U_BOOT_CMD(
 	bootd, 1,	1,	do_bootd,
 	"boot default, i.e., run 'bootcmd'",
-	NULL
+	""
 );
 
 #endif
@@ -1068,7 +1068,7 @@
 	"addr [addr ...]\n"
 	"    - print header information for application image starting at\n"
 	"      address 'addr' in memory; this includes verification of the\n"
-	"      image contents (magic number, header and payload checksums)\n"
+	"      image contents (magic number, header and payload checksums)"
 );
 #endif
 
@@ -1135,7 +1135,7 @@
 	"list all images found in flash",
 	"\n"
 	"    - Prints information about all images found at sector\n"
-	"      boundaries in flash.\n"
+	"      boundaries in flash."
 );
 #endif
 
diff --git a/common/cmd_cache.c b/common/cmd_cache.c
index c0f2cba..0dfa336 100644
--- a/common/cmd_cache.c
+++ b/common/cmd_cache.c
@@ -99,14 +99,14 @@
 	icache,   2,   1,     do_icache,
 	"enable or disable instruction cache",
 	"[on, off]\n"
-	"    - enable or disable instruction cache\n"
+	"    - enable or disable instruction cache"
 );
 
 U_BOOT_CMD(
 	dcache,   2,   1,     do_dcache,
 	"enable or disable data cache",
 	"[on, off]\n"
-	"    - enable or disable data (writethrough) cache\n"
+	"    - enable or disable data (writethrough) cache"
 );
 
 #endif
diff --git a/common/cmd_cplbinfo.c b/common/cmd_cplbinfo.c
index 56e70d6..1a044d2 100644
--- a/common/cmd_cplbinfo.c
+++ b/common/cmd_cplbinfo.c
@@ -55,5 +55,5 @@
 
 U_BOOT_CMD(cplbinfo, 1, 0, do_cplbinfo,
 	"display current CPLB tables",
-	"\n"
-	"    - display current CPLB tables\n");
+	""
+);
diff --git a/common/cmd_dataflash_mmc_mux.c b/common/cmd_dataflash_mmc_mux.c
index 4b2cf1c..97e303e 100644
--- a/common/cmd_dataflash_mmc_mux.c
+++ b/common/cmd_dataflash_mmc_mux.c
@@ -61,5 +61,5 @@
 	dataflash_mmc_mux, 2, 1, do_dataflash_mmc_mux,
 	"dataflash_mmc_mux\t- enable or disable MMC or SPI\n",
 	"[mmc, spi]\n"
-	"    - enable or disable MMC or SPI\n"
+	"    - enable or disable MMC or SPI"
 );
diff --git a/common/cmd_date.c b/common/cmd_date.c
index 3d78be2..b69e935 100644
--- a/common/cmd_date.c
+++ b/common/cmd_date.c
@@ -218,5 +218,5 @@
 	"[MMDDhhmm[[CC]YY][.ss]]\ndate reset\n"
 	"  - without arguments: print date & time\n"
 	"  - with numeric argument: set the system date & time\n"
-	"  - with 'reset' argument: reset the RTC\n"
+	"  - with 'reset' argument: reset the RTC"
 );
diff --git a/common/cmd_dcr.c b/common/cmd_dcr.c
index 7aed06c..4f23b8d 100644
--- a/common/cmd_dcr.c
+++ b/common/cmd_dcr.c
@@ -224,22 +224,22 @@
 U_BOOT_CMD(
 	getdcr,	2,	1,	do_getdcr,
 	"Get an AMCC PPC 4xx DCR's value",
-	"dcrn - return a DCR's value.\n"
+	"dcrn - return a DCR's value."
 );
 U_BOOT_CMD(
 	setdcr,	2,	1,	do_setdcr,
 	"Set an AMCC PPC 4xx DCR's value",
-	"dcrn - set a DCR's value.\n"
+	"dcrn - set a DCR's value."
 );
 
 U_BOOT_CMD(
 	getidcr,	3,	1,	do_getidcr,
 	"Get a register value via indirect DCR addressing",
-	"adr_dcrn[.dat_dcrn] offset - write offset to adr_dcrn, read value from dat_dcrn.\n"
+	"adr_dcrn[.dat_dcrn] offset - write offset to adr_dcrn, read value from dat_dcrn."
 );
 
 U_BOOT_CMD(
 	setidcr,	4,	1,	do_setidcr,
 	"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"
+	"adr_dcrn[.dat_dcrn] offset value - write offset to adr_dcrn, write value to dat_dcrn."
 );
diff --git a/common/cmd_df.c b/common/cmd_df.c
index d64f900..7f957fe 100644
--- a/common/cmd_df.c
+++ b/common/cmd_df.c
@@ -34,4 +34,4 @@
 U_BOOT_CMD(
 	sf,	2,	1,	do_serial_flash,
 	"Serial flash sub-system",
-	"probe [bus:]cs		- init flash device on given SPI bus and CS\n")
+	"probe [bus:]cs		- init flash device on given SPI bus and CS")
diff --git a/common/cmd_diag.c b/common/cmd_diag.c
index c2a6175..0436c49 100644
--- a/common/cmd_diag.c
+++ b/common/cmd_diag.c
@@ -72,5 +72,5 @@
 	"         - print information about specified tests\n"
 	"diag run - run all available tests\n"
 	"diag run [test1 [test2]]\n"
-	"         - run specified tests\n"
+	"         - run specified tests"
 );
diff --git a/common/cmd_display.c b/common/cmd_display.c
index 4102424..3422395 100644
--- a/common/cmd_display.c
+++ b/common/cmd_display.c
@@ -74,5 +74,5 @@
 	"display string on dot matrix display",
 	"[<string>]\n"
 	"    - with <string> argument: display <string> on dot matrix display\n"
-	"    - without arguments: clear dot matrix display\n"
+	"    - without arguments: clear dot matrix display"
 );
diff --git a/common/cmd_doc.c b/common/cmd_doc.c
index 3385c67..5cc90f0 100644
--- a/common/cmd_doc.c
+++ b/common/cmd_doc.c
@@ -202,7 +202,7 @@
 	"doc write addr off size - read/write `size'"
 	" bytes starting at offset `off'\n"
 	"    to/from memory address `addr'\n"
-	"doc erase off size - erase `size' bytes of DOC from offset `off'\n"
+	"doc erase off size - erase `size' bytes of DOC from offset `off'"
 );
 
 int do_docboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -342,7 +342,7 @@
 U_BOOT_CMD(
 	docboot,	4,	1,	do_docboot,
 	"boot from DOC device",
-	"loadAddr dev\n"
+	"loadAddr dev"
 );
 
 int doc_rw (struct DiskOnChip* this, int cmd,
diff --git a/common/cmd_dtt.c b/common/cmd_dtt.c
index 7783c88..3cfd36e 100644
--- a/common/cmd_dtt.c
+++ b/common/cmd_dtt.c
@@ -55,6 +55,6 @@
 
 U_BOOT_CMD(
 	  dtt,	1,	1,	do_dtt,
-	  "Digital Thermometer and Thermostat",
-	  "        - Read temperature from digital thermometer and thermostat.\n"
+	  "Read temperature from Digital Thermometer and Thermostat",
+	  ""
 );
diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c
index f749087..102efaf 100644
--- a/common/cmd_eeprom.c
+++ b/common/cmd_eeprom.c
@@ -424,7 +424,7 @@
 	"EEPROM sub-system",
 	"read  devaddr addr off cnt\n"
 	"eeprom write devaddr addr off cnt\n"
-	"       - read/write `cnt' bytes from `devaddr` EEPROM at offset `off'\n"
+	"       - read/write `cnt' bytes from `devaddr` EEPROM at offset `off'"
 );
 #else /* One EEPROM */
 U_BOOT_CMD(
@@ -432,7 +432,7 @@
 	"EEPROM sub-system",
 	"read  addr off cnt\n"
 	"eeprom write addr off cnt\n"
-	"       - read/write `cnt' bytes at EEPROM offset `off'\n"
+	"       - read/write `cnt' bytes at EEPROM offset `off'"
 );
 #endif /* CONFIG_SYS_I2C_MULTI_EEPROMS */
 
diff --git a/common/cmd_elf.c b/common/cmd_elf.c
index 83e7589..abec7dd 100644
--- a/common/cmd_elf.c
+++ b/common/cmd_elf.c
@@ -313,11 +313,11 @@
 U_BOOT_CMD(
 	bootelf,      2,      0,      do_bootelf,
 	"Boot from an ELF image in memory",
-	" [address] - load address of ELF image.\n"
+	" [address] - load address of ELF image."
 );
 
 U_BOOT_CMD(
 	bootvx,      2,      0,      do_bootvx,
 	"Boot vxWorks from an ELF image",
-	" [address] - load address of vxWorks ELF image.\n"
+	" [address] - load address of vxWorks ELF image."
 );
diff --git a/common/cmd_ext2.c b/common/cmd_ext2.c
index 923b355..6ee60c6 100644
--- a/common/cmd_ext2.c
+++ b/common/cmd_ext2.c
@@ -118,7 +118,7 @@
 	ext2ls,	4,	1,	do_ext2ls,
 	"list files in a directory (default /)",
 	"<interface> <dev[:part]> [directory]\n"
-	"    - list files from 'dev' on 'interface' in a 'directory'\n"
+	"    - list files from 'dev' on 'interface' in a 'directory'"
 );
 
 /******************************************************************************
@@ -256,5 +256,5 @@
 	"load binary file from a Ext2 filesystem",
 	"<interface> <dev[:part]> [addr] [filename] [bytes]\n"
 	"    - load binary file 'filename' from 'dev' on 'interface'\n"
-	"      to address 'addr' from ext2 filesystem\n"
+	"      to address 'addr' from ext2 filesystem"
 );
diff --git a/common/cmd_fat.c b/common/cmd_fat.c
index 4a26b80..f3089a2 100644
--- a/common/cmd_fat.c
+++ b/common/cmd_fat.c
@@ -91,7 +91,7 @@
 	"load binary file from a dos filesystem",
 	"<interface> <dev[:part]>  <addr> <filename> [bytes]\n"
 	"    - load binary file 'filename' from 'dev' on 'interface'\n"
-	"      to address 'addr' from dos filesystem\n"
+	"      to address 'addr' from dos filesystem"
 );
 
 int do_fat_ls (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -138,7 +138,7 @@
 	fatls,	4,	1,	do_fat_ls,
 	"list files in a directory (default /)",
 	"<interface> <dev[:part]> [directory]\n"
-	"    - list files from 'dev' on 'interface' in a 'directory'\n"
+	"    - list files from 'dev' on 'interface' in a 'directory'"
 );
 
 int do_fat_fsinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -176,7 +176,7 @@
 	fatinfo,	3,	1,	do_fat_fsinfo,
 	"print information about filesystem",
 	"<interface> <dev[:part]>\n"
-	"    - print information about filesystem from 'dev' on 'interface'\n"
+	"    - print information about filesystem from 'dev' on 'interface'"
 );
 
 #ifdef NOT_IMPLEMENTED_YET
diff --git a/common/cmd_fdc.c b/common/cmd_fdc.c
index c043b97..8e18c71 100644
--- a/common/cmd_fdc.c
+++ b/common/cmd_fdc.c
@@ -903,6 +903,6 @@
 U_BOOT_CMD(
 	fdcboot,	3,	1,	do_fdcboot,
 	"boot from floppy device",
-	"loadAddr drive\n"
+	"loadAddr drive"
 );
 #endif
diff --git a/common/cmd_fdos.c b/common/cmd_fdos.c
index bcf98d9..3cc6586 100644
--- a/common/cmd_fdos.c
+++ b/common/cmd_fdos.c
@@ -143,11 +143,11 @@
 U_BOOT_CMD(
 	fdosboot,	3,	0,	do_fdosboot,
 	"boot from a dos floppy file",
-	"[loadAddr] [filename]\n"
+	"[loadAddr] [filename]"
 );
 
 U_BOOT_CMD(
 	fdosls,	2,	0,	do_fdosls,
 	"list files in a directory",
-	"[directory]\n"
+	"[directory]"
 );
diff --git a/common/cmd_fdt.c b/common/cmd_fdt.c
index 0947b72..8683772 100644
--- a/common/cmd_fdt.c
+++ b/common/cmd_fdt.c
@@ -840,5 +840,5 @@
 	"fdt chosen [<start> <end>]          - Add/update the /chosen branch in the tree\n"
 	"                                        <start>/<end> - initrd start/end addr\n"
 	"NOTE: Dereference aliases by omiting the leading '/', "
-		"e.g. fdt print ethernet0.\n"
+		"e.g. fdt print ethernet0."
 );
diff --git a/common/cmd_flash.c b/common/cmd_flash.c
index f1f3517..9f27ab0 100644
--- a/common/cmd_flash.c
+++ b/common/cmd_flash.c
@@ -712,7 +712,7 @@
 	flinfo,    2,    1,    do_flinfo,
 	"print FLASH memory information",
 	"\n    - print information for all FLASH memory banks\n"
-	"flinfo N\n    - print information for FLASH memory bank # N\n"
+	"flinfo N\n    - print information for FLASH memory bank # N"
 );
 
 U_BOOT_CMD(
@@ -726,7 +726,7 @@
 	"erase N:SF[-SL]\n    - erase sectors SF-SL in FLASH bank # N\n"
 	"erase bank N\n    - erase FLASH bank # N\n"
 	TMP_ERASE
-	"erase all\n    - erase all FLASH banks\n"
+	"erase all\n    - erase all FLASH banks"
 );
 
 U_BOOT_CMD(
@@ -751,7 +751,7 @@
 	"    - make sectors SF-SL writable in FLASH bank # N\n"
 	"protect off bank N\n    - make FLASH bank # N writable\n"
 	TMP_PROT_OFF
-	"protect off all\n    - make all FLASH banks writable\n"
+	"protect off all\n    - make all FLASH banks writable"
 );
 
 #undef	TMP_ERASE
diff --git a/common/cmd_fpga.c b/common/cmd_fpga.c
index 362bffd..2e017b8 100644
--- a/common/cmd_fpga.c
+++ b/common/cmd_fpga.c
@@ -357,9 +357,10 @@
 	    "\tload\tLoad device from memory buffer\n"
 	    "\tloadb\tLoad device from bitstream buffer (Xilinx devices only)\n"
 	    "\tloadmk\tLoad device generated with mkimage\n"
-	    "\tdump\tLoad device to memory buffer\n"
+	    "\tdump\tLoad device to memory buffer"
 #if defined(CONFIG_FIT)
+	    "\n"
 	    "\tFor loadmk operating on FIT format uImage address must include\n"
-	    "\tsubimage unit name in the form of addr:<subimg_uname>\n"
+	    "\tsubimage unit name in the form of addr:<subimg_uname>"
 #endif
 );
diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c
index b922b96..ae26845 100644
--- a/common/cmd_i2c.c
+++ b/common/cmd_i2c.c
@@ -1315,9 +1315,10 @@
 	"i2c crc32 chip address[.0, .1, .2] count - compute CRC32 checksum\n"
 	"i2c probe - show devices on the I2C bus\n"
 	"i2c reset - re-init the I2C Controller\n"
-	"i2c loop chip address[.0, .1, .2] [# of objects] - looping read of device\n"
+	"i2c loop chip address[.0, .1, .2] [# of objects] - looping read of device"
 #if defined(CONFIG_CMD_SDRAM)
-	"i2c sdram chip - print SDRAM configuration information\n"
+	"\n"
+	"i2c sdram chip - print SDRAM configuration information"
 #endif
 );
 
diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index d86bf37..feda773 100644
--- a/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@ -2108,11 +2108,11 @@
 	"ide read  addr blk# cnt\n"
 	"ide write addr blk# cnt - read/write `cnt'"
 	" blocks starting at block `blk#'\n"
-	"    to/from memory address `addr'\n"
+	"    to/from memory address `addr'"
 );
 
 U_BOOT_CMD(
 	diskboot,	3,	1,	do_diskboot,
 	"boot from IDE device",
-	"loadAddr dev:part\n"
+	"loadAddr dev:part"
 );
diff --git a/common/cmd_immap.c b/common/cmd_immap.c
index c8367f0..37e6058 100644
--- a/common/cmd_immap.c
+++ b/common/cmd_immap.c
@@ -615,39 +615,39 @@
 U_BOOT_CMD(
 	siuinfo,	1,	1,	do_siuinfo,
 	"print System Interface Unit (SIU) registers",
-	NULL
+	""
 );
 
 U_BOOT_CMD(
 	memcinfo,	1,	1,	do_memcinfo,
 	"print Memory Controller registers",
-	NULL
+	""
 );
 
 U_BOOT_CMD(
 	sitinfo,	1,	1,	do_sitinfo,
 	"print System Integration Timers (SIT) registers",
-	NULL
+	""
 );
 
 #ifdef CONFIG_8260
 U_BOOT_CMD(
 	icinfo,	1,	1,	do_icinfo,
 	"print Interrupt Controller registers",
-	NULL
+	""
 );
 #endif
 
 U_BOOT_CMD(
 	carinfo,	1,	1,	do_carinfo,
 	"print Clocks and Reset registers",
-	NULL
+	""
 );
 
 U_BOOT_CMD(
 	iopinfo,	1,	1,	do_iopinfo,
 	"print I/O Port registers",
-	NULL
+	""
 );
 
 U_BOOT_CMD(
@@ -659,62 +659,61 @@
 U_BOOT_CMD(
 	dmainfo,	1,	1,	do_dmainfo,
 	"print SDMA/IDMA registers",
-	NULL
+	""
 );
 
 U_BOOT_CMD(
 	fccinfo,	1,	1,	do_fccinfo,
 	"print FCC registers",
-	NULL
+	""
 );
 
 U_BOOT_CMD(
 	brginfo,	1,	1,	do_brginfo,
 	"print Baud Rate Generator (BRG) registers",
-	NULL
+	""
 );
 
 U_BOOT_CMD(
 	i2cinfo,	1,	1,	do_i2cinfo,
 	"print I2C registers",
-	NULL
+	""
 );
 
 U_BOOT_CMD(
 	sccinfo,	1,	1,	do_sccinfo,
 	"print SCC registers",
-	NULL
+	""
 );
 
 U_BOOT_CMD(
 	smcinfo,	1,	1,	do_smcinfo,
 	"print SMC registers",
-	NULL
+	""
 );
 
 U_BOOT_CMD(
 	spiinfo,	1,	1,	do_spiinfo,
 	"print Serial Peripheral Interface (SPI) registers",
-	NULL
+	""
 );
 
 U_BOOT_CMD(
 	muxinfo,	1,	1,	do_muxinfo,
 	"print CPM Multiplexing registers",
-	NULL
+	""
 );
 
 U_BOOT_CMD(
 	siinfo,	1,	1,	do_siinfo,
 	"print Serial Interface (SI) registers",
-	NULL
+	""
 );
 
 U_BOOT_CMD(
 	mccinfo,	1,	1,	do_mccinfo,
 	"print MCC registers",
-	NULL
+	""
 );
 
-
 #endif
diff --git a/common/cmd_irq.c b/common/cmd_irq.c
index a21aede..4604a5a 100644
--- a/common/cmd_irq.c
+++ b/common/cmd_irq.c
@@ -45,6 +45,5 @@
 U_BOOT_CMD(
 	interrupts, 5, 0, do_interrupts,
 	"enable or disable interrupts",
-	"[on, off]\n"
-	"    - enable or disable interrupts\n"
+	"[on, off]"
 );
diff --git a/common/cmd_itest.c b/common/cmd_itest.c
index 309b08b..5b301bf 100644
--- a/common/cmd_itest.c
+++ b/common/cmd_itest.c
@@ -191,5 +191,5 @@
 U_BOOT_CMD(
 	itest, 4, 0, do_itest,
 	"return true/false on integer compare",
-	"[.b, .w, .l, .s] [*]value1 <op> [*]value2\n"
+	"[.b, .w, .l, .s] [*]value1 <op> [*]value2"
 );
diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c
index 3bb6c3c..4db4a83 100644
--- a/common/cmd_jffs2.c
+++ b/common/cmd_jffs2.c
@@ -636,18 +636,17 @@
 	"load binary file from a filesystem image",
 	"[ off ] [ filename ]\n"
 	"    - load binary file from flash bank\n"
-	"      with offset 'off'\n"
+	"      with offset 'off'"
 );
 U_BOOT_CMD(
 	ls,	2,	1,	do_jffs2_ls,
 	"list files in a directory (default /)",
-	"[ directory ]\n"
-	"    - list files in a directory.\n"
+	"[ directory ]"
 );
 
 U_BOOT_CMD(
 	fsinfo,	1,	1,	do_jffs2_fsinfo,
 	"print information about filesystems",
-	"    - print information about filesystems\n"
+	""
 );
 /***************************************************/
diff --git a/common/cmd_license.c b/common/cmd_license.c
index c3c3496..141215b 100644
--- a/common/cmd_license.c
+++ b/common/cmd_license.c
@@ -53,7 +53,8 @@
 }
 
 U_BOOT_CMD(license, 1, 1, do_license,
-	   "print GPL license text",
-	   NULL);
+	"print GPL license text",
+	""
+);
 
 #endif /* CONFIG_CMD_LICENSE */
diff --git a/common/cmd_load.c b/common/cmd_load.c
index 2b5a66d..73fbf74 100644
--- a/common/cmd_load.c
+++ b/common/cmd_load.c
@@ -1049,7 +1049,7 @@
 	"load S-Record file over serial line",
 	"[ off ] [ baud ]\n"
 	"    - load S-Record file over serial line"
-	" with offset 'off' and baudrate 'baud'\n"
+	" with offset 'off' and baudrate 'baud'"
 );
 
 #else	/* ! CONFIG_SYS_LOADS_BAUD_CHANGE */
@@ -1057,7 +1057,7 @@
 	loads, 2, 0,	do_load_serial,
 	"load S-Record file over serial line",
 	"[ off ]\n"
-	"    - load S-Record file over serial line with offset 'off'\n"
+	"    - load S-Record file over serial line with offset 'off'"
 );
 #endif	/* CONFIG_SYS_LOADS_BAUD_CHANGE */
 
@@ -1073,14 +1073,14 @@
 	"save S-Record file over serial line",
 	"[ off ] [size] [ baud ]\n"
 	"    - save S-Record file over serial line"
-	" with offset 'off', size 'size' and baudrate 'baud'\n"
+	" with offset 'off', size 'size' and baudrate 'baud'"
 );
 #else	/* ! CONFIG_SYS_LOADS_BAUD_CHANGE */
 U_BOOT_CMD(
 	saves, 3, 0,	do_save_serial,
 	"save S-Record file over serial line",
 	"[ off ] [size]\n"
-	"    - save S-Record file over serial line with offset 'off' and size 'size'\n"
+	"    - save S-Record file over serial line with offset 'off' and size 'size'"
 );
 #endif	/* CONFIG_SYS_LOADS_BAUD_CHANGE */
 #endif
@@ -1093,7 +1093,7 @@
 	"load binary file over serial line (kermit mode)",
 	"[ off ] [ baud ]\n"
 	"    - load binary file over serial line"
-	" with offset 'off' and baudrate 'baud'\n"
+	" with offset 'off' and baudrate 'baud'"
 );
 
 U_BOOT_CMD(
@@ -1101,7 +1101,7 @@
 	"load binary file over serial line (ymodem mode)",
 	"[ off ] [ baud ]\n"
 	"    - load binary file over serial line"
-	" with offset 'off' and baudrate 'baud'\n"
+	" with offset 'off' and baudrate 'baud'"
 );
 
 #endif
@@ -1130,8 +1130,8 @@
 
 U_BOOT_CMD(
 	hwflow, 2, 0,	do_hwflow,
-	"turn the harwdare flow control on/off",
-	"[on|off]\n - change RTS/CTS hardware flow control over serial line\n"
+	"turn RTS/CTS hardware flow control in serial line on/off",
+	"[on|off]"
 );
 
 #endif
diff --git a/common/cmd_log.c b/common/cmd_log.c
index a03835d..d422d9f 100644
--- a/common/cmd_log.c
+++ b/common/cmd_log.c
@@ -256,7 +256,7 @@
 	"info   - show pointer details\n"
 	"log reset  - clear contents\n"
 	"log show   - show contents\n"
-	"log append <msg> - append <msg> to the logbuffer\n"
+	"log append <msg> - append <msg> to the logbuffer"
 );
 
 static int logbuff_printk(const char *line)
diff --git a/common/cmd_mac.c b/common/cmd_mac.c
index cf601e4..20403da 100644
--- a/common/cmd_mac.c
+++ b/common/cmd_mac.c
@@ -44,20 +44,6 @@
 	"    - program date\n"
 	"mac ports\n"
 	"    - program the number of ports\n"
-	"mac 0\n"
-	"    - program the MAC address for port 0\n"
-	"mac 1\n"
-	"    - program the MAC address for port 1\n"
-	"mac 2\n"
-	"    - program the MAC address for port 2\n"
-	"mac 3\n"
-	"    - program the MAC address for port 3\n"
-	"mac 4\n"
-	"    - program the MAC address for port 4\n"
-	"mac 5\n"
-	"    - program the MAC address for port 5\n"
-	"mac 6\n"
-	"    - program the MAC address for port 6\n"
-	"mac 7\n"
-	"    - program the MAC address for port 7\n"
+	"mac X\n"
+	"    - program the MAC address for port X [X=0...7]"
 );
diff --git a/common/cmd_mem.c b/common/cmd_mem.c
index 2d4fc2a..cdf8c79 100644
--- a/common/cmd_mem.c
+++ b/common/cmd_mem.c
@@ -1172,39 +1172,39 @@
 U_BOOT_CMD(
 	md,	3,	1,	do_mem_md,
 	"memory display",
-	"[.b, .w, .l] address [# of objects]\n	  - memory display\n"
+	"[.b, .w, .l] address [# of objects]"
 );
 
 
 U_BOOT_CMD(
 	mm,	2,	1,	do_mem_mm,
-	"memory modify (auto-incrementing)",
-	"[.b, .w, .l] address\n" "    - memory modify, auto increment address\n"
+	"memory modify (auto-incrementing address)",
+	"[.b, .w, .l] address"
 );
 
 
 U_BOOT_CMD(
 	nm,	2,	1,	do_mem_nm,
 	"memory modify (constant address)",
-	"[.b, .w, .l] address\n    - memory modify, read and keep address\n"
+	"[.b, .w, .l] address"
 );
 
 U_BOOT_CMD(
 	mw,	4,	1,	do_mem_mw,
 	"memory write (fill)",
-	"[.b, .w, .l] address value [count]\n	- write memory\n"
+	"[.b, .w, .l] address value [count]"
 );
 
 U_BOOT_CMD(
 	cp,	4,	1,	do_mem_cp,
 	"memory copy",
-	"[.b, .w, .l] source target count\n    - copy memory\n"
+	"[.b, .w, .l] source target count"
 );
 
 U_BOOT_CMD(
 	cmp,	4,	1,	do_mem_cmp,
 	"memory compare",
-	"[.b, .w, .l] addr1 addr2 count\n    - compare memory\n"
+	"[.b, .w, .l] addr1 addr2 count"
 );
 
 #ifndef CONFIG_CRC32_VERIFY
@@ -1212,7 +1212,7 @@
 U_BOOT_CMD(
 	crc32,	4,	1,	do_mem_crc,
 	"checksum calculation",
-	"address count [addr]\n    - compute CRC32 checksum [save at addr]\n"
+	"address count [addr]\n    - compute CRC32 checksum [save at addr]"
 );
 
 #else	/* CONFIG_CRC32_VERIFY */
@@ -1221,7 +1221,7 @@
 	crc32,	5,	1,	do_mem_crc,
 	"checksum calculation",
 	"address count [addr]\n    - compute CRC32 checksum [save at addr]\n"
-	"-v address count crc\n    - verify crc of memory area\n"
+	"-v address count crc\n    - verify crc of memory area"
 );
 
 #endif	/* CONFIG_CRC32_VERIFY */
@@ -1230,43 +1230,40 @@
 	base,	2,	1,	do_mem_base,
 	"print or set address offset",
 	"\n    - print address offset for memory commands\n"
-	"base off\n    - set address offset for memory commands to 'off'\n"
+	"base off\n    - set address offset for memory commands to 'off'"
 );
 
 U_BOOT_CMD(
 	loop,	3,	1,	do_mem_loop,
 	"infinite loop on address range",
-	"[.b, .w, .l] address number_of_objects\n"
-	"    - loop on a set of addresses\n"
+	"[.b, .w, .l] address number_of_objects"
 );
 
 #ifdef CONFIG_LOOPW
 U_BOOT_CMD(
 	loopw,	4,	1,	do_mem_loopw,
 	"infinite write loop on address range",
-	"[.b, .w, .l] address number_of_objects data_to_write\n"
-	"    - loop on a set of addresses\n"
+	"[.b, .w, .l] address number_of_objects data_to_write"
 );
 #endif /* CONFIG_LOOPW */
 
 U_BOOT_CMD(
 	mtest,	5,	1,	do_mem_mtest,
-	"simple RAM test",
-	"[start [end [pattern [iterations]]]]\n"
-	"    - simple RAM read/write test\n"
+	"simple RAM read/write test",
+	"[start [end [pattern [iterations]]]]"
 );
 
 #ifdef CONFIG_MX_CYCLIC
 U_BOOT_CMD(
 	mdc,	4,	1,	do_mem_mdc,
 	"memory display cyclic",
-	"[.b, .w, .l] address count delay(ms)\n    - memory display cyclic\n"
+	"[.b, .w, .l] address count delay(ms)"
 );
 
 U_BOOT_CMD(
 	mwc,	4,	1,	do_mem_mwc,
 	"memory write cyclic",
-	"[.b, .w, .l] address value delay(ms)\n    - memory write cyclic\n"
+	"[.b, .w, .l] address value delay(ms)"
 );
 #endif /* CONFIG_MX_CYCLIC */
 
@@ -1274,6 +1271,6 @@
 U_BOOT_CMD(
 	unzip,	4,	1,	do_unzip,
 	"unzip a memory region",
-	"srcaddr dstaddr [dstsize]\n"
+	"srcaddr dstaddr [dstsize]"
 );
 #endif /* CONFIG_CMD_UNZIP */
diff --git a/common/cmd_mfsl.c b/common/cmd_mfsl.c
index 6470bac..b19ad0e 100644
--- a/common/cmd_mfsl.c
+++ b/common/cmd_mfsl.c
@@ -394,8 +394,7 @@
 		" 0 - non blocking data read\n"
 		" 1 - non blocking control read\n"
 		" 2 - blocking data read\n"
-		" 3 - blocking control read\n");
-
+		" 3 - blocking control read");
 
 U_BOOT_CMD (fwr, 4, 1, do_fwr,
 		"write data to FSL",
@@ -403,11 +402,11 @@
 		" 0 - non blocking data write\n"
 		" 1 - non blocking control write\n"
 		" 2 - blocking data write\n"
-		" 3 - blocking control write\n");
+		" 3 - blocking control write");
 
 U_BOOT_CMD (rspr, 3, 1, do_rspr,
 		"read/write special purpose register",
 		"- reg_num [write value] read/write special purpose register\n"
 		" 1 - MSR - Machine status register\n"
 		" 3 - EAR - Exception address register\n"
-		" 5 - ESR - Exception status register\n");
+		" 5 - ESR - Exception status register");
diff --git a/common/cmd_mgdisk.c b/common/cmd_mgdisk.c
index 48323d4..aadc335 100644
--- a/common/cmd_mgdisk.c
+++ b/common/cmd_mgdisk.c
@@ -70,7 +70,7 @@
 	"    - random read : mgd read [from] [to] [size]\n"
 	"    - random write : mgd write [from] [to] [size]\n"
 	"    - sector read : mgd readsec [sector] [to] [counts]\n"
-	"    - sector write : mgd writesec [from] [sector] [counts]\n"
+	"    - sector write : mgd writesec [from] [sector] [counts]"
 );
 
 #endif
diff --git a/common/cmd_mii.c b/common/cmd_mii.c
index d70031a..65e13c3 100644
--- a/common/cmd_mii.c
+++ b/common/cmd_mii.c
@@ -460,5 +460,5 @@
 	"mii read   <addr> <reg>        - read  MII PHY <addr> register <reg>\n"
 	"mii write  <addr> <reg> <data> - write MII PHY <addr> register <reg>\n"
 	"mii dump   <addr> <reg>        - pretty-print <addr> <reg> (0-5 only)\n"
-	"Addr and/or reg may be ranges, e.g. 2-7.\n"
+	"Addr and/or reg may be ranges, e.g. 2-7."
 );
diff --git a/common/cmd_misc.c b/common/cmd_misc.c
index 024299a..b97537e 100644
--- a/common/cmd_misc.c
+++ b/common/cmd_misc.c
@@ -56,7 +56,7 @@
 U_BOOT_CMD(
 	irqinfo,    1,    1,     do_irqinfo,
 	"print information about IRQs",
-	NULL
+	""
 );
 #endif
 
@@ -64,5 +64,5 @@
 	sleep ,    2,    1,     do_sleep,
 	"delay execution for some time",
 	"N\n"
-	"    - delay execution for N seconds (N is _decimal_ !!!)\n"
+	"    - delay execution for N seconds (N is _decimal_ !!!)"
 );
diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index 039fe59..32fe49b 100644
--- a/common/cmd_mmc.c
+++ b/common/cmd_mmc.c
@@ -89,7 +89,7 @@
 	mmc, 3, 1, do_mmc,
 	"MMC sub-system",
 	"init [dev] - init MMC sub system\n"
-	"mmc device [dev] - show or set current device\n"
+	"mmc device [dev] - show or set current device"
 );
 #else /* !CONFIG_GENERIC_MMC */
 
@@ -135,9 +135,10 @@
 	return 0;
 }
 
-U_BOOT_CMD(mmcinfo,	2,	0,	do_mmcinfo,
-	"print MMC information",
-	"<dev num>\n");
+U_BOOT_CMD(mmcinfo, 2, 0, do_mmcinfo,
+	"mmcinfo <dev num>-- display MMC info\n",
+	""
+);
 
 int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
@@ -231,5 +232,5 @@
 	"read <device num> addr blk# cnt\n"
 	"mmc write <device num> addr blk# cnt\n"
 	"mmc rescan <device num>\n"
-	"mmc list - list available devices\n");
+	"mmc list - lists available devices");
 #endif
diff --git a/common/cmd_mp.c b/common/cmd_mp.c
index a0839c2..faa8700 100644
--- a/common/cmd_mp.c
+++ b/common/cmd_mp.c
@@ -78,7 +78,7 @@
 	"     Default for r3 is <num> and r6 is 0\n" \
 	"\n" \
 	"     When cpu <num> is released r4 and r5 = 0.\n" \
-	"     r7 will contain the size of the initial mapped area\n"
+	"     r7 will contain the size of the initial mapped area"
 #endif
 
 U_BOOT_CMD(
@@ -86,8 +86,9 @@
 	"Multiprocessor CPU boot manipulation and release",
 	    "<num> reset                 - Reset cpu <num>\n"
 	"cpu <num> status                - Status of cpu <num>\n"
-	"cpu <num> release <addr> [args] - Release cpu <num> at <addr> with [args]\n"
+	"cpu <num> release <addr> [args] - Release cpu <num> at <addr> with [args]"
 #ifdef CPU_ARCH_HELP
+	"\n"
 	CPU_ARCH_HELP
 #endif
-	);
+);
diff --git a/common/cmd_mtdparts.c b/common/cmd_mtdparts.c
index 8bd1db7..2d1446e 100644
--- a/common/cmd_mtdparts.c
+++ b/common/cmd_mtdparts.c
@@ -1863,7 +1863,7 @@
 	chpart,	2,	0,	do_chpart,
 	"change active partition",
 	"part-id\n"
-	"    - change active partition (e.g. part-id = nand0,1)\n"
+	"    - change active partition (e.g. part-id = nand0,1)"
 );
 
 U_BOOT_CMD(
@@ -1898,6 +1898,6 @@
 	"<size>     := standard linux memsize OR '-' to denote all remaining space\n"
 	"<offset>   := partition start offset within the device\n"
 	"<name>     := '(' NAME ')'\n"
-	"<ro-flag>  := when set to 'ro' makes partition read-only (not used, passed to kernel)\n"
+	"<ro-flag>  := when set to 'ro' makes partition read-only (not used, passed to kernel)"
 );
 /***************************************************/
diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index 1992531..9451416 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -476,25 +476,26 @@
 	return 1;
 }
 
-U_BOOT_CMD(nand, 5, 1, do_nand,
-	   "NAND sub-system",
-	   "info - show available NAND devices\n"
-	   "nand device [dev] - show or set current device\n"
-	   "nand read - addr off|partition size\n"
-	   "nand write - addr off|partition size\n"
-	   "    read/write 'size' bytes starting at offset 'off'\n"
-	   "    to/from memory address 'addr', skipping bad blocks.\n"
-	   "nand erase [clean] [off size] - erase 'size' bytes from\n"
-	   "    offset 'off' (entire device if not specified)\n"
-	   "nand bad - show bad blocks\n"
-	   "nand dump[.oob] off - dump page\n"
-	   "nand scrub - really clean NAND erasing bad blocks (UNSAFE)\n"
-	   "nand markbad off - mark bad block at offset (UNSAFE)\n"
-	   "nand biterr off - make a bit error at offset (UNSAFE)\n"
+U_BOOT_CMD(nand, CONFIG_SYS_MAXARGS, 1, do_nand,
+	"NAND sub-system",
+	"info - show available NAND devices\n"
+	"nand device [dev] - show or set current device\n"
+	"nand read - addr off|partition size\n"
+	"nand write - addr off|partition size\n"
+	"    read/write 'size' bytes starting at offset 'off'\n"
+	"    to/from memory address 'addr', skipping bad blocks.\n"
+	"nand erase [clean] [off size] - erase 'size' bytes from\n"
+	"    offset 'off' (entire device if not specified)\n"
+	"nand bad - show bad blocks\n"
+	"nand dump[.oob] off - dump page\n"
+	"nand scrub - really clean NAND erasing bad blocks (UNSAFE)\n"
+	"nand markbad off [...] - mark bad block(s) at offset (UNSAFE)\n"
+	"nand biterr off - make a bit error at offset (UNSAFE)"
 #ifdef CONFIG_CMD_NAND_LOCK_UNLOCK
-	   "nand lock [tight] [status]\n"
-	   "    bring nand to lock state or display locked pages\n"
-	   "nand unlock [offset] [size] - unlock section\n"
+	"\n"
+	"nand lock [tight] [status]\n"
+	"    bring nand to lock state or display locked pages\n"
+	"nand unlock [offset] [size] - unlock section"
 #endif
 );
 
@@ -673,8 +674,8 @@
 
 U_BOOT_CMD(nboot, 4, 1, do_nandboot,
 	"boot from NAND device",
-	"[partition] | [[[loadAddr] dev] offset]\n");
-
+	"[partition] | [[[loadAddr] dev] offset]"
+);
 #endif
 
 #else /* CONFIG_NAND_LEGACY */
@@ -941,7 +942,7 @@
 	"    offset `off' (entire device if not specified)\n"
 	"nand bad - show bad blocks\n"
 	"nand read.oob addr off size - read out-of-band data\n"
-	"nand write.oob addr off size - read out-of-band data\n"
+	"nand write.oob addr off size - read out-of-band data"
 );
 
 int do_nandboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -1081,7 +1082,7 @@
 U_BOOT_CMD(
 	nboot,	4,	1,	do_nandboot,
 	"boot from NAND device",
-	"loadAddr dev\n"
+	"loadAddr dev"
 );
 
 #endif
diff --git a/common/cmd_net.c b/common/cmd_net.c
index 92bbf85..68183c4 100644
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -40,7 +40,7 @@
 U_BOOT_CMD(
 	bootp,	3,	1,	do_bootp,
 	"boot image via network using BOOTP/TFTP protocol",
-	"[loadAddress] [[hostIPaddr:]bootfilename]\n"
+	"[loadAddress] [[hostIPaddr:]bootfilename]"
 );
 
 int do_tftpb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -51,7 +51,7 @@
 U_BOOT_CMD(
 	tftpboot,	3,	1,	do_tftpb,
 	"boot image via network using TFTP protocol",
-	"[loadAddress] [[hostIPaddr:]bootfilename]\n"
+	"[loadAddress] [[hostIPaddr:]bootfilename]"
 );
 
 int do_rarpb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -62,7 +62,7 @@
 U_BOOT_CMD(
 	rarpboot,	3,	1,	do_rarpb,
 	"boot image via network using RARP/TFTP protocol",
-	"[loadAddress] [[hostIPaddr:]bootfilename]\n"
+	"[loadAddress] [[hostIPaddr:]bootfilename]"
 );
 
 #if defined(CONFIG_CMD_DHCP)
@@ -74,7 +74,7 @@
 U_BOOT_CMD(
 	dhcp,	3,	1,	do_dhcp,
 	"boot image via network using DHCP/TFTP protocol",
-	"[loadAddress] [[hostIPaddr:]bootfilename]\n"
+	"[loadAddress] [[hostIPaddr:]bootfilename]"
 );
 #endif
 
@@ -87,7 +87,7 @@
 U_BOOT_CMD(
 	nfs,	3,	1,	do_nfs,
 	"boot image via network using NFS protocol",
-	"[loadAddress] [[hostIPaddr:]bootfilename]\n"
+	"[loadAddress] [[hostIPaddr:]bootfilename]"
 );
 #endif
 
@@ -269,7 +269,7 @@
 U_BOOT_CMD(
 	ping,	2,	1,	do_ping,
 	"send ICMP ECHO_REQUEST to network host",
-	"pingAddress\n"
+	"pingAddress"
 );
 #endif
 
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index ac9e5cf..2186205 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -569,7 +569,7 @@
 U_BOOT_CMD(
 	saveenv, 1, 0,	do_saveenv,
 	"save environment variables to persistent storage",
-	NULL
+	""
 );
 
 #endif
@@ -602,7 +602,7 @@
 	"print environment variables",
 	"\n    - print values of all environment variables\n"
 	"printenv name ...\n"
-	"    - print value of environment variable 'name'\n"
+	"    - print value of environment variable 'name'"
 );
 
 U_BOOT_CMD(
@@ -611,7 +611,7 @@
 	"name value ...\n"
 	"    - set environment variable 'name' to 'value ...'\n"
 	"setenv name\n"
-	"    - delete environment variable 'name'\n"
+	"    - delete environment variable 'name'"
 );
 
 #if defined(CONFIG_CMD_ASKENV)
@@ -627,7 +627,7 @@
 	"    - get environment variable 'name' from stdin (max 'size' chars)\n"
 	"askenv name [message] size\n"
 	"    - display 'message' string and get environment variable 'name'"
-	"from stdin (max 'size' chars)\n"
+	"from stdin (max 'size' chars)"
 );
 #endif
 
@@ -637,6 +637,6 @@
 	run,	CONFIG_SYS_MAXARGS,	1,	do_run,
 	"run commands in an environment variable",
 	"var [...]\n"
-	"    - run the commands in the environment variable(s) 'var'\n"
+	"    - run the commands in the environment variable(s) 'var'"
 );
 #endif
diff --git a/common/cmd_onenand.c b/common/cmd_onenand.c
index e8f06d7..85bd2cb 100644
--- a/common/cmd_onenand.c
+++ b/common/cmd_onenand.c
@@ -486,5 +486,5 @@
 	"onenand test [off size] - test 'size' bytes from\n"
 	"    offset 'off' (entire device if not specified)\n"
 	"onenand dump[.oob] off - dump page\n"
-	"onenand markbad off - mark bad block at offset (UNSAFE)\n"
+	"onenand markbad off [...] - mark bad block(s) at offset (UNSAFE)"
 );
diff --git a/common/cmd_otp.c b/common/cmd_otp.c
index 4be4344..30af5a3 100644
--- a/common/cmd_otp.c
+++ b/common/cmd_otp.c
@@ -233,4 +233,5 @@
 	"otp write [--force] <addr> <page> [count] [half]\n"
 	" - write 'count' half-pages starting at 'page' (offset 'half') from 'addr'\n"
 	"otp lock <page> <count>\n"
-	" - lock 'count' pages starting at 'page'\n");
+	" - lock 'count' pages starting at 'page'"
+);
diff --git a/common/cmd_pci.c b/common/cmd_pci.c
index 4a9317f..8a260df 100644
--- a/common/cmd_pci.c
+++ b/common/cmd_pci.c
@@ -555,5 +555,5 @@
 	"pci modify[.b, .w, .l] b.d.f address\n"
 	"    -  modify, auto increment CFG address\n"
 	"pci write[.b, .w, .l] b.d.f address value\n"
-	"    - write to CFG address\n"
+	"    - write to CFG address"
 );
diff --git a/common/cmd_pcmcia.c b/common/cmd_pcmcia.c
index e448456..e576b0c 100644
--- a/common/cmd_pcmcia.c
+++ b/common/cmd_pcmcia.c
@@ -90,8 +90,8 @@
 	pinit,	2,	0,	do_pinit,
 	"PCMCIA sub-system",
 	"on  - power on PCMCIA socket\n"
-			"pinit off - power off PCMCIA socket\n"
-	  );
+	"pinit off - power off PCMCIA socket"
+);
 
 #endif
 
diff --git a/common/cmd_portio.c b/common/cmd_portio.c
index 41b1991..f8befee 100644
--- a/common/cmd_portio.c
+++ b/common/cmd_portio.c
@@ -94,7 +94,7 @@
 U_BOOT_CMD(
 	out,	3,	1,	do_portio_out,
 	"write datum to IO port",
-	"[.b, .w, .l] port value\n    - output to IO port\n"
+	"[.b, .w, .l] port value\n    - output to IO port"
 );
 
 int do_portio_in (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
@@ -159,5 +159,5 @@
 	in,	2,	1,	do_portio_in,
 	"read data from an IO port",
 	"[.b, .w, .l] port\n"
-	"    - read datum from IO port\n"
+	"    - read datum from IO port"
 );
diff --git a/common/cmd_reginfo.c b/common/cmd_reginfo.c
index 0e28c05..abb9941 100644
--- a/common/cmd_reginfo.c
+++ b/common/cmd_reginfo.c
@@ -383,5 +383,6 @@
 U_BOOT_CMD(
 	reginfo,	2,	1,	do_reginfo,
 	"print register information",
+	""
 );
 #endif
diff --git a/common/cmd_reiser.c b/common/cmd_reiser.c
index 14e4bd4..8ede782 100644
--- a/common/cmd_reiser.c
+++ b/common/cmd_reiser.c
@@ -104,7 +104,7 @@
 	reiserls,	4,	1,	do_reiserls,
 	"list files in a directory (default /)",
 	"<interface> <dev[:part]> [directory]\n"
-	"    - list files from 'dev' on 'interface' in a 'directory'\n"
+	"    - list files from 'dev' on 'interface' in a 'directory'"
 );
 
 /******************************************************************************
@@ -235,5 +235,5 @@
 	"load binary file from a Reiser filesystem",
 	"<interface> <dev[:part]> [addr] [filename] [bytes]\n"
 	"    - load binary file 'filename' from 'dev' on 'interface'\n"
-	"      to address 'addr' from dos filesystem\n"
+	"      to address 'addr' from dos filesystem"
 );
diff --git a/common/cmd_sata.c b/common/cmd_sata.c
index e849778..a8147e0 100644
--- a/common/cmd_sata.c
+++ b/common/cmd_sata.c
@@ -200,4 +200,5 @@
 	"sata device [dev] - show or set current device\n"
 	"sata part [dev] - print partition table\n"
 	"sata read addr blk# cnt\n"
-	"sata write addr blk# cnt\n");
+	"sata write addr blk# cnt"
+);
diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c
index dd2c1ae..f89492f 100644
--- a/common/cmd_scsi.c
+++ b/common/cmd_scsi.c
@@ -623,11 +623,11 @@
 	"scsi device [dev] - show or set current device\n"
 	"scsi part [dev] - print partition table of one or all SCSI devices\n"
 	"scsi read addr blk# cnt - read `cnt' blocks starting at block `blk#'\n"
-	"     to memory address `addr'\n"
+	"     to memory address `addr'"
 );
 
 U_BOOT_CMD(
 	scsiboot, 3, 1, do_scsiboot,
 	"boot from SCSI device",
-	"loadAddr dev:part\n"
+	"loadAddr dev:part"
 );
diff --git a/common/cmd_setexpr.c b/common/cmd_setexpr.c
index 9a5e720..f8b5d4d 100644
--- a/common/cmd_setexpr.c
+++ b/common/cmd_setexpr.c
@@ -66,5 +66,5 @@
 	"set environment variable as the result of eval expression",
 	"name value1 <op> value2\n"
 	"    - set environment variable 'name' to the result of the evaluated\n"
-	"      express specified by <op>.  <op> can be &, |, ^, +, -, *, /, %\n"
+	"      express specified by <op>.  <op> can be &, |, ^, +, -, *, /, %"
 );
diff --git a/common/cmd_sf.c b/common/cmd_sf.c
index 6a60b16..2d463a8 100644
--- a/common/cmd_sf.c
+++ b/common/cmd_sf.c
@@ -188,4 +188,5 @@
 	"				  `offset' to memory at `addr'\n"
 	"sf write addr offset len	- write `len' bytes from memory\n"
 	"				  at `addr' to flash at `offset'\n"
-	"sf erase offset len		- erase `len' bytes from `offset'\n");
+	"sf erase offset len		- erase `len' bytes from `offset'"
+);
diff --git a/common/cmd_source.c b/common/cmd_source.c
index 43e1315..965b8b1 100644
--- a/common/cmd_source.c
+++ b/common/cmd_source.c
@@ -229,10 +229,11 @@
 	"run script from memory",
 	"[addr]\n"
 	"\t- run script starting at addr\n"
-	"\t- A valid image header must be present\n"
+	"\t- A valid image header must be present"
 #if defined(CONFIG_FIT)
+	"\n"
 	"For FIT format uImage addr must include subimage\n"
-	"unit name in the form of addr:<subimg_uname>\n"
+	"unit name in the form of addr:<subimg_uname>"
 #endif
 );
 
@@ -251,6 +252,6 @@
 U_BOOT_CMD(
 	autoscr, 2, 0,	do_autoscr,
 	"DEPRECATED - use \"source\" command instead",
-	"DEPRECATED - use \"source\" command instead\n"
+	""
 );
 #endif
diff --git a/common/cmd_spi.c b/common/cmd_spi.c
index 746d14f..ab7aac7 100644
--- a/common/cmd_spi.c
+++ b/common/cmd_spi.c
@@ -142,5 +142,5 @@
 	"<device> <bit_len> <dout> - Send <bit_len> bits from <dout> out the SPI\n"
 	"<device>  - Identifies the chip select of the device\n"
 	"<bit_len> - Number of bits to send (base 10)\n"
-	"<dout>    - Hexadecimal string that gets sent\n"
+	"<dout>    - Hexadecimal string that gets sent"
 );
diff --git a/common/cmd_strings.c b/common/cmd_strings.c
index 4517ba2..3a0d8ff 100644
--- a/common/cmd_strings.c
+++ b/common/cmd_strings.c
@@ -43,4 +43,5 @@
 U_BOOT_CMD(strings, 3, 1, do_strings,
 	"display strings",
 	"<addr> [byte count]\n"
-	"    - display strings at <addr> for at least [byte count] or first double NUL\n");
+	"    - display strings at <addr> for at least [byte count] or first double NUL"
+);
diff --git a/common/cmd_ubi.c b/common/cmd_ubi.c
index 64a7307..bbca389 100644
--- a/common/cmd_ubi.c
+++ b/common/cmd_ubi.c
@@ -609,5 +609,5 @@
 	"[Legends]\n"
 	" volume: charater name\n"
 	" size: KiB, MiB, GiB, and bytes\n"
-	" type: s[tatic] or d[ynamic] (default=dynamic)\n"
+	" type: s[tatic] or d[ynamic] (default=dynamic)"
 );
diff --git a/common/cmd_ubifs.c b/common/cmd_ubifs.c
index 4767aa4..d9f60d5 100644
--- a/common/cmd_ubifs.c
+++ b/common/cmd_ubifs.c
@@ -119,14 +119,17 @@
 U_BOOT_CMD(
 	ubifsmount, 2, 0, do_ubifs_mount,
 	"mount UBIFS volume",
-	"\n");
+	""
+);
 
 U_BOOT_CMD(ubifsls, 2, 0, do_ubifs_ls,
-	   "list files in a directory",
-	   "[directory]\n"
-	   "    - list files in a 'directory' (default '/')\n");
+	"list files in a directory",
+	"[directory]\n"
+	"    - list files in a 'directory' (default '/')"
+);
 
 U_BOOT_CMD(ubifsload, 4, 0, do_ubifs_load,
-	   "load file from an UBIFS filesystem",
-	   "<addr> <filename> [bytes]\n"
-	   "    - load file 'filename' to address 'addr'\n");
+	"load file from an UBIFS filesystem",
+	"<addr> <filename> [bytes]\n"
+	"    - load file 'filename' to address 'addr'"
+);
diff --git a/common/cmd_universe.c b/common/cmd_universe.c
index bfb91b5..0a6d722 100644
--- a/common/cmd_universe.c
+++ b/common/cmd_universe.c
@@ -382,5 +382,5 @@
 	"                                      03 -> Configuration Space\n"
 	"    [vdw] = VMEbus Maximum Datawidth: 01 -> D8 Data Width\n"
 	"                                      02 -> D16 Data Width\n"
-	"                                      03 -> D32 Data Width\n"
+	"                                      03 -> D32 Data Width"
 );
diff --git a/common/cmd_usb.c b/common/cmd_usb.c
index a18e16e..7b8ee6b 100644
--- a/common/cmd_usb.c
+++ b/common/cmd_usb.c
@@ -686,14 +686,14 @@
 	"usb part [dev] - print partition table of one or all USB storage"
 	" devices\n"
 	"usb read addr blk# cnt - read `cnt' blocks starting at block `blk#'\n"
-	"    to memory address `addr'\n"
+	"    to memory address `addr'"
 );
 
 
 U_BOOT_CMD(
 	usbboot,	3,	1,	do_usbboot,
 	"boot from USB device",
-	"loadAddr dev:part\n"
+	"loadAddr dev:part"
 );
 
 #else
@@ -702,6 +702,6 @@
 	"USB sub-system",
 	"reset - reset (rescan) USB controller\n"
 	"usb  tree  - show USB device tree\n"
-	"usb  info [dev] - show available USB devices\n"
+	"usb  info [dev] - show available USB devices"
 );
 #endif
diff --git a/common/cmd_vfd.c b/common/cmd_vfd.c
index 84d9530..9c5b038 100644
--- a/common/cmd_vfd.c
+++ b/common/cmd_vfd.c
@@ -71,7 +71,7 @@
 	"/N\n"
 	"    - load bitmap N to the VFDs (N is _decimal_ !!!)\n"
 	"vfd ADDR\n"
-	"    - load bitmap at address ADDR\n"
+	"    - load bitmap at address ADDR"
 );
 #endif
 
diff --git a/common/cmd_ximg.c b/common/cmd_ximg.c
index a45d248..5593b2d 100644
--- a/common/cmd_ximg.c
+++ b/common/cmd_ximg.c
@@ -180,11 +180,12 @@
 }
 
 U_BOOT_CMD(imxtract, 4, 1, do_imgextract,
-	   "extract a part of a multi-image",
-	   "addr part [dest]\n"
-	   "    - extract <part> from legacy image at <addr> and copy to <dest>\n"
+	"extract a part of a multi-image",
+	"addr part [dest]\n"
+	"    - extract <part> from legacy image at <addr> and copy to <dest>"
 #if defined(CONFIG_FIT)
-	   "addr uname [dest]\n"
-	   "    - extract <uname> subimage from FIT image at <addr> and copy to <dest>\n"
+	"\n"
+	"addr uname [dest]\n"
+	"    - extract <uname> subimage from FIT image at <addr> and copy to <dest>"
 #endif
 );
diff --git a/common/cmd_yaffs2.c b/common/cmd_yaffs2.c
index c47ea76..d448d04 100644
--- a/common/cmd_yaffs2.c
+++ b/common/cmd_yaffs2.c
@@ -143,71 +143,71 @@
 U_BOOT_CMD(
     ymount, 3,  0,  do_ymount,
     "mount yaffs",
-    "\n"
+    ""
 );
 
 U_BOOT_CMD(
     yumount, 3,  0,  do_yumount,
     "unmount yaffs",
-    "\n"
+    ""
 );
 
 U_BOOT_CMD(
     yls,    4,  0,  do_yls,
     "yaffs ls",
-    "[-l] name\n"
+    "[-l] name"
 );
 
 U_BOOT_CMD(
     yrd,    2,  0,  do_yrd,
     "read file from yaffs",
-    "filename\n"
+    "filename"
 );
 
 U_BOOT_CMD(
     ywr,    4,  0,  do_ywr,
     "write file to yaffs",
-    "filename value num_vlues\n"
+    "filename value num_vlues"
 );
 
 U_BOOT_CMD(
     yrdm,   3,  0,  do_yrdm,
     "read file to memory from yaffs",
-    "filename offset\n"
+    "filename offset"
 );
 
 U_BOOT_CMD(
     ywrm,   4,  0,  do_ywrm,
     "write file from memory to yaffs",
-    "filename offset size\n"
+    "filename offset size"
 );
 
 U_BOOT_CMD(
     ymkdir, 2,  0,  do_ymkdir,
     "YAFFS mkdir",
-    "dirname\n"
+    "dirname"
 );
 
 U_BOOT_CMD(
     yrmdir, 2,  0,  do_yrmdir,
     "YAFFS rmdir",
-    "dirname\n"
+    "dirname"
 );
 
 U_BOOT_CMD(
     yrm,    2,  0,  do_yrm,
     "YAFFS rm",
-    "path\n"
+    "path"
 );
 
 U_BOOT_CMD(
     ymv,    4,  0,  do_ymv,
     "YAFFS mv",
-    "oldPath newPath\n"
+    "oldPath newPath"
 );
 
 U_BOOT_CMD(
     ydump,  2,  0,  do_ydump,
     "YAFFS device struct",
-    "dirname\n"
+    "dirname"
 );
diff --git a/common/command.c b/common/command.c
index 16f3afe..b57f8df 100644
--- a/common/command.c
+++ b/common/command.c
@@ -39,7 +39,7 @@
 U_BOOT_CMD(
 	version,	1,		1,	do_version,
 	"print monitor version",
-	NULL
+	""
 );
 
 #if defined(CONFIG_CMD_ECHO)
@@ -73,7 +73,7 @@
 	echo,	CONFIG_SYS_MAXARGS,	1,	do_echo,
 	"echo args to console",
 	"[args..]\n"
-	"    - echo args to console; \\c suppresses newline\n"
+	"    - echo args to console; \\c suppresses newline"
 );
 
 #endif
@@ -204,8 +204,7 @@
 U_BOOT_CMD(
 	test,	CONFIG_SYS_MAXARGS,	1,	do_test,
 	"minimal test like /bin/sh",
-	"[args..]\n"
-	"    - test functionality\n"
+	"[args..]"
 );
 
 int
@@ -223,7 +222,7 @@
 U_BOOT_CMD(
 	exit,	2,	1,	do_exit,
 	"exit script",
-	"    - exit functionality\n"
+	""
 );
 
 
@@ -314,15 +313,15 @@
 	"'help' prints online help for the monitor commands.\n\n"
 	"Without arguments, it prints a short usage message for all commands.\n\n"
 	"To get detailed help information for specific commands you can type\n"
-  "'help' with one or more command names as arguments.\n"
+	"'help' with one or more command names as arguments."
 );
 
-/* This do not ust the U_BOOT_CMD macro as ? can't be used in symbol names */
+/* This does not use the U_BOOT_CMD macro as ? can't be used in symbol names */
 #ifdef  CONFIG_SYS_LONGHELP
 cmd_tbl_t __u_boot_cmd_question_mark Struct_Section = {
 	"?",	CONFIG_SYS_MAXARGS,	1,	do_help,
 	"alias for 'help'",
-	NULL
+	""
 };
 #else
 cmd_tbl_t __u_boot_cmd_question_mark Struct_Section = {
diff --git a/common/hush.c b/common/hush.c
index cf5782a..97fd070 100644
--- a/common/hush.c
+++ b/common/hush.c
@@ -3627,7 +3627,7 @@
 	"print local hushshell variables",
 	"\n    - print values of all hushshell variables\n"
 	"showvar name ...\n"
-	"    - print value of hushshell variable 'name'\n"
+	"    - print value of hushshell variable 'name'"
 );
 
 #endif
diff --git a/common/lcd.c b/common/lcd.c
index 4155170..74a5c77 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -427,7 +427,7 @@
 U_BOOT_CMD(
 	cls,	1,	1,	lcd_clear,
 	"clear screen",
-	NULL
+	""
 );
 
 /*----------------------------------------------------------------------*/
diff --git a/cpu/arm_cortexa8/omap3/board.c b/cpu/arm_cortexa8/omap3/board.c
index 51d5cf6..6e29599 100644
--- a/cpu/arm_cortexa8/omap3/board.c
+++ b/cpu/arm_cortexa8/omap3/board.c
@@ -335,8 +335,8 @@
 U_BOOT_CMD(
 	nandecc, 2, 1,	do_switch_ecc,
 	"nandecc - switch OMAP3 NAND ECC calculation algorithm\n",
-	"[hw/sw] - Switch between NAND hardware (hw) or software (sw) ecc algorithm\n"
-	);
+	"[hw/sw] - Switch between NAND hardware (hw) or software (sw) ecc algorithm"
+);
 
 #endif /* CONFIG_NAND_OMAP_GPMC */
 
diff --git a/cpu/mpc512x/iim.c b/cpu/mpc512x/iim.c
index 6cdc422..8f2eb37 100644
--- a/cpu/mpc512x/iim.c
+++ b/cpu/mpc512x/iim.c
@@ -389,6 +389,6 @@
 	"			    no args for entire bank\n"
 	"fuse prog <frow_bit> 	- program fuse at row <frow>, bit <_bit>\n"
 	"			    <frow> is 0-31, <bit> is 0-7; eg. 13_2 \n"
-	"			  WARNING - this is permanent\n"
-	);
+	"			  WARNING - this is permanent"
+);
 #endif /* CONFIG_CMD_FUSE */
diff --git a/cpu/mpc512x/speed.c b/cpu/mpc512x/speed.c
index 5992111..1f90862 100644
--- a/cpu/mpc512x/speed.c
+++ b/cpu/mpc512x/speed.c
@@ -138,7 +138,7 @@
 
 U_BOOT_CMD(clocks, 1, 0, do_clocks,
 	"print clock configuration",
-	"    clocks\n"
+	"    clocks"
 );
 
 int prt_mpc512x_clks (void)
diff --git a/cpu/mpc83xx/speed.c b/cpu/mpc83xx/speed.c
index 9b7e7b5..95b558f 100644
--- a/cpu/mpc83xx/speed.c
+++ b/cpu/mpc83xx/speed.c
@@ -545,5 +545,5 @@
 
 U_BOOT_CMD(clocks, 1, 0, do_clocks,
 	"print clock configuration",
-	"    clocks\n"
+	"    clocks"
 );
diff --git a/cpu/nios/asmi.c b/cpu/nios/asmi.c
index 2c2e838..33553b7 100644
--- a/cpu/nios/asmi.c
+++ b/cpu/nios/asmi.c
@@ -48,7 +48,7 @@
 	"asmi write addr offset count\n"\
 	"    - write count bytes to offset from addr.\n"\
 	"asmi verify addr offset count\n"\
-	"    - verify count bytes at offset from addr.\n"
+	"    - verify count bytes at offset from addr."
 
 
 /*-----------------------------------------------------------------------*/
diff --git a/cpu/nios2/epcs.c b/cpu/nios2/epcs.c
index 968b50f..483b249 100644
--- a/cpu/nios2/epcs.c
+++ b/cpu/nios2/epcs.c
@@ -47,7 +47,7 @@
 	"epcs write addr offset count\n"\
 	"    - write count bytes to offset from addr.\n"\
 	"epcs verify addr offset count\n"\
-	"    - verify count bytes at offset from addr.\n"
+	"    - verify count bytes at offset from addr."
 
 
 /*-----------------------------------------------------------------------*/
diff --git a/cpu/nios2/sysid.c b/cpu/nios2/sysid.c
index 251204b..77bc8b5 100644
--- a/cpu/nios2/sysid.c
+++ b/cpu/nios2/sysid.c
@@ -53,6 +53,6 @@
 U_BOOT_CMD(
 	sysid,	1,	1,	do_sysid,
 	"display Nios-II system id",
-	"\n    - display Nios-II system id\n"
+	""
 );
 #endif /* CONFIG_SYS_NIOS_SYSID_BASE */
diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c
index 1c5e314..e8273ee 100644
--- a/drivers/gpio/pca953x.c
+++ b/drivers/gpio/pca953x.c
@@ -221,7 +221,7 @@
 	"pca953x invert pin 0|1\n"
 	"	- disable/enable polarity inversion for reads\n"
 	"pca953x intput pin\n"
-	"	- set pin as input and read value\n"
+	"	- set pin as input and read value"
 );
 
 #endif /* CONFIG_CMD_PCA953X */
diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c
index 8b5fbbc..f2510a3 100644
--- a/drivers/misc/ds4510.c
+++ b/drivers/misc/ds4510.c
@@ -404,12 +404,14 @@
 	"ds4510 pullup pin 0|1\n"
 	"	- disable/enable pullup on specified pin\n"
 	"ds4510 nv 0|1\n"
-	"	- make gpio and seeprom writes volatile/non-volatile\n"
+	"	- make gpio and seeprom writes volatile/non-volatile"
 #ifdef CONFIG_CMD_DS4510_RST
+	"\n"
 	"ds4510 rstdelay 0-3\n"
-	"	- set reset output delay\n"
+	"	- set reset output delay"
 #endif
 #ifdef CONFIG_CMD_DS4510_MEM
+	"\n"
 	"ds4510 eeprom read addr off cnt\n"
 	"ds4510 eeprom write addr off cnt\n"
 	"	- read/write 'cnt' bytes at EEPROM offset 'off'\n"
@@ -418,7 +420,7 @@
 	"	- read/write 'cnt' bytes at SRAM-shadowed EEPROM offset 'off'\n"
 	"ds4510 sram read addr off cnt\n"
 	"ds4510 sram write addr off cnt\n"
-	"	- read/write 'cnt' bytes at SRAM offset 'off'\n"
+	"	- read/write 'cnt' bytes at SRAM offset 'off'"
 #endif
 );
 #endif /* CONFIG_CMD_DS4510 */
diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c
index f114fe0..918bfa7 100644
--- a/drivers/qe/qe.c
+++ b/drivers/qe/qe.c
@@ -473,5 +473,6 @@
 	qe, 4, 0, qe_cmd,
 	"QUICC Engine commands",
 	"fw <addr> [<length>] - Upload firmware binary at address <addr> to "
-		"the QE,\n\twith optional length <length> verification.\n"
-	);
+		"the QE,\n"
+	"\twith optional length <length> verification."
+);