Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

59 files changed, 64 insertions, 64 deletions

diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 342fdfe24a..535dc6eceb 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -334,7 +334,7 @@
  *
  * Please notice, that the resulting clock frequency could differ from the
  * configured value. This is because the I2C clock is derived from system
- * clock over a frequency divider with only a few divider values. U-boot
+ * clock over a frequency divider with only a few divider values. U-Boot
  * calculates the best approximation for CONFIG_SYS_I2C_SPEED. However the calculated
  * approximation allways lies below the configured value, never above.
  */
diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h
index 2499b39c16..f6c0147dd9 100644
--- a/include/configs/adp-ag101p.h
+++ b/include/configs/adp-ag101p.h
@@ -271,7 +271,7 @@
 
 /*
  * Load address and memory test area should agree with
- * arch/nds32/config.mk. Be careful not to overwrite U-boot itself.
+ * arch/nds32/config.mk. Be careful not to overwrite U-Boot itself.
  */
 #define CONFIG_SYS_LOAD_ADDR		0x300000
 
diff --git a/include/configs/bct-brettl2.h b/include/configs/bct-brettl2.h
index 36637aef95..658b16d3ae 100644
--- a/include/configs/bct-brettl2.h
+++ b/include/configs/bct-brettl2.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for BF536 brettl2 board
+ * U-Boot - Configuration file for BF536 brettl2 board
  */
 
 #ifndef __CONFIG_BCT_BRETTL2_H__
diff --git a/include/configs/bf506f-ezkit.h b/include/configs/bf506f-ezkit.h
index 597f1cd5d1..68a91a6b5a 100644
--- a/include/configs/bf506f-ezkit.h
+++ b/include/configs/bf506f-ezkit.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for BF506F EZ-Kit board
+ * U-Boot - Configuration file for BF506F EZ-Kit board
  */
 
 #ifndef __CONFIG_BF506F_EZKIT_H__
diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h
index 84bb044421..9f44ebdb0b 100644
--- a/include/configs/bf518f-ezbrd.h
+++ b/include/configs/bf518f-ezbrd.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for BF518F EZBrd board
+ * U-Boot - Configuration file for BF518F EZBrd board
  */
 
 #ifndef __CONFIG_BF518F_EZBRD_H__
diff --git a/include/configs/bf525-ucr2.h b/include/configs/bf525-ucr2.h
index d12963a5f0..5a6067e5e2 100644
--- a/include/configs/bf525-ucr2.h
+++ b/include/configs/bf525-ucr2.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for bf525-ucr2 board
+ * U-Boot - Configuration file for bf525-ucr2 board
  * The board includes ADSP-BF525 rev. 0.2,
  * 32-bit SDRAM (SAMSUNG K4S561632H-UC75),
  * USB 2.0 High Speed OTG USB WIFI,
diff --git a/include/configs/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h
index 35a2228a6b..e9d900ef01 100644
--- a/include/configs/bf526-ezbrd.h
+++ b/include/configs/bf526-ezbrd.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for BF526 EZBrd board
+ * U-Boot - Configuration file for BF526 EZBrd board
  */
 
 #ifndef __CONFIG_BF526_EZBRD_H__
diff --git a/include/configs/bf527-ad7160-eval.h b/include/configs/bf527-ad7160-eval.h
index 2f3dec5b09..dd62e7e0fe 100644
--- a/include/configs/bf527-ad7160-eval.h
+++ b/include/configs/bf527-ad7160-eval.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for BF527 AD7160-EVAL board
+ * U-Boot - Configuration file for BF527 AD7160-EVAL board
  */
 
 #ifndef __CONFIG_BF527_AD7160_EVAL_H__
diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h
index aee776132c..44de44f8f5 100644
--- a/include/configs/bf527-ezkit.h
+++ b/include/configs/bf527-ezkit.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for BF537 STAMP board
+ * U-Boot - Configuration file for BF537 STAMP board
  */
 
 #ifndef __CONFIG_BF527_EZKIT_H__
