Merge branch '[email protected]' of git://git.denx.de/u-boot-staging

8 files changed, 9 insertions, 10 deletions

diff --git a/cmd/bmp.c b/cmd/bmp.c
index fd5b7db2885..01b3d39e9c8 100644
--- a/cmd/bmp.c
+++ b/cmd/bmp.c
@@ -259,7 +259,6 @@ int bmp_display(ulong addr, int x, int y)
 			ret = video_bmp_display(dev, addr, x, y, align);
 		}
 	}
-	return ret ? CMD_RET_FAILURE : 0;
 #elif defined(CONFIG_LCD)
 	ret = lcd_display_bitmap(addr, x, y);
 #elif defined(CONFIG_VIDEO)
@@ -271,5 +270,5 @@ int bmp_display(ulong addr, int x, int y)
 	if (bmp_alloc_addr)
 		free(bmp_alloc_addr);
 
-	return ret;
+	return ret ? CMD_RET_FAILURE : 0;
 }
diff --git a/cmd/bootldr.c b/cmd/bootldr.c
index bc5c1f95eaf..38b3b2f8d74 100644
--- a/cmd/bootldr.c
+++ b/cmd/bootldr.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - bootldr.c
+ * U-Boot - bootldr.c
  *
  * Copyright (c) 2005-2008 Analog Devices Inc.
  *
diff --git a/cmd/cramfs.c b/cmd/cramfs.c
index 1d31326bd64..270701b99d9 100644
--- a/cmd/cramfs.c
+++ b/cmd/cramfs.c
@@ -77,7 +77,7 @@ extern int cramfs_ls (struct part_info *info, char *filename);
 extern int cramfs_info (struct part_info *info);
 
 /***************************************************/
-/* U-boot commands				   */
+/* U-Boot commands				   */
 /***************************************************/
 
 /**
diff --git a/cmd/jffs2.c b/cmd/jffs2.c
index bce098315e3..0b2eefa1954 100644
--- a/cmd/jffs2.c
+++ b/cmd/jffs2.c
@@ -456,7 +456,7 @@ static struct part_info* jffs2_part_info(struct mtd_device *dev, unsigned int pa
 }
 
 /***************************************************/
-/* U-boot commands				   */
+/* U-Boot commands				   */
 /***************************************************/
 
 /**
diff --git a/cmd/ldrinfo.c b/cmd/ldrinfo.c
index 2aa56bdb62c..2b492973275 100644
--- a/cmd/ldrinfo.c
+++ b/cmd/ldrinfo.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - ldrinfo
+ * U-Boot - ldrinfo
  *
  * Copyright (c) 2010 Analog Devices Inc.
  *
diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c
index dab195841a7..86a4689616c 100644
--- a/cmd/mtdparts.c
+++ b/cmd/mtdparts.c
@@ -1877,7 +1877,7 @@ static struct part_info* mtd_part_info(struct mtd_device *dev, unsigned int part
 }
 
 /***************************************************/
-/* U-boot commands				   */
+/* U-Boot commands				   */
 /***************************************************/
 /* command line only */
 /**
diff --git a/cmd/pxe.c b/cmd/pxe.c
index 080b3760de0..9434a18177a 100644
--- a/cmd/pxe.c
+++ b/cmd/pxe.c
@@ -571,7 +571,7 @@ static void label_print(void *data)
 
 /*
  * Boot a label that specified 'localboot'. This requires that the 'localcmd'
- * environment variable is defined. Its contents will be executed as U-boot
+ * environment variable is defined. Its contents will be executed as U-Boot
  * command.  If the label specified an 'append' line, its contents will be
  * used to overwrite the contents of the 'bootargs' environment variable prior
  * to running 'localcmd'.
@@ -1438,7 +1438,7 @@ static struct pxe_menu *parse_pxefile(cmd_tbl_t *cmdtp, unsigned long menucfg)
 }
 
 /*
- * Converts a pxe_menu struct into a menu struct for use with U-boot's generic
+ * Converts a pxe_menu struct into a menu struct for use with U-Boot's generic
  * menu code.
  */
 static struct menu *pxe_menu_to_menu(struct pxe_menu *cfg)
diff --git a/cmd/spibootldr.c b/cmd/spibootldr.c
index ca76dde1dda..acbb0f69697 100644
--- a/cmd/spibootldr.c
+++ b/cmd/spibootldr.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - spibootldr.c
+ * U-Boot - spibootldr.c
  *
  * Copyright (c) 2005-2008 Analog Devices Inc.
  *