diff --git a/include/configs/bf527-sdp.h b/include/configs/bf527-sdp.h
index 51814a677f..6b51201629 100644
--- a/include/configs/bf527-sdp.h
+++ b/include/configs/bf527-sdp.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for BF527 SDP board
+ * U-Boot - Configuration file for BF527 SDP board
  */
 
 #ifndef __CONFIG_BF527_SDP_H__
diff --git a/include/configs/bf533-ezkit.h b/include/configs/bf533-ezkit.h
index 1b7290e8d7..95811018cf 100644
--- a/include/configs/bf533-ezkit.h
+++ b/include/configs/bf533-ezkit.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for BF533 EZKIT board
+ * U-Boot - Configuration file for BF533 EZKIT board
  */
 
 #ifndef __CONFIG_BF533_EZKIT_H__
diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h
index 4876169104..c8c48aeac4 100644
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for BF533 STAMP board
+ * U-Boot - Configuration file for BF533 STAMP board
  */
 
 #ifndef __CONFIG_BF533_STAMP_H__
diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h
index 4fbdca7239..be474ad1ba 100644
--- a/include/configs/bf537-minotaur.h
+++ b/include/configs/bf537-minotaur.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for CSP Minotaur board
+ * U-Boot - Configuration file for CSP Minotaur board
  *
  * Thu Oct 25 15:30:44 CEST 2007 <hackfin@section5.ch>
  *    Minotaur config, brushed up for official uClinux dist.
diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h
index 2474adb555..5794f471eb 100644
--- a/include/configs/bf537-pnav.h
+++ b/include/configs/bf537-pnav.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for BF537 PNAV board
+ * U-Boot - Configuration file for BF537 PNAV board
  */
 
 #ifndef __CONFIG_BF537_PNAV_H__
diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h
index 89d26043da..6d4a93b324 100644
--- a/include/configs/bf537-srv1.h
+++ b/include/configs/bf537-srv1.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for CSP Minotaur board
+ * U-Boot - Configuration file for CSP Minotaur board
  *
  * Thu Oct 25 15:30:44 CEST 2007 <hackfin@section5.ch>
  *    Minotaur config, brushed up for official uClinux dist.
diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index f250cdbf0a..b1787132ab 100644
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for BF537 STAMP board
+ * U-Boot - Configuration file for BF537 STAMP board
  */
 
 #ifndef __CONFIG_BF537_STAMP_H__
diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h
index b1d4f263ae..55becdc5a1 100644
--- a/include/configs/bf538f-ezkit.h
+++ b/include/configs/bf538f-ezkit.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for BF538F EZ-Kit Lite board
+ * U-Boot - Configuration file for BF538F EZ-Kit Lite board
  */
 
 #ifndef __CONFIG_BF538F_EZKIT_H__
diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h
index 65009c6f28..8198cb862a 100644
--- a/include/configs/bf548-ezkit.h
+++ b/include/configs/bf548-ezkit.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for BF548 STAMP board
+ * U-Boot - Configuration file for BF548 STAMP board
  */
 
 #ifndef __CONFIG_BF548_EZKIT_H__
diff --git a/include/configs/bf561-acvilon.h b/include/configs/bf561-acvilon.h
index 92251fc0bd..31862daf31 100644
--- a/include/configs/bf561-acvilon.h
+++ b/include/configs/bf561-acvilon.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for BF561 Acvilon System On Module
+ * U-Boot - Configuration file for BF561 Acvilon System On Module
  * For more information please go to http://www.niistt.ru/
  */
 
diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h
index efbc6c21d9..1a3b33f395 100644
--- a/include/configs/bf561-ezkit.h
+++ b/include/configs/bf561-ezkit.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for BF561 EZKIT board
+ * U-Boot - Configuration file for BF561 EZKIT board
  */
 
 #ifndef __CONFIG_BF561_EZKIT_H__
diff --git a/include/configs/bf609-ezkit.h b/include/configs/bf609-ezkit.h
index b5d4847523..3e0bff56dd 100644
--- a/include/configs/bf609-ezkit.h
+++ b/include/configs/bf609-ezkit.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for BF609 EZ-Kit board
+ * U-Boot - Configuration file for BF609 EZ-Kit board
  */
 
 #ifndef __CONFIG_BF609_EZKIT_H__
diff --git a/include/configs/blackstamp.h b/include/configs/blackstamp.h
index 60650aa77b..b9e859c07b 100644
--- a/include/configs/blackstamp.h
+++ b/include/configs/blackstamp.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for BlackStamp board
+ * U-Boot - Configuration file for BlackStamp board
  * Configuration by Ben Matthews for UR LLE using bf533-stamp.h
  * as a template
  * See http://blackfin.uclinux.org/gf/project/blackstamp/
diff --git a/include/configs/blackvme.h b/include/configs/blackvme.h
index 16949aa929..a262e7914f 100644
--- a/include/configs/blackvme.h
+++ b/include/configs/blackvme.h
@@ -1,4 +1,4 @@
-/* U-boot for BlackVME. (C) Wojtek Skulski 2010.
+/* U-Boot for BlackVME. (C) Wojtek Skulski 2010.
  * The board includes ADSP-BF561 rev. 0.5,
  * 32-bit SDRAM (2 * MT48LC16M16A2TG or MT48LC32M16A2TG),
  * Gigabit Ether AX88180 (ASIX) + 88E1111 rev. B2 (Marvell),
diff --git a/include/configs/br4.h b/include/configs/br4.h
index 7dda472fe7..85f31a46a4 100644
--- a/include/configs/br4.h
+++ b/include/configs/br4.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for BR4 Appliance
+ * U-Boot - Configuration file for BR4 Appliance
  *
  * based on bf537-stamp.h
  * Copyright (c) Switchfin Org. <dpn@switchfin.org>
diff --git a/include/configs/cm-bf527.h b/include/configs/cm-bf527.h
index e9e4e1414a..761e2c5f43 100644
--- a/include/configs/cm-bf527.h
+++ b/include/configs/cm-bf527.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for CM-BF527 board
+ * U-Boot - Configuration file for CM-BF527 board
  */
 
 #ifndef __CONFIG_CM_BF527_H__
diff --git a/include/configs/cm-bf533.h b/include/configs/cm-bf533.h
index a4647858dd..d06333dc41 100644
--- a/include/configs/cm-bf533.h
+++ b/include/configs/cm-bf533.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for CM-BF533 board
+ * U-Boot - Configuration file for CM-BF533 board
  */
 
 #ifndef __CONFIG_CM_BF533_H__
diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h
index 0eebe56503..746a5bd417 100644
--- a/include/configs/cm-bf537e.h
+++ b/include/configs/cm-bf537e.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for CM-BF537E board
+ * U-Boot - Configuration file for CM-BF537E board
  */
 
 #ifndef __CONFIG_CM_BF537E_H__
diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h
index 3a2d72626c..71008aaa06 100644
--- a/include/configs/cm-bf537u.h
+++ b/include/configs/cm-bf537u.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for CM-BF537U board
+ * U-Boot - Configuration file for CM-BF537U board
  */
 
 #ifndef __CONFIG_CM_BF537U_H__
diff --git a/include/configs/cm-bf548.h b/include/configs/cm-bf548.h
index cde23ada40..37205a9c5b 100644
--- a/include/configs/cm-bf548.h
+++ b/include/configs/cm-bf548.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for cm-bf548 board
+ * U-Boot - Configuration file for cm-bf548 board
  */
 
 #ifndef __CONFIG_CM_BF548_H__
diff --git a/include/configs/cm-bf561.h b/include/configs/cm-bf561.h
index 9d8a2c613f..284ec83391 100644
--- a/include/configs/cm-bf561.h
+++ b/include/configs/cm-bf561.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for CM-BF561 board
+ * U-Boot - Configuration file for CM-BF561 board
  */
 
 #ifndef __CONFIG_CM_BF561_H__
diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index 8e70d8c94c..67a143f8f6 100644
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -7,7 +7,7 @@
  */
 
 /* ---
- * Version: U-boot 1.0.0 - initial release for Sentec COBRA5272 board
+ * Version: U-Boot 1.0.0 - initial release for Sentec COBRA5272 board
  * Date: 2004-03-29
  * Author: Florian Schlote
  *
diff --git a/include/configs/dnp5370.h b/include/configs/dnp5370.h
index 3b2da0ddd4..c46e60d2e5 100644
--- a/include/configs/dnp5370.h
+++ b/include/configs/dnp5370.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for SSV DNP5370 board
+ * U-Boot - Configuration file for SSV DNP5370 board
  */
 
 #ifndef __CONFIG_DNP5370_H__
diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h
index 9fce1cda6b..7bc58dc414 100644
--- a/include/configs/edb93xx.h
+++ b/include/configs/edb93xx.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for Cirrus Logic EDB93xx boards
+ * U-Boot - Configuration file for Cirrus Logic EDB93xx boards
  */
 
 #ifndef __CONFIG_H
diff --git a/include/configs/espt.h b/include/configs/espt.h
index d854341b07..4896498c46 100644
--- a/include/configs/espt.h
+++ b/include/configs/espt.h
@@ -56,7 +56,7 @@
 #define CONFIG_SYS_MAX_FLASH_BANKS (1)
 #define CONFIG_SYS_MAX_FLASH_SECT  (150)
 
-/* U-boot setting */
+/* U-Boot setting */
 #define CONFIG_SYS_LOAD_ADDR		(CONFIG_SYS_SDRAM_BASE + 4 * 1024 * 1024)
 #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_MONITOR_LEN		(128 * 1024)
diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h
index 9c3ea883ff..834a22f7a5 100644
--- a/include/configs/exynos5-common.h
+++ b/include/configs/exynos5-common.h
@@ -113,7 +113,7 @@
 #define CONFIG_BL1_OFFSET	(CONFIG_RES_BLOCK_SIZE + CONFIG_SEC_FW_SIZE)
 #define CONFIG_BL2_OFFSET	(CONFIG_BL1_OFFSET + CONFIG_BL1_SIZE)
 
-/* U-boot copy size from boot Media to DRAM.*/
+/* U-Boot copy size from boot Media to DRAM.*/
 #define BL2_START_OFFSET	(CONFIG_BL2_OFFSET/512)
 #define BL2_SIZE_BLOC_COUNT	(CONFIG_BL2_SIZE/512)
 
diff --git a/include/configs/ibf-dsp561.h b/include/configs/ibf-dsp561.h
index 4757929618..7cb23466fb 100644
--- a/include/configs/ibf-dsp561.h
+++ b/include/configs/ibf-dsp561.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for IBF-DSP561 board
+ * U-Boot - Configuration file for IBF-DSP561 board
  */
 
 #ifndef __CONFIG_IBF_DSP561__H__
diff --git a/include/configs/ip04.h b/include/configs/ip04.h
index 0993ffa444..3638648713 100644
--- a/include/configs/ip04.h
+++ b/include/configs/ip04.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for IP04 board (having BF532 processor)
+ * U-Boot - Configuration file for IP04 board (having BF532 processor)
  *
  * Copyright (c) 2006 Intratrade Ltd., Ivan Danov, idanov@gmail.com
  *
diff --git a/include/configs/ls2080a_emu.h b/include/configs/ls2080a_emu.h
index 4a7ba2477b..534ebb6735 100644
--- a/include/configs/ls2080a_emu.h
+++ b/include/configs/ls2080a_emu.h
@@ -11,12 +11,12 @@
 
 #ifdef CONFIG_LS2080A
 #define CONFIG_IDENT_STRING		" LS2080A-EMU"
-#define CONFIG_BOOTP_VCI_STRING		"U-boot.LS2080A-EMU"
+#define CONFIG_BOOTP_VCI_STRING		"U-Boot.LS2080A-EMU"
 #endif
 
 #ifdef CONFIG_LS2085A
 #define CONFIG_IDENT_STRING		" LS2085A-EMU"
-#define CONFIG_BOOTP_VCI_STRING		"U-boot.LS2085A-EMU"
+#define CONFIG_BOOTP_VCI_STRING		"U-Boot.LS2085A-EMU"
 #endif
 
 #define CONFIG_SYS_CLK_FREQ	100000000
diff --git a/include/configs/ls2080a_simu.h b/include/configs/ls2080a_simu.h
index 876ee30517..2c2ce7bfec 100644
--- a/include/configs/ls2080a_simu.h
+++ b/include/configs/ls2080a_simu.h
@@ -11,12 +11,12 @@
 
 #ifdef CONFIG_LS2080A
 #define CONFIG_IDENT_STRING		" LS2080A-SIMU"
-#define CONFIG_BOOTP_VCI_STRING		"U-boot.LS2080A-SIMU"
+#define CONFIG_BOOTP_VCI_STRING		"U-Boot.LS2080A-SIMU"
 #endif
 
 #ifdef CONFIG_LS2085A
 #define CONFIG_IDENT_STRING		" LS2085A-SIMU"
-#define CONFIG_BOOTP_VCI_STRING		"U-boot.LS2085A-SIMU"
+#define CONFIG_BOOTP_VCI_STRING		"U-Boot.LS2085A-SIMU"
 #endif
 
 #define CONFIG_SYS_CLK_FREQ	100000000
diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h
index 863b032042..3813e25d2f 100644
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@@ -165,7 +165,7 @@
 
 /* NAND configuration for the NAND_SPL */
 
-/* Start copying real U-boot from the second page */
+/* Start copying real U-Boot from the second page */
 #define CONFIG_SYS_NAND_U_BOOT_OFFS	CONFIG_SPL_PAD_TO
 #define CONFIG_SYS_NAND_U_BOOT_SIZE	0x3f800
 /* Load U-Boot to this address */
diff --git a/include/configs/novena.h b/include/configs/novena.h
index d5f517c76d..a5416131ba 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -1,5 +1,5 @@
 /*
- * Configuration settings for the Novena U-boot.
+ * Configuration settings for the Novena U-Boot.
  *
  * Copyright (C) 2014 Marek Vasut <marex@denx.de>
  *
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 1dd71a8eb6..996f772a28 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -21,7 +21,7 @@
 #include <asm/arch/omap.h>
 
 /* ----------------------------------------------------------------------------
- * Supported U-boot commands
+ * Supported U-Boot commands
  * ----------------------------------------------------------------------------
  */
 #define CONFIG_CMD_ASKENV
@@ -37,7 +37,7 @@
 #define CONFIG_CMD_PING
 
 /* ----------------------------------------------------------------------------
- * Supported U-boot features
+ * Supported U-Boot features
  * ----------------------------------------------------------------------------
  */
 #define CONFIG_SYS_LONGHELP
diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h
index 2004d148c6..0f16a6e19d 100644
--- a/include/configs/omap3_evm_common.h
+++ b/include/configs/omap3_evm_common.h
@@ -175,7 +175,7 @@
 #endif /* CONFIG_USB_OMAP3 */
 
 /* ----------------------------------------------------------------------------
- * U-boot features
+ * U-Boot features
  * ----------------------------------------------------------------------------
  */
 #define CONFIG_SYS_MAXARGS		16	/* max args for a command */
diff --git a/include/configs/omap3_evm_quick_mmc.h b/include/configs/omap3_evm_quick_mmc.h
index 27cd9bed5c..23a8a07132 100644
--- a/include/configs/omap3_evm_quick_mmc.h
+++ b/include/configs/omap3_evm_quick_mmc.h
@@ -16,7 +16,7 @@
 #include <asm/arch/omap.h>
 
 /* ----------------------------------------------------------------------------
- * Supported U-boot commands
+ * Supported U-Boot commands
  * ----------------------------------------------------------------------------
  */
 #define CONFIG_CMD_MMC
@@ -30,7 +30,7 @@
  */
 
 /* ----------------------------------------------------------------------------
- * Supported U-boot features
+ * Supported U-Boot features
  * ----------------------------------------------------------------------------
  */
 #define CONFIG_SILENT_CONSOLE
diff --git a/include/configs/omap3_evm_quick_nand.h b/include/configs/omap3_evm_quick_nand.h
index 124e8c6641..bb908fad3e 100644
--- a/include/configs/omap3_evm_quick_nand.h
+++ b/include/configs/omap3_evm_quick_nand.h
@@ -16,7 +16,7 @@
 #include <asm/arch/omap.h>
 
 /* ----------------------------------------------------------------------------
- * Supported U-boot commands
+ * Supported U-Boot commands
  * ----------------------------------------------------------------------------
  */
 #define CONFIG_CMD_NAND
@@ -29,7 +29,7 @@
  */
 
 /* ----------------------------------------------------------------------------
- * Supported U-boot features
+ * Supported U-Boot features
  * ----------------------------------------------------------------------------
  */
 #define CONFIG_SILENT_CONSOLE
diff --git a/include/configs/origen.h b/include/configs/origen.h
index ef80bf60ca..fa71874f8a 100644
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -111,7 +111,7 @@
 
 #define CONFIG_SYS_INIT_SP_ADDR		0x02040000
 
-/* U-boot copy size from boot Media to DRAM.*/
+/* U-Boot copy size from boot Media to DRAM.*/
 #define COPY_BL2_SIZE		0x80000
 #define BL2_START_OFFSET	((CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)/512)
 #define BL2_SIZE_BLOC_COUNT	(COPY_BL2_SIZE/512)
diff --git a/include/configs/pr1.h b/include/configs/pr1.h
index 2e5ce75629..1af9ef7cad 100644
--- a/include/configs/pr1.h
+++ b/include/configs/pr1.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for PR1 Appliance
+ * U-Boot - Configuration file for PR1 Appliance
  *
  * based on bf537-stamp.h
  * Copyright (c) Switchfin Org. <dpn@switchfin.org>
diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h
index 7148f1da95..0fd2caf161 100644
--- a/include/configs/sh7763rdp.h
+++ b/include/configs/sh7763rdp.h
@@ -56,7 +56,7 @@
 #define CONFIG_SYS_MAX_FLASH_BANKS (1)
 #define CONFIG_SYS_MAX_FLASH_SECT  (520)
 
-/* U-boot setting */
+/* U-Boot setting */
 #define CONFIG_SYS_LOAD_ADDR		(CONFIG_SYS_SDRAM_BASE + 4 * 1024 * 1024)
 #define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_FLASH_BASE)
 #define CONFIG_SYS_MONITOR_LEN		(128 * 1024)
diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index 2492f99269..b7ac402f98 100644
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -92,7 +92,7 @@
 
 #define CONFIG_SYS_INIT_SP_ADDR		0x02040000
 
-/* U-boot copy size from boot Media to DRAM.*/
+/* U-Boot copy size from boot Media to DRAM.*/
 #define	COPY_BL2_SIZE		0x80000
 #define BL2_START_OFFSET	((CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)/512)
 #define BL2_SIZE_BLOC_COUNT	(COPY_BL2_SIZE/512)
diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index d2630f4be1..a309448ecf 100644
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -12,7 +12,7 @@
  */
 
 
-/* U-boot Load Address */
+/* U-Boot Load Address */
 #define CONFIG_SYS_TEXT_BASE			0x00700000
 
 /* Ethernet driver configuration */
diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h
index f4213217bb..6db628a052 100644
--- a/include/configs/stv0991.h
+++ b/include/configs/stv0991.h
@@ -45,7 +45,7 @@
 #define CONFIG_SYS_INIT_RAM_ADDR		0x00190000
 #define CONFIG_SYS_INIT_SP_OFFSET		\
 	(CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
-/* U-boot Load Address */
+/* U-Boot Load Address */
 #define CONFIG_SYS_TEXT_BASE			0x00010000
 #define CONFIG_SYS_INIT_SP_ADDR			\
 	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
diff --git a/include/configs/tcm-bf518.h b/include/configs/tcm-bf518.h
index 1e74535b5c..0f4d959e67 100644
--- a/include/configs/tcm-bf518.h
+++ b/include/configs/tcm-bf518.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for Bluetechnix TCM-BF518 board
+ * U-Boot - Configuration file for Bluetechnix TCM-BF518 board
  */
 
 #ifndef __CONFIG_TCM_BF518_H__
diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h
index a8947c5934..fc98d242fb 100644
--- a/include/configs/tcm-bf537.h
+++ b/include/configs/tcm-bf537.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for TCM-BF537 board
+ * U-Boot - Configuration file for TCM-BF537 board
  */
 
 #ifndef __CONFIG_TCM_BF537_H__
diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h
index 2f6c97cf58..50e1abb0e5 100644
--- a/include/configs/ts4800.h
+++ b/include/configs/ts4800.h
@@ -20,7 +20,7 @@
 #define CONFIG_DISPLAY_BOARDINFO
 
 #define CONFIG_SYS_NO_FLASH		/* No NOR Flash */
-#define CONFIG_SKIP_LOWLEVEL_INIT	/* U-boot is a 2nd stage bootloader */
+#define CONFIG_SKIP_LOWLEVEL_INIT	/* U-Boot is a 2nd stage bootloader */
 
 #define CONFIG_HW_WATCHDOG
 
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 599b26959e..bf89a0e070 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-/* U-boot - Common settings for UniPhier Family */
+/* U-Boot - Common settings for UniPhier Family */
 
 #ifndef __CONFIG_UNIPHIER_COMMON_H__
 #define __CONFIG_UNIPHIER_COMMON_H__
diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index 814934aa92..133041bca5 100644
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -24,7 +24,7 @@
 #define CONFIG_SYS_ICACHE_OFF
 
 #define CONFIG_IDENT_STRING		" vexpress_aemv8a"
-#define CONFIG_BOOTP_VCI_STRING		"U-boot.armv8.vexpress_aemv8a"
+#define CONFIG_BOOTP_VCI_STRING		"U-Boot.armv8.vexpress_aemv8a"
 
 /* Link Definitions */
 #if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \
diff --git a/include/configs/vexpress_ca15_tc2.h b/include/configs/vexpress_ca15_tc2.h
index 59b6310b57..883e58e660 100644
--- a/include/configs/vexpress_ca15_tc2.h
+++ b/include/configs/vexpress_ca15_tc2.h
@@ -12,7 +12,7 @@
 #define __VEXPRESS_CA15X2_TC2_h
 
 #define CONFIG_VEXPRESS_EXTENDED_MEMORY_MAP
-#define CONFIG_BOOTP_VCI_STRING     "U-boot.armv7.vexpress_ca15x2_tc2"
+#define CONFIG_BOOTP_VCI_STRING     "U-Boot.armv7.vexpress_ca15x2_tc2"
 #include "vexpress_common.h"
 
 #define CONFIG_SYSFLAGS_ADDR	0x1c010030
diff --git a/include/configs/vexpress_ca5x2.h b/include/configs/vexpress_ca5x2.h
index a4ffdf54db..43850272a6 100644
--- a/include/configs/vexpress_ca5x2.h
+++ b/include/configs/vexpress_ca5x2.h
@@ -12,7 +12,7 @@
 #define __VEXPRESS_CA5X2_h
 
 #define CONFIG_VEXPRESS_EXTENDED_MEMORY_MAP
-#define CONFIG_BOOTP_VCI_STRING     "U-boot.armv7.vexpress_ca5x2"
+#define CONFIG_BOOTP_VCI_STRING     "U-Boot.armv7.vexpress_ca5x2"
 #include "vexpress_common.h"
 
 #endif /* __VEXPRESS_CA5X2_h */
diff --git a/include/configs/vexpress_ca9x4.h b/include/configs/vexpress_ca9x4.h
index 71233d8c3f..99be50a5bd 100644
--- a/include/configs/vexpress_ca9x4.h
+++ b/include/configs/vexpress_ca9x4.h
@@ -12,7 +12,7 @@
 #define __VEXPRESS_CA9X4_H
 
 #define CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP
-#define CONFIG_BOOTP_VCI_STRING     "U-boot.armv7.vexpress_ca9x4"
+#define CONFIG_BOOTP_VCI_STRING     "U-Boot.armv7.vexpress_ca9x4"
 #include "vexpress_common.h"
 
 #endif /* VEXPRESS_CA9X4_H */