diff --git a/README b/README
index c7c9e0a..83d2874 100644
--- a/README
+++ b/README
@@ -460,7 +460,7 @@
 
 		CONFIG_SYS_CPC_REINIT_F
 		This CONFIG is defined when the CPC is configured as SRAM at the
-		time of U-boot entry and is required to be re-initialized.
+		time of U-Boot entry and is required to be re-initialized.
 
 		CONFIG_DEEP_SLEEP
 		Indicates this SoC supports deep sleep feature. If deep sleep is
@@ -2963,7 +2963,7 @@
 - Parallel Flash support:
 		CONFIG_SYS_NO_FLASH
 
-		Traditionally U-boot was run on systems with parallel NOR
+		Traditionally U-Boot was run on systems with parallel NOR
 		flash. This option is used to disable support for parallel NOR
 		flash. This option should be defined if the board does not have
 		parallel flash.
diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c b/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c
index bee9318..085649e 100644
--- a/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c
+++ b/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c
@@ -46,7 +46,7 @@
 int arch_cpu_init(void)
 {
 	/*
-	 * It might be necessary to flush data cache, if U-boot is loaded
+	 * It might be necessary to flush data cache, if U-Boot is loaded
 	 * from kickstart bootloader, e.g. from S1L loader
 	 */
 	flush_dcache_all();
diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/lowlevel_init.S b/arch/arm/cpu/arm926ejs/lpc32xx/lowlevel_init.S
index 4b8053e..b21abc3 100644
--- a/arch/arm/cpu/arm926ejs/lpc32xx/lowlevel_init.S
+++ b/arch/arm/cpu/arm926ejs/lpc32xx/lowlevel_init.S
@@ -41,5 +41,5 @@
 	orr	r0, #0x00000004
 	str	r0, [r1]
 
-	/* Return to U-boot via saved link register */
+	/* Return to U-Boot via saved link register */
 	mov	pc, lr
diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S
index 31d1c9e..b7563ed 100644
--- a/arch/arm/cpu/armv7/nonsec_virt.S
+++ b/arch/arm/cpu/armv7/nonsec_virt.S
@@ -37,7 +37,7 @@
 
 /*
  * secure monitor handler
- * U-boot calls this "software interrupt" in start.S
+ * U-Boot calls this "software interrupt" in start.S
  * This is executed on a "smc" instruction, we use a "smc #0" to switch
  * to non-secure state.
  * r0, r1, r2: passed to the callee
diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig
index 4cd84b0..3d19bbf 100644
--- a/arch/arm/cpu/armv8/Kconfig
+++ b/arch/arm/cpu/armv8/Kconfig
@@ -1,6 +1,6 @@
 if ARM64
 
 config ARMV8_MULTIENTRY
-        boolean "Enable multiple CPUs to enter into U-boot"
+        boolean "Enable multiple CPUs to enter into U-Boot"
 
 endif
diff --git a/arch/arm/dts/uniphier-ph1-ld4-ref.dts b/arch/arm/dts/uniphier-ph1-ld4-ref.dts
index 469bd05..f62916d 100644
--- a/arch/arm/dts/uniphier-ph1-ld4-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-ld4-ref.dts
@@ -59,7 +59,7 @@
 	status = "okay";
 };
 
-/* for U-boot only */
+/* for U-Boot only */
 / {
 	soc {
 		u-boot,dm-pre-reloc;
diff --git a/arch/arm/dts/uniphier-ph1-ld6b-ref.dts b/arch/arm/dts/uniphier-ph1-ld6b-ref.dts
index e0a972f..dca408b 100644
--- a/arch/arm/dts/uniphier-ph1-ld6b-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-ld6b-ref.dts
@@ -61,7 +61,7 @@
 	status = "okay";
 };
 
-/* for U-boot only */
+/* for U-Boot only */
 / {
 	soc {
 		u-boot,dm-pre-reloc;
diff --git a/arch/arm/dts/uniphier-ph1-pro4-ref.dts b/arch/arm/dts/uniphier-ph1-pro4-ref.dts
index 02e74a7..202a642 100644
--- a/arch/arm/dts/uniphier-ph1-pro4-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-pro4-ref.dts
@@ -66,7 +66,7 @@
 	status = "okay";
 };
 
-/* for U-boot only */
+/* for U-Boot only */
 / {
 	soc {
 		u-boot,dm-pre-reloc;
diff --git a/arch/arm/dts/uniphier-ph1-pro5-4kbox.dts b/arch/arm/dts/uniphier-ph1-pro5-4kbox.dts
index d46e827..02a3362 100644
--- a/arch/arm/dts/uniphier-ph1-pro5-4kbox.dts
+++ b/arch/arm/dts/uniphier-ph1-pro5-4kbox.dts
@@ -47,7 +47,7 @@
 	status = "okay";
 };
 
-/* for U-boot only */
+/* for U-Boot only */
 / {
 	soc {
 		u-boot,dm-pre-reloc;
diff --git a/arch/arm/dts/uniphier-ph1-sld3-ref.dts b/arch/arm/dts/uniphier-ph1-sld3-ref.dts
index 1f3aee9..ff17945 100644
--- a/arch/arm/dts/uniphier-ph1-sld3-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-sld3-ref.dts
@@ -68,7 +68,7 @@
 	status = "okay";
 };
 
-/* for U-boot only */
+/* for U-Boot only */
 &serial0 {
        u-boot,dm-pre-reloc;
 };
diff --git a/arch/arm/dts/uniphier-ph1-sld8-ref.dts b/arch/arm/dts/uniphier-ph1-sld8-ref.dts
index b58bf07..b5b6f65 100644
--- a/arch/arm/dts/uniphier-ph1-sld8-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-sld8-ref.dts
@@ -63,7 +63,7 @@
 	status = "okay";
 };
 
-/* for U-boot only */
+/* for U-Boot only */
 / {
 	soc {
 		u-boot,dm-pre-reloc;
diff --git a/arch/arm/dts/uniphier-proxstream2-gentil.dts b/arch/arm/dts/uniphier-proxstream2-gentil.dts
index a49215e..c6c133a 100644
--- a/arch/arm/dts/uniphier-proxstream2-gentil.dts
+++ b/arch/arm/dts/uniphier-proxstream2-gentil.dts
@@ -49,7 +49,7 @@
 	status = "okay";
 };
 
-/* for U-boot only */
+/* for U-Boot only */
 / {
 	soc {
 		u-boot,dm-pre-reloc;
diff --git a/arch/arm/dts/uniphier-proxstream2-vodka.dts b/arch/arm/dts/uniphier-proxstream2-vodka.dts
index 63bd363..3703ad3 100644
--- a/arch/arm/dts/uniphier-proxstream2-vodka.dts
+++ b/arch/arm/dts/uniphier-proxstream2-vodka.dts
@@ -45,7 +45,7 @@
 	status = "okay";
 };
 
-/* for U-boot only */
+/* for U-Boot only */
 / {
 	soc {
 		u-boot,dm-pre-reloc;
diff --git a/arch/arm/mach-exynos/include/mach/spl.h b/arch/arm/mach-exynos/include/mach/spl.h
index 0c480ac..a5d13fa 100644
--- a/arch/arm/mach-exynos/include/mach/spl.h
+++ b/arch/arm/mach-exynos/include/mach/spl.h
@@ -42,10 +42,10 @@
 	u32		mem_iv_size;	/* Memory channel interleaving size */
 	enum ddr_mode	mem_type;	/* Type of on-board memory */
 	/*
-	 * U-boot size - The iROM mmc copy function used by the SPL takes a
-	 * block count paramter to describe the u-boot size unlike the spi
-	 * boot copy function which just uses the u-boot size directly. Align
-	 * the u-boot size to block size (512 bytes) when populating the SPL
+	 * U-Boot size - The iROM mmc copy function used by the SPL takes a
+	 * block count paramter to describe the U-Boot size unlike the spi
+	 * boot copy function which just uses the U-Boot size directly. Align
+	 * the U-Boot size to block size (512 bytes) when populating the SPL
 	 * table only for mmc boot.
 	 */
 	u32		uboot_size;
diff --git a/arch/arm/mach-exynos/sec_boot.S b/arch/arm/mach-exynos/sec_boot.S
index dfc3455..5dc216d 100644
--- a/arch/arm/mach-exynos/sec_boot.S
+++ b/arch/arm/mach-exynos/sec_boot.S
@@ -30,10 +30,10 @@
  * because that comes out to be the last 4KB of the iRAM
  * (Base Address - 0x02020000, Limit Address - 0x020740000).
  *
- * U-boot and kernel are aware of this code and flags by the simple
+ * U-Boot and kernel are aware of this code and flags by the simple
  * fact that we are implementing a workaround in the last 4KB
  * of the iRAM and we have already defined these flag and address
- * values in both kernel and U-boot for our use.
+ * values in both kernel and U-Boot for our use.
  */
 code_base:
 	b	 1f
diff --git a/arch/arm/mach-exynos/spl_boot.c b/arch/arm/mach-exynos/spl_boot.c
index c7f943e..7df0102 100644
--- a/arch/arm/mach-exynos/spl_boot.c
+++ b/arch/arm/mach-exynos/spl_boot.c
@@ -177,7 +177,7 @@
 #endif
 
 /*
-* Copy U-boot from mmc to RAM:
+* Copy U-Boot from mmc to RAM:
 * COPY_BL2_FNPTR_ADDR: Address in iRAM, which Contains
 * Pointer to API (Data transfer from mmc to ram)
 */
diff --git a/arch/arm/mach-orion5x/lowlevel_init.S b/arch/arm/mach-orion5x/lowlevel_init.S
index 51a8b3c..3f38f36 100644
--- a/arch/arm/mach-orion5x/lowlevel_init.S
+++ b/arch/arm/mach-orion5x/lowlevel_init.S
@@ -283,5 +283,5 @@
 
 #endif /* CONFIG_SPL_BUILD */
 
-	/* Return to U-boot via saved link register */
+	/* Return to U-Boot via saved link register */
 	mov	pc, lr
diff --git a/arch/blackfin/cpu/Makefile b/arch/blackfin/cpu/Makefile
index 7cd0bbf..7ba5f1b 100644
--- a/arch/blackfin/cpu/Makefile
+++ b/arch/blackfin/cpu/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2008 Analog Device Inc.
 #
diff --git a/arch/blackfin/cpu/cpu.c b/arch/blackfin/cpu/cpu.c
index 91aa5cc..529322a 100644
--- a/arch/blackfin/cpu/cpu.c
+++ b/arch/blackfin/cpu/cpu.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - cpu.c CPU specific functions
+ * U-Boot - cpu.c CPU specific functions
  *
  * Copyright (c) 2005-2008 Analog Devices Inc.
  *
diff --git a/arch/blackfin/cpu/cpu.h b/arch/blackfin/cpu/cpu.h
index f6aa1b6..a5fe02e 100644
--- a/arch/blackfin/cpu/cpu.h
+++ b/arch/blackfin/cpu/cpu.h
@@ -1,5 +1,5 @@
 /*
- *  U-boot - cpu.h
+ *  U-Boot - cpu.h
  *
  *  Copyright (c) 2005-2007 Analog Devices Inc.
  *
diff --git a/arch/blackfin/cpu/interrupts.c b/arch/blackfin/cpu/interrupts.c
index 9189816..45c92c3 100644
--- a/arch/blackfin/cpu/interrupts.c
+++ b/arch/blackfin/cpu/interrupts.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - interrupts.c Interrupt related routines
+ * U-Boot - interrupts.c Interrupt related routines
  *
  * Copyright (c) 2005-2008 Analog Devices Inc.
  *
diff --git a/arch/blackfin/cpu/start.S b/arch/blackfin/cpu/start.S
index f31abfa..823a1df 100644
--- a/arch/blackfin/cpu/start.S
+++ b/arch/blackfin/cpu/start.S
@@ -1,5 +1,5 @@
 /*
- * U-boot - start.S Startup file for Blackfin u-boot
+ * U-Boot - start.S Startup file for Blackfin U-Boot
  *
  * Copyright (c) 2005-2008 Analog Devices Inc.
  *
@@ -51,7 +51,7 @@
 #ifdef CONFIG_HW_WATCHDOG
 	/* Program the watchdog with default timeout of ~5 seconds.
 	 * That should be long enough to bootstrap ourselves up and
-	 * then the common u-boot code can take over.
+	 * then the common U-Boot code can take over.
 	 */
 	r1 = WDDIS;
 # ifdef __ADSPBF60x__
diff --git a/arch/blackfin/cpu/traps.c b/arch/blackfin/cpu/traps.c
index 10f72f8..21760d0 100644
--- a/arch/blackfin/cpu/traps.c
+++ b/arch/blackfin/cpu/traps.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - traps.c Routines related to interrupts and exceptions
+ * U-Boot - traps.c Routines related to interrupts and exceptions
  *
  * Copyright (c) 2005-2008 Analog Devices Inc.
  *
diff --git a/arch/blackfin/cpu/u-boot.lds b/arch/blackfin/cpu/u-boot.lds
index ae1b813..f407fb2 100644
--- a/arch/blackfin/cpu/u-boot.lds
+++ b/arch/blackfin/cpu/u-boot.lds
@@ -1,5 +1,5 @@
 /*
- * U-boot - u-boot.lds.S
+ * U-Boot - u-boot.lds.S
  *
  * Copyright (c) 2005-2010 Analog Device Inc.
  *
diff --git a/arch/blackfin/include/asm/bitops.h b/arch/blackfin/include/asm/bitops.h
index 6cde6db..a1462bd 100644
--- a/arch/blackfin/include/asm/bitops.h
+++ b/arch/blackfin/include/asm/bitops.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - bitops.h Routines for bit operations
+ * U-Boot - bitops.h Routines for bit operations
  *
  * Copyright (c) 2005-2007 Analog Devices Inc.
  *
diff --git a/arch/blackfin/include/asm/blackfin_local.h b/arch/blackfin/include/asm/blackfin_local.h
index 868c82e..00556de 100644
--- a/arch/blackfin/include/asm/blackfin_local.h
+++ b/arch/blackfin/include/asm/blackfin_local.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - blackfin_local.h
+ * U-Boot - blackfin_local.h
  *
  * Copyright (c) 2005-2007 Analog Devices Inc.
  *
diff --git a/arch/blackfin/include/asm/byteorder.h b/arch/blackfin/include/asm/byteorder.h
index 98fb7bf..593ba5a 100644
--- a/arch/blackfin/include/asm/byteorder.h
+++ b/arch/blackfin/include/asm/byteorder.h
@@ -1,5 +1,5 @@
 /*
- * U-boot -  byteorder.h
+ * U-Boot -  byteorder.h
  *
  * Copyright (c) 2005-2007 Analog Devices Inc.
  *
diff --git a/arch/blackfin/include/asm/deferred.h b/arch/blackfin/include/asm/deferred.h
index 82ceda3..e75d7e8 100644
--- a/arch/blackfin/include/asm/deferred.h
+++ b/arch/blackfin/include/asm/deferred.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - deferred register layout
+ * U-Boot - deferred register layout
  *
  * Copyright 2004-2009 Analog Devices Inc.
  *
diff --git a/arch/blackfin/include/asm/delay.h b/arch/blackfin/include/asm/delay.h
index f146efd..06c3edd 100644
--- a/arch/blackfin/include/asm/delay.h
+++ b/arch/blackfin/include/asm/delay.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - delay.h Routines for introducing delays
+ * U-Boot - delay.h Routines for introducing delays
  *
  * Copyright (c) 2005-2007 Analog Devices Inc.
  *
diff --git a/arch/blackfin/include/asm/global_data.h b/arch/blackfin/include/asm/global_data.h
index 7aefead..69a6971 100644
--- a/arch/blackfin/include/asm/global_data.h
+++ b/arch/blackfin/include/asm/global_data.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - global_data.h Declarations for global data of u-boot
+ * U-Boot - global_data.h Declarations for global data of U-Boot
  *
  * Copyright (c) 2005-2007 Analog Devices Inc.
  *
diff --git a/arch/blackfin/include/asm/io.h b/arch/blackfin/include/asm/io.h
index aadb0d2..d3337e4 100644
--- a/arch/blackfin/include/asm/io.h
+++ b/arch/blackfin/include/asm/io.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - io.h IO routines
+ * U-Boot - io.h IO routines
  *
  * Copyright 2004-2009 Analog Devices Inc.
  *
diff --git a/arch/blackfin/include/asm/linkage.h b/arch/blackfin/include/asm/linkage.h
index 7e06bc7..60d5317 100644
--- a/arch/blackfin/include/asm/linkage.h
+++ b/arch/blackfin/include/asm/linkage.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - linkage.h
+ * U-Boot - linkage.h
  *
  * Copyright (c) 2005-2007 Analog Devices Inc.
  *
diff --git a/arch/blackfin/include/asm/posix_types.h b/arch/blackfin/include/asm/posix_types.h
index 18be579..8535235 100644
--- a/arch/blackfin/include/asm/posix_types.h
+++ b/arch/blackfin/include/asm/posix_types.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - posix_types.h
+ * U-Boot - posix_types.h
  *
  * Copyright (c) 2005-2007 Analog Devices Inc.
  *
diff --git a/arch/blackfin/include/asm/processor.h b/arch/blackfin/include/asm/processor.h
index b798006..1daf59b 100644
--- a/arch/blackfin/include/asm/processor.h
+++ b/arch/blackfin/include/asm/processor.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - processor.h
+ * U-Boot - processor.h
  *
  * Copyright (c) 2005-2007 Analog Devices Inc.
  *
diff --git a/arch/blackfin/include/asm/shared_resources.h b/arch/blackfin/include/asm/shared_resources.h
index 1a03392..42dab9f 100644
--- a/arch/blackfin/include/asm/shared_resources.h
+++ b/arch/blackfin/include/asm/shared_resources.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - setup.h
+ * U-Boot - setup.h
  *
  * Copyright (c) 2005-2007 Analog Devices Inc.
  *
diff --git a/arch/blackfin/include/asm/soft_switch.h b/arch/blackfin/include/asm/soft_switch.h
index ff8e44d..321b070 100644
--- a/arch/blackfin/include/asm/soft_switch.h
+++ b/arch/blackfin/include/asm/soft_switch.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2008-2012 Analog Devices Inc.
  *
diff --git a/arch/blackfin/include/asm/string.h b/arch/blackfin/include/asm/string.h
index aea4e29..15f50f2 100644
--- a/arch/blackfin/include/asm/string.h
+++ b/arch/blackfin/include/asm/string.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - string.h String functions
+ * U-Boot - string.h String functions
  *
  * Copyright (c) 2005-2007 Analog Devices Inc.
  *
diff --git a/arch/blackfin/include/asm/system.h b/arch/blackfin/include/asm/system.h
index 5a7e8ed..f0c4ae2 100644
--- a/arch/blackfin/include/asm/system.h
+++ b/arch/blackfin/include/asm/system.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - system.h
+ * U-Boot - system.h
  *
  * Copyright (c) 2005-2007 Analog Devices Inc.
  *
diff --git a/arch/blackfin/include/asm/types.h b/arch/blackfin/include/asm/types.h
index 92124f1..4da64c4 100644
--- a/arch/blackfin/include/asm/types.h
+++ b/arch/blackfin/include/asm/types.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - types.h
+ * U-Boot - types.h
  *
  * Copyright (c) 2005-2007 Analog Devices Inc.
  *
diff --git a/arch/blackfin/include/asm/u-boot.h b/arch/blackfin/include/asm/u-boot.h
index 7b5cf6a..1ada44e 100644
--- a/arch/blackfin/include/asm/u-boot.h
+++ b/arch/blackfin/include/asm/u-boot.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - u-boot.h Structure declarations for board specific data
+ * U-Boot - u-boot.h Structure declarations for board specific data
  *
  * Copyright (c) 2005-2007 Analog Devices Inc.
  *
diff --git a/arch/blackfin/lib/Makefile b/arch/blackfin/lib/Makefile
index b534a98..de02c69 100644
--- a/arch/blackfin/lib/Makefile
+++ b/arch/blackfin/lib/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot Makefile
+# U-Boot Makefile
 #
 # Copyright (c) 2005-2008 Analog Devices Inc.
 #
diff --git a/arch/blackfin/lib/boot.c b/arch/blackfin/lib/boot.c
index 5644d58..fd4c82e 100644
--- a/arch/blackfin/lib/boot.c
+++ b/arch/blackfin/lib/boot.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - boot.c - misc boot helper functions
+ * U-Boot - boot.c - misc boot helper functions
  *
  * Copyright (c) 2005-2008 Analog Devices Inc.
  *
diff --git a/arch/blackfin/lib/cache.c b/arch/blackfin/lib/cache.c
index e8a0cb5..8d93339 100644
--- a/arch/blackfin/lib/cache.c
+++ b/arch/blackfin/lib/cache.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - cache.c
+ * U-Boot - cache.c
  *
  * Copyright (c) 2005-2008 Analog Devices Inc.
  *
diff --git a/arch/blackfin/lib/cmd_cache_dump.c b/arch/blackfin/lib/cmd_cache_dump.c
index f9f9097..a4c799a 100644
--- a/arch/blackfin/lib/cmd_cache_dump.c
+++ b/arch/blackfin/lib/cmd_cache_dump.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - cmd_cache_dump.c
+ * U-Boot - cmd_cache_dump.c
  *
  * Copyright (c) 2007-2008 Analog Devices Inc.
  *
diff --git a/arch/blackfin/lib/kgdb.c b/arch/blackfin/lib/kgdb.c
index 4ca3fc7..2a7c072 100644
--- a/arch/blackfin/lib/kgdb.c
+++ b/arch/blackfin/lib/kgdb.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - architecture specific kgdb code
+ * U-Boot - architecture specific kgdb code
  *
  * Copyright 2009 Analog Devices Inc.
  *
diff --git a/arch/blackfin/lib/muldi3.c b/arch/blackfin/lib/muldi3.c
index 65f5523..9f6f60d 100644
--- a/arch/blackfin/lib/muldi3.c
+++ b/arch/blackfin/lib/muldi3.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - muldi3.c contains routines for mult and div
+ * U-Boot - muldi3.c contains routines for mult and div
  *
  * Copyright (c) 2005-2007 Analog Devices Inc.
  *
diff --git a/arch/blackfin/lib/sections.c b/arch/blackfin/lib/sections.c
index b50f30a..86fc4df 100644
--- a/arch/blackfin/lib/sections.c
+++ b/arch/blackfin/lib/sections.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - section.c
+ * U-Boot - section.c
  *
  * Copyright (c) 2014 Analog Devices Inc.
  *
diff --git a/arch/blackfin/lib/string.c b/arch/blackfin/lib/string.c
index 211df7b..c904a88 100644
--- a/arch/blackfin/lib/string.c
+++ b/arch/blackfin/lib/string.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - string.c Contains library routines.
+ * U-Boot - string.c Contains library routines.
  *
  * Copyright (c) 2005-2008 Analog Devices Inc.
  *
diff --git a/arch/microblaze/lib/muldi3.c b/arch/microblaze/lib/muldi3.c
index 5c1a154..95b6b32 100644
--- a/arch/microblaze/lib/muldi3.c
+++ b/arch/microblaze/lib/muldi3.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - muldi3.c contains routines for mult and div
+ * U-Boot - muldi3.c contains routines for mult and div
  *
  *
  * SPDX-License-Identifier:	GPL-2.0+
diff --git a/arch/mips/cpu/start.S b/arch/mips/cpu/start.S
index d2c31ae..1b56ca3 100644
--- a/arch/mips/cpu/start.S
+++ b/arch/mips/cpu/start.S
@@ -57,7 +57,7 @@
 	.set noreorder
 
 ENTRY(_start)
-	/* U-boot entry point */
+	/* U-Boot entry point */
 	b	reset
 	 nop
 
diff --git a/arch/nds32/include/asm/linkage.h b/arch/nds32/include/asm/linkage.h
index 7e06bc7..60d5317 100644
--- a/arch/nds32/include/asm/linkage.h
+++ b/arch/nds32/include/asm/linkage.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - linkage.h
+ * U-Boot - linkage.h
  *
  * Copyright (c) 2005-2007 Analog Devices Inc.
  *
diff --git a/arch/powerpc/cpu/mpc85xx/p5040_serdes.c b/arch/powerpc/cpu/mpc85xx/p5040_serdes.c
index 2655974..577b6d9 100644
--- a/arch/powerpc/cpu/mpc85xx/p5040_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/p5040_serdes.c
@@ -12,7 +12,7 @@
 
 /*
  * Note: For P5040, the fourth SerDes bank (with two lanes) is on SerDes2, but
- * U-boot only supports one SerDes controller.  Therefore, we ignore bank 4 in
+ * U-Boot only supports one SerDes controller.  Therefore, we ignore bank 4 in
  * this table.  This works because most of the SerDes code is for errata
  * work-arounds, and there are no P5040 errata that effect bank 4.
  */
diff --git a/arch/sparc/include/asm/u-boot.h b/arch/sparc/include/asm/u-boot.h
index 9b9a71d5..75ac7dc 100644
--- a/arch/sparc/include/asm/u-boot.h
+++ b/arch/sparc/include/asm/u-boot.h
@@ -13,7 +13,7 @@
 
 /* Currently, this board information is not passed to
  * Linux kernel from U-Boot, but may be passed to other
- * Operating systems. This is because U-boot emulates
+ * Operating systems. This is because U-Boot emulates
  * a SUN PROM loader (from Linux point of view).
  */
 #include <asm-generic/u-boot.h>
diff --git a/arch/sparc/include/asm/winmacro.h b/arch/sparc/include/asm/winmacro.h
index 4f68fbd..916ee9c 100644
--- a/arch/sparc/include/asm/winmacro.h
+++ b/arch/sparc/include/asm/winmacro.h
@@ -1,5 +1,5 @@
 /*
- * Added to U-boot,
+ * Added to U-Boot,
  * Daniel Hellstrom, Gaisler Research, daniel@gaisler.com
  * Copyright (C) 2007
  *
diff --git a/arch/x86/cpu/resetvec.S b/arch/x86/cpu/resetvec.S
index 68a5b94..183275b 100644
--- a/arch/x86/cpu/resetvec.S
+++ b/arch/x86/cpu/resetvec.S
@@ -1,5 +1,5 @@
 /*
- *  U-boot - x86 Startup Code
+ *  U-Boot - x86 Startup Code
  *
  * (C) Copyright 2002
  * Daniel Engström, Omicron Ceti AB, <daniel@omicron.se>
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
index f441c84..783be69 100644
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -162,7 +162,7 @@
 		* boot_params structure, and then jump to the kernel. We
 		* assume that %cs is 0x10, 4GB flat, and read/execute, and
 		* the data segments are 0x18, 4GB flat, and read/write.
-		* U-boot is setting them up that way for itself in
+		* U-Boot is setting them up that way for itself in
 		* arch/i386/cpu/cpu.c.
 		*
 		* Note that we cannot currently boot a kernel while running as
diff --git a/board/bct-brettl2/Makefile b/board/bct-brettl2/Makefile
index 12154b6..28fccc0 100644
--- a/board/bct-brettl2/Makefile
+++ b/board/bct-brettl2/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2008 Analog Device Inc.
 #
diff --git a/board/bct-brettl2/bct-brettl2.c b/board/bct-brettl2/bct-brettl2.c
index bf7cd62..adb8605 100644
--- a/board/bct-brettl2/bct-brettl2.c
+++ b/board/bct-brettl2/bct-brettl2.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file for BCT brettl2
+ * U-Boot - main board file for BCT brettl2
  *
  * Copyright (c) 2010 BCT Electronic GmbH
  *
diff --git a/board/bf506f-ezkit/Makefile b/board/bf506f-ezkit/Makefile
index 0f134f9..7efe1bc 100644
--- a/board/bf506f-ezkit/Makefile
+++ b/board/bf506f-ezkit/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2008 Analog Device Inc.
 #
diff --git a/board/bf506f-ezkit/bf506f-ezkit.c b/board/bf506f-ezkit/bf506f-ezkit.c
index 638500d..77e40ae 100644
--- a/board/bf506f-ezkit/bf506f-ezkit.c
+++ b/board/bf506f-ezkit/bf506f-ezkit.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2008-2010 Analog Devices Inc.
  *
diff --git a/board/bf518f-ezbrd/Makefile b/board/bf518f-ezbrd/Makefile
index 3a6abaa..e9e23ed 100644
--- a/board/bf518f-ezbrd/Makefile
+++ b/board/bf518f-ezbrd/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2008 Analog Device Inc.
 #
diff --git a/board/bf518f-ezbrd/bf518f-ezbrd.c b/board/bf518f-ezbrd/bf518f-ezbrd.c
index bf4a7db..a14e509 100644
--- a/board/bf518f-ezbrd/bf518f-ezbrd.c
+++ b/board/bf518f-ezbrd/bf518f-ezbrd.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2008-2009 Analog Devices Inc.
  *
diff --git a/board/bf525-ucr2/Makefile b/board/bf525-ucr2/Makefile
index 8de71a1..1be1d31 100644
--- a/board/bf525-ucr2/Makefile
+++ b/board/bf525-ucr2/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2008 Analog Device Inc.
 #
diff --git a/board/bf525-ucr2/bf525-ucr2.c b/board/bf525-ucr2/bf525-ucr2.c
index 3e6df1f..36a725c 100644
--- a/board/bf525-ucr2/bf525-ucr2.c
+++ b/board/bf525-ucr2/bf525-ucr2.c
@@ -1,4 +1,4 @@
-/* U-boot - bf525-ucr2.c  board specific routines
+/* U-Boot - bf525-ucr2.c  board specific routines
  *
  * (C) Copyright 2000-2004
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
diff --git a/board/bf526-ezbrd/Makefile b/board/bf526-ezbrd/Makefile
index 34ac563..c4882c9 100644
--- a/board/bf526-ezbrd/Makefile
+++ b/board/bf526-ezbrd/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2008 Analog Device Inc.
 #
diff --git a/board/bf526-ezbrd/bf526-ezbrd.c b/board/bf526-ezbrd/bf526-ezbrd.c
index db1ee28..a506d1b 100644
--- a/board/bf526-ezbrd/bf526-ezbrd.c
+++ b/board/bf526-ezbrd/bf526-ezbrd.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2005-2009 Analog Devices Inc.
  *
diff --git a/board/bf527-ad7160-eval/Makefile b/board/bf527-ad7160-eval/Makefile
index 9d8ecf1..c225f72 100644
--- a/board/bf527-ad7160-eval/Makefile
+++ b/board/bf527-ad7160-eval/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2008 Analog Device Inc.
 #
diff --git a/board/bf527-ad7160-eval/bf527-ad7160-eval.c b/board/bf527-ad7160-eval/bf527-ad7160-eval.c
index ea405b6..9180630 100644
--- a/board/bf527-ad7160-eval/bf527-ad7160-eval.c
+++ b/board/bf527-ad7160-eval/bf527-ad7160-eval.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2010 Analog Devices Inc.
  *
diff --git a/board/bf527-ezkit/Makefile b/board/bf527-ezkit/Makefile
index cedd821..53ec9e7 100644
--- a/board/bf527-ezkit/Makefile
+++ b/board/bf527-ezkit/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2008 Analog Device Inc.
 #
diff --git a/board/bf527-ezkit/bf527-ezkit.c b/board/bf527-ezkit/bf527-ezkit.c
index b551d4e..c4f58fa 100644
--- a/board/bf527-ezkit/bf527-ezkit.c
+++ b/board/bf527-ezkit/bf527-ezkit.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2005-2009 Analog Devices Inc.
  *
diff --git a/board/bf527-sdp/Makefile b/board/bf527-sdp/Makefile
index 1ddb026..77acb42 100644
--- a/board/bf527-sdp/Makefile
+++ b/board/bf527-sdp/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2008 Analog Device Inc.
 #
diff --git a/board/bf527-sdp/bf527-sdp.c b/board/bf527-sdp/bf527-sdp.c
index 504869d..0c6094b 100644
--- a/board/bf527-sdp/bf527-sdp.c
+++ b/board/bf527-sdp/bf527-sdp.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2010 Analog Devices Inc.
  *
diff --git a/board/bf533-ezkit/Makefile b/board/bf533-ezkit/Makefile
index 6838cf0..bf7a2c4 100644
--- a/board/bf533-ezkit/Makefile
+++ b/board/bf533-ezkit/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2007 Analog Device Inc.
 #
diff --git a/board/bf533-ezkit/bf533-ezkit.c b/board/bf533-ezkit/bf533-ezkit.c
index 81e390c..6879319 100644
--- a/board/bf533-ezkit/bf533-ezkit.c
+++ b/board/bf533-ezkit/bf533-ezkit.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2005-2008 Analog Devices Inc.
  *
diff --git a/board/bf533-ezkit/flash-defines.h b/board/bf533-ezkit/flash-defines.h
index fa32203..7822a9d 100644
--- a/board/bf533-ezkit/flash-defines.h
+++ b/board/bf533-ezkit/flash-defines.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - flash-defines.h
+ * U-Boot - flash-defines.h
  *
  * Copyright (c) 2005-2007 Analog Devices Inc.
  *
diff --git a/board/bf533-ezkit/flash.c b/board/bf533-ezkit/flash.c
index fd06b31..3180a76 100644
--- a/board/bf533-ezkit/flash.c
+++ b/board/bf533-ezkit/flash.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - flash.c Flash driver for PSD4256GV
+ * U-Boot - flash.c Flash driver for PSD4256GV
  *
  * Copyright (c) 2005-2007 Analog Devices Inc.
  * This file is based on BF533EzFlash.c originally written by Analog Devices, Inc.
diff --git a/board/bf533-ezkit/psd4256.h b/board/bf533-ezkit/psd4256.h
index 56c6442..9256696 100644
--- a/board/bf533-ezkit/psd4256.h
+++ b/board/bf533-ezkit/psd4256.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - psd4256.h
+ * U-Boot - psd4256.h
  *
  * Copyright (c) 2005-2007 Analog Devices Inc.
  *
diff --git a/board/bf533-stamp/Makefile b/board/bf533-stamp/Makefile
index 244f9e0..041c98e 100644
--- a/board/bf533-stamp/Makefile
+++ b/board/bf533-stamp/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2008 Analog Device Inc.
 #
diff --git a/board/bf533-stamp/bf533-stamp.c b/board/bf533-stamp/bf533-stamp.c
index 585f5f1..eb000a6 100644
--- a/board/bf533-stamp/bf533-stamp.c
+++ b/board/bf533-stamp/bf533-stamp.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2005-2008 Analog Devices Inc.
  *
diff --git a/board/bf537-minotaur/Makefile b/board/bf537-minotaur/Makefile
index 66d2f05..13ed8bf 100644
--- a/board/bf537-minotaur/Makefile
+++ b/board/bf537-minotaur/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2008 Analog Device Inc.
 #
diff --git a/board/bf537-minotaur/bf537-minotaur.c b/board/bf537-minotaur/bf537-minotaur.c
index 9312216..34750ec 100644
--- a/board/bf537-minotaur/bf537-minotaur.c
+++ b/board/bf537-minotaur/bf537-minotaur.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2005-2009 Analog Devices Inc.
  *
diff --git a/board/bf537-pnav/Makefile b/board/bf537-pnav/Makefile
index ffcdf1f..f7af8cd 100644
--- a/board/bf537-pnav/Makefile
+++ b/board/bf537-pnav/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2008 Analog Device Inc.
 #
diff --git a/board/bf537-pnav/bf537-pnav.c b/board/bf537-pnav/bf537-pnav.c
index 6739fe1..c3b06f0 100644
--- a/board/bf537-pnav/bf537-pnav.c
+++ b/board/bf537-pnav/bf537-pnav.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2005-2009 Analog Devices Inc.
  *
diff --git a/board/bf537-srv1/Makefile b/board/bf537-srv1/Makefile
index cd0da27..1815fc5 100644
--- a/board/bf537-srv1/Makefile
+++ b/board/bf537-srv1/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2008 Analog Device Inc.
 #
diff --git a/board/bf537-srv1/bf537-srv1.c b/board/bf537-srv1/bf537-srv1.c
index b0ffe1a..fc22c07 100644
--- a/board/bf537-srv1/bf537-srv1.c
+++ b/board/bf537-srv1/bf537-srv1.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2005-2009 Analog Devices Inc.
  *
diff --git a/board/bf537-stamp/Makefile b/board/bf537-stamp/Makefile
index 234119a..4008e3a 100644
--- a/board/bf537-stamp/Makefile
+++ b/board/bf537-stamp/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2007 Analog Device Inc.
 #
diff --git a/board/bf537-stamp/bf537-stamp.c b/board/bf537-stamp/bf537-stamp.c
index 85d41d0..9b9daf4 100644
--- a/board/bf537-stamp/bf537-stamp.c
+++ b/board/bf537-stamp/bf537-stamp.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2005-2008 Analog Devices Inc.
  *
diff --git a/board/bf538f-ezkit/Makefile b/board/bf538f-ezkit/Makefile
index 7c8cda0..eb1703e 100644
--- a/board/bf538f-ezkit/Makefile
+++ b/board/bf538f-ezkit/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2008 Analog Device Inc.
 #
diff --git a/board/bf538f-ezkit/bf538f-ezkit.c b/board/bf538f-ezkit/bf538f-ezkit.c
index 49d30e7..2dd4c0c 100644
--- a/board/bf538f-ezkit/bf538f-ezkit.c
+++ b/board/bf538f-ezkit/bf538f-ezkit.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2008 Analog Devices Inc.
  *
diff --git a/board/bf548-ezkit/Makefile b/board/bf548-ezkit/Makefile
index 6f4200b..e4d0caa 100644
--- a/board/bf548-ezkit/Makefile
+++ b/board/bf548-ezkit/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2008 Analog Device Inc.
 #
diff --git a/board/bf548-ezkit/bf548-ezkit.c b/board/bf548-ezkit/bf548-ezkit.c
index cb9ee86..31d6eee 100644
--- a/board/bf548-ezkit/bf548-ezkit.c
+++ b/board/bf548-ezkit/bf548-ezkit.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2005-2008 Analog Devices Inc.
  *
diff --git a/board/bf561-acvilon/Makefile b/board/bf561-acvilon/Makefile
index 48bec28..08e2fad 100644
--- a/board/bf561-acvilon/Makefile
+++ b/board/bf561-acvilon/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2007 Analog Device Inc.
 #
diff --git a/board/bf561-ezkit/Makefile b/board/bf561-ezkit/Makefile
index 23c7101..3d534d2 100644
--- a/board/bf561-ezkit/Makefile
+++ b/board/bf561-ezkit/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2007 Analog Device Inc.
 #
diff --git a/board/bf561-ezkit/bf561-ezkit.c b/board/bf561-ezkit/bf561-ezkit.c
index 8441838..534c39c 100644
--- a/board/bf561-ezkit/bf561-ezkit.c
+++ b/board/bf561-ezkit/bf561-ezkit.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2005-2008 Analog Devices Inc.
  *
diff --git a/board/bf609-ezkit/Makefile b/board/bf609-ezkit/Makefile
index 3bfd088..e4184ee 100644
--- a/board/bf609-ezkit/Makefile
+++ b/board/bf609-ezkit/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2008 Analog Device Inc.
 #
diff --git a/board/bf609-ezkit/bf609-ezkit.c b/board/bf609-ezkit/bf609-ezkit.c
index 86da028..c993ca6 100644
--- a/board/bf609-ezkit/bf609-ezkit.c
+++ b/board/bf609-ezkit/bf609-ezkit.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2008-2011 Analog Devices Inc.
  *
diff --git a/board/bf609-ezkit/soft_switch.c b/board/bf609-ezkit/soft_switch.c
index e0c8d93..7c117ea 100644
--- a/board/bf609-ezkit/soft_switch.c
+++ b/board/bf609-ezkit/soft_switch.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2008-2011 Analog Devices Inc.
  *
diff --git a/board/bf609-ezkit/soft_switch.h b/board/bf609-ezkit/soft_switch.h
index d147fe1..75d64e2 100644
--- a/board/bf609-ezkit/soft_switch.h
+++ b/board/bf609-ezkit/soft_switch.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2008-2011 Analog Devices Inc.
  *
diff --git a/board/blackstamp/Makefile b/board/blackstamp/Makefile
index 38e5da7..2ae79da 100644
--- a/board/blackstamp/Makefile
+++ b/board/blackstamp/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2008 Analog Device Inc.
 #
diff --git a/board/blackstamp/blackstamp.c b/board/blackstamp/blackstamp.c
index 06d004a..d233b8a 100644
--- a/board/blackstamp/blackstamp.c
+++ b/board/blackstamp/blackstamp.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - blackstamp.c BlackStamp board specific routines
+ * U-Boot - blackstamp.c BlackStamp board specific routines
  * Most code stolen from boards/bf533-stamp/bf533-stamp.c
  * Edited to the BlackStamp by Ben Matthews for UR LLE
  *
diff --git a/board/blackvme/Makefile b/board/blackvme/Makefile
index 4ff989a..9a61775 100644
--- a/board/blackvme/Makefile
+++ b/board/blackvme/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2008 Analog Device Inc.
 #
diff --git a/board/blackvme/blackvme.c b/board/blackvme/blackvme.c
index eccdaf3..d8932ed 100644
--- a/board/blackvme/blackvme.c
+++ b/board/blackvme/blackvme.c
@@ -1,4 +1,4 @@
-/* U-boot - blackvme.c  board specific routines
+/* U-Boot - blackvme.c  board specific routines
  * (c) Wojtek Skulski 2010 info@skutek.com
  * Board info: http://www.skutek.com
  * Copyright (c) 2005-2009 Analog Devices Inc.
diff --git a/board/br4/Makefile b/board/br4/Makefile
index 68e24ab..c6c03ab 100644
--- a/board/br4/Makefile
+++ b/board/br4/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) Switchfin Org. <dpn@switchfin.org>
 #
diff --git a/board/br4/br4.c b/board/br4/br4.c
index bc034e3..6f3f170 100644
--- a/board/br4/br4.c
+++ b/board/br4/br4.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) Switchfin Org. <dpn@switchfin.org>
  *
diff --git a/board/cm-bf527/Makefile b/board/cm-bf527/Makefile
index ff8ad43..1d662c6 100644
--- a/board/cm-bf527/Makefile
+++ b/board/cm-bf527/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2008 Analog Device Inc.
 #
diff --git a/board/cm-bf527/cm-bf527.c b/board/cm-bf527/cm-bf527.c
index 3186c67..0c2138b 100644
--- a/board/cm-bf527/cm-bf527.c
+++ b/board/cm-bf527/cm-bf527.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2005-2009 Analog Devices Inc.
  *
diff --git a/board/cm-bf533/Makefile b/board/cm-bf533/Makefile
index ec99638..41e100d 100644
--- a/board/cm-bf533/Makefile
+++ b/board/cm-bf533/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2008 Analog Device Inc.
 #
diff --git a/board/cm-bf533/cm-bf533.c b/board/cm-bf533/cm-bf533.c
index a863195..02ef076 100644
--- a/board/cm-bf533/cm-bf533.c
+++ b/board/cm-bf533/cm-bf533.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2005-2008 Analog Devices Inc.
  *
diff --git a/board/cm-bf537e/Makefile b/board/cm-bf537e/Makefile
index be8056f..317098c 100644
--- a/board/cm-bf537e/Makefile
+++ b/board/cm-bf537e/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2008 Analog Device Inc.
 #
diff --git a/board/cm-bf537e/cm-bf537e.c b/board/cm-bf537e/cm-bf537e.c
index 57c72a2..7e4cfc2 100644
--- a/board/cm-bf537e/cm-bf537e.c
+++ b/board/cm-bf537e/cm-bf537e.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2005-2009 Analog Devices Inc.
  *
diff --git a/board/cm-bf537u/Makefile b/board/cm-bf537u/Makefile
index 38dd3fb..835d5b7 100644
--- a/board/cm-bf537u/Makefile
+++ b/board/cm-bf537u/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2008 Analog Device Inc.
 #
diff --git a/board/cm-bf537u/cm-bf537u.c b/board/cm-bf537u/cm-bf537u.c
index f365cdb..aad72a9 100644
--- a/board/cm-bf537u/cm-bf537u.c
+++ b/board/cm-bf537u/cm-bf537u.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2005-2009 Analog Devices Inc.
  *
diff --git a/board/cm-bf548/Makefile b/board/cm-bf548/Makefile
index 98aca32..1e11b8c 100644
--- a/board/cm-bf548/Makefile
+++ b/board/cm-bf548/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2008 Analog Device Inc.
 #
diff --git a/board/cm-bf548/cm-bf548.c b/board/cm-bf548/cm-bf548.c
index 90ce4c3..d9d018b 100644
--- a/board/cm-bf548/cm-bf548.c
+++ b/board/cm-bf548/cm-bf548.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2005-2008 Analog Devices Inc.
  *
diff --git a/board/cm-bf561/Makefile b/board/cm-bf561/Makefile
index c8764fb..e0f0c34 100644
--- a/board/cm-bf561/Makefile
+++ b/board/cm-bf561/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2008 Analog Device Inc.
 #
diff --git a/board/cm-bf561/cm-bf561.c b/board/cm-bf561/cm-bf561.c
index 5741f64..99b7eb2 100644
--- a/board/cm-bf561/cm-bf561.c
+++ b/board/cm-bf561/cm-bf561.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2005-2008 Analog Devices Inc.
  *
diff --git a/board/congatec/cgtqmx6eval/README b/board/congatec/cgtqmx6eval/README
index f2c9599..0777c78 100644
--- a/board/congatec/cgtqmx6eval/README
+++ b/board/congatec/cgtqmx6eval/README
@@ -3,10 +3,10 @@
 This file contains information for the port of U-Boot to the Congatec
 QMX6 boards.
 
-1. Building U-boot
+1. Building U-Boot
 ------------------
 
-- Build U-boot for Congatec QMX6 boards:
+- Build U-Boot for Congatec QMX6 boards:
 
 $ make mrproper
 $ make cgtqmx6eval_defconfig
@@ -17,7 +17,7 @@
 - SPL
 - u-boot.img
 
-2. Flashing U-boot in the SPI NOR
+2. Flashing U-Boot in the SPI NOR
 ---------------------------------
 
 Copy SPL and u-boot.img to the exported TFTP directory of the
@@ -41,7 +41,7 @@
 
 => sf write 0x12000000 0x10000 0x70000
 
-Reboot the board and the new U-boot should come up.
+Reboot the board and the new U-Boot should come up.
 
 3. Booting from the SD card
 ---------------------------
@@ -64,9 +64,9 @@
 
 => bmode esdhc4
 
-And then the U-boot from the big slot will boot.
+And then the U-Boot from the big slot will boot.
 
-Note: If the "bmode" command is not available from your pre-installed U-boot,
+Note: If the "bmode" command is not available from your pre-installed U-Boot,
 these instruction will produce the same effect:
 
 => mw.l 0x20d8040 0x3850
diff --git a/board/dnp5370/Makefile b/board/dnp5370/Makefile
index 865522f..c0271da 100644
--- a/board/dnp5370/Makefile
+++ b/board/dnp5370/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2007 Analog Device Inc.
 #
diff --git a/board/dnp5370/dnp5370.c b/board/dnp5370/dnp5370.c
index ae9ba84..56e3b02 100644
--- a/board/dnp5370/dnp5370.c
+++ b/board/dnp5370/dnp5370.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * (C) Copyright 2010 3ality Digital Systems
  *
diff --git a/board/embest/mx6boards/mx6boards.c b/board/embest/mx6boards/mx6boards.c
index f8c7468..ad7a8cf 100644
--- a/board/embest/mx6boards/mx6boards.c
+++ b/board/embest/mx6boards/mx6boards.c
@@ -221,7 +221,7 @@
 
 	/*
 	 * According to the board_mmc_init() the following map is done:
-	 * (U-boot device node)    (Physical Port)
+	 * (U-Boot device node)    (Physical Port)
 	 * ** RiOTboard :
 	 * mmc0                    SDCard slot (bottom)
 	 * mmc1                    uSDCard slot (top)
diff --git a/board/freescale/b4860qds/eth_b4860qds.c b/board/freescale/b4860qds/eth_b4860qds.c
index 4b2303e..164ec0a 100644
--- a/board/freescale/b4860qds/eth_b4860qds.c
+++ b/board/freescale/b4860qds/eth_b4860qds.c
@@ -269,7 +269,7 @@
 		fm_info_set_phy_address(FM1_DTSEC4,
 				CONFIG_SYS_FM1_DTSEC2_RISER_PHY_ADDR);
 		/*
-		 * XFI does not need a PHY to work, but to make U-boot
+		 * XFI does not need a PHY to work, but to make U-Boot
 		 * happy, assign a fake PHY address for a XFI port.
 		 */
 		fm_info_set_phy_address(FM1_10GEC1, 0);
diff --git a/board/freescale/bsc9131rdb/README b/board/freescale/bsc9131rdb/README
index 4902b98..c840597 100644
--- a/board/freescale/bsc9131rdb/README
+++ b/board/freescale/bsc9131rdb/README
@@ -86,9 +86,9 @@
 --------------------
 NAND boot
 
-Building U-boot
+Building U-Boot
 --------------
-To build the u-boot for BSC9131RDB:
+To build the U-Boot for BSC9131RDB:
 1. NAND Flash with sysclk 66MHz(J16 on RDB closed, default)
 	make BSC9131RDB_NAND
 2. NAND Flash with sysclk 100MHz(J16 on RDB open)
@@ -123,7 +123,7 @@
 
 Flashing Images
 ---------------
-To place a new u-boot image in the NAND flash and then boot
+To place a new U-Boot image in the NAND flash and then boot
 with that new image temporarily, use this:
 	tftp 1000000 u-boot-nand.bin
 	nand erase 0 100000
diff --git a/board/freescale/bsc9132qds/README b/board/freescale/bsc9132qds/README
index f8377c9..ede95d4 100644
--- a/board/freescale/bsc9132qds/README
+++ b/board/freescale/bsc9132qds/README
@@ -87,9 +87,9 @@
 --------------------
 NOR boot
 
-Building U-boot
+Building U-Boot
 --------------
-To build the u-boot for BSC9132QDS:
+To build the U-Boot for BSC9132QDS:
 1. NOR Flash
 	make BSC9132QDS_NOR_DDRCLK100 : For 100MHZ DDR CLK
 	make BSC9132QDS_NOR_DDRCLK133 : For 133MHZ DDR CLK
@@ -122,7 +122,7 @@
 
 Flashing Images
 ---------------
-To place a new u-boot image in the NAND flash and then boot
+To place a new U-Boot image in the NAND flash and then boot
 with that new image temporarily, use this:
 	tftp 1000000 u-boot-nand.bin
 	nand erase 0 100000
diff --git a/board/freescale/c29xpcie/README b/board/freescale/c29xpcie/README
index 3bc396b..2e249cb 100644
--- a/board/freescale/c29xpcie/README
+++ b/board/freescale/c29xpcie/README
@@ -53,7 +53,7 @@
   SW5[1:4]= 0110 and SW5[6]=0 for boot from SPI flash
 Note: 1 stands for 'off', 0 stands for 'on'
 
-Build and program u-boot to NOR flash
+Build and program U-Boot to NOR flash
 ==================================
 1. Build u-boot.bin image example:
 	export ARCH=powerpc
@@ -86,7 +86,7 @@
 	- bank 4 on the flash 0x3000000~0x3ffffff
 	or set SW5[7]= ON/OFF and SW5[7]= ON/OFF, then power on again.
 
-Build and program u-boot to SPI flash
+Build and program U-Boot to SPI flash
 ==================================
 1. Build u-boot-spi.bin image
 	make C29xPCIE_SPIFLASH_config; make
diff --git a/board/freescale/ls2080a/README b/board/freescale/ls2080a/README
index 7e53f1f..646cc02 100644
--- a/board/freescale/ls2080a/README
+++ b/board/freescale/ls2080a/README
@@ -12,7 +12,7 @@
 0x05_1000_0000 .. 0x05_FFFF_FFFF	IFC region #2
 0x80_8000_0000 .. 0xFF_FFFF_FFFF	DDR region #2
 
-Other addresses are either reserved, or not used directly by u-boot.
+Other addresses are either reserved, or not used directly by U-Boot.
 This list should be updated when more addresses are used.
 
 Booting Linux flavors which do not support 48-bit VA (< Linux 3.18)
diff --git a/board/freescale/ls2080aqds/README b/board/freescale/ls2080aqds/README
index 375e97c..6ddad92 100644
--- a/board/freescale/ls2080aqds/README
+++ b/board/freescale/ls2080aqds/README
@@ -103,7 +103,7 @@
 0x05_1000_0000 .. 0x05_FFFF_FFFF	IFC region #2
 0x80_8000_0000 .. 0xFF_FFFF_FFFF	DDR region #2
 
-Other addresses are either reserved, or not used directly by u-boot.
+Other addresses are either reserved, or not used directly by U-Boot.
 This list should be updated when more addresses are used.
 
 IFC region map from core's view
diff --git a/board/freescale/ls2080aqds/eth.c b/board/freescale/ls2080aqds/eth.c
index ebc9d47..42ff743 100644
--- a/board/freescale/ls2080aqds/eth.c
+++ b/board/freescale/ls2080aqds/eth.c
@@ -716,7 +716,7 @@
 	switch (serdes1_prtcl) {
 	case 0x2A:
 		/*
-		 * XFI does not need a PHY to work, but to avoid U-boot use
+		 * XFI does not need a PHY to work, but to avoid U-Boot use
 		 * default PHY address which is zero to a MAC when it found
 		 * a MAC has no PHY address, we give a PHY address to XFI
 		 * MAC, and should not use a real XAUI PHY address, since
diff --git a/board/freescale/ls2080ardb/README b/board/freescale/ls2080ardb/README
index 7fc2569..6708ca9 100644
--- a/board/freescale/ls2080ardb/README
+++ b/board/freescale/ls2080ardb/README
@@ -87,7 +87,7 @@
 0x05_1000_0000 .. 0x05_FFFF_FFFF	IFC region #2
 0x80_8000_0000 .. 0xFF_FFFF_FFFF	DDR region #2
 
-Other addresses are either reserved, or not used directly by u-boot.
+Other addresses are either reserved, or not used directly by U-Boot.
 This list should be updated when more addresses are used.
 
 IFC region map from core's view
diff --git a/board/freescale/m52277evb/README b/board/freescale/m52277evb/README
index 3178d49..92a8384 100644
--- a/board/freescale/m52277evb/README
+++ b/board/freescale/m52277evb/README
@@ -49,7 +49,7 @@
 - include/asm-m68k/timer.h		Timer structure and definition
 - include/asm-m68k/types.h		Data types definition
 - include/asm-m68k/uart.h		Uart structure and definition
-- include/asm-m68k/u-boot.h		u-boot structure
+- include/asm-m68k/u-boot.h		U-Boot structure
 
 - include/configs/M52277EVB.h		Board specific configuration file
 
@@ -77,7 +77,7 @@
 CONFIG_SYS_MCFRTC_BASE		-- provide base address for RTC in immap.h
 CONFIG_SYS_RTC_OSCILLATOR	-- define RTC clock frequency
 RTC_DEBUG		-- define to show RTC debug message
-CONFIG_CMD_DATE		-- enable to use date feature in u-boot
+CONFIG_CMD_DATE		-- enable to use date feature in U-Boot
 
 CONFIG_MCFTMR		-- define to use DMA timer
 CONFIG_MCFPIT		-- define to use PIT timer
@@ -102,7 +102,7 @@
 
 CONFIG_SYS_SDRAM_BASE	-- defines the DRAM Base
 
-CONFIG_LCD and CONFIG_CMD_USB are not supported in this current u-boot,
+CONFIG_LCD and CONFIG_CMD_USB are not supported in this current U-Boot,
 update will be provided at later time
 
 2. MEMORY MAP UNDER U-BOOT AND LINUX KERNEL
@@ -113,7 +113,7 @@
 	SRAM:		0x80000000-0x8FFFFFFF (256MB)
 	IP:		0xF0000000-0xFFFFFFFF (256MB)
 
-2.2. For the initial bringup, we adopted a consistent memory scheme between u-boot and
+2.2. For the initial bringup, we adopted a consistent memory scheme between U-Boot and
 	linux kernel, you can customize it based on your system requirements:
 	Flash0:		0x00000000-0x00FFFFFF (16MB)
 
diff --git a/board/freescale/m5253evbe/README b/board/freescale/m5253evbe/README
index f51609f..2ed5c76 100644
--- a/board/freescale/m5253evbe/README
+++ b/board/freescale/m5253evbe/README
@@ -13,7 +13,7 @@
 
 2. MEMORY MAP UNDER U-BOOT AND LINUX KERNEL
 ===========================================
-2.1. For the initial bringup, we adopted a consistent memory scheme between u-boot and
+2.1. For the initial bringup, we adopted a consistent memory scheme between U-Boot and
 	linux kernel, you can customize it based on your system requirements:
 	SDR:	0x00000000-0x00ffffff
 	SRAM0:	0x20010000-0x20017fff
diff --git a/board/freescale/m53017evb/README b/board/freescale/m53017evb/README
index 84fc1ec..224e79c 100644
--- a/board/freescale/m53017evb/README
+++ b/board/freescale/m53017evb/README
@@ -47,7 +47,7 @@
 - include/asm-m68k/timer.h		Timer structure and definition
 - include/asm-m68k/types.h		Data types definition
 - include/asm-m68k/uart.h		Uart structure and definition
-- include/asm-m68k/u-boot.h		u-boot structure
+- include/asm-m68k/u-boot.h		U-Boot structure
 
 - include/configs/M53017EVB.h		Board specific configuration file
 
@@ -75,7 +75,7 @@
 CONFIG_SYS_MCFRTC_BASE		-- provide base address for RTC in immap.h
 CONFIG_SYS_RTC_OSCILLATOR	-- define RTC clock frequency
 RTC_DEBUG			-- define to show RTC debug message
-CONFIG_CMD_DATE			-- enable to use date feature in u-boot
+CONFIG_CMD_DATE			-- enable to use date feature in U-Boot
 
 CONFIG_MCFFEC			-- define to use common CF FEC driver
 CONFIG_MII			-- enable to use MII driver
@@ -118,7 +118,7 @@
 	SRAM:		0x80000000-0x8FFFFFFF (256MB)
 	IP:		0xFC000000-0xFFFFFFFF (256MB)
 
-2.2. For the initial bringup, we adopted a consistent memory scheme between u-boot and
+2.2. For the initial bringup, we adopted a consistent memory scheme between U-Boot and
 	linux kernel, you can customize it based on your system requirements:
 	Flash0:		0x00000000-0x00FFFFFF (16MB)
 	DDR:		0x40000000-0x4FFFFFFF (256MB)
diff --git a/board/freescale/m5373evb/README b/board/freescale/m5373evb/README
index 52eac7b..582e0c3 100644
--- a/board/freescale/m5373evb/README
+++ b/board/freescale/m5373evb/README
@@ -46,7 +46,7 @@
 - include/asm-m68k/timer.h		Timer structure and definition
 - include/asm-m68k/types.h		Data types definition
 - include/asm-m68k/uart.h		Uart structure and definition
-- include/asm-m68k/u-boot.h		u-boot structure
+- include/asm-m68k/u-boot.h		U-Boot structure
 
 - include/configs/M5373EVB.h		Board specific configuration file
 
@@ -74,7 +74,7 @@
 CONFIG_SYS_MCFRTC_BASE		-- provide base address for RTC in immap.h
 CONFIG_SYS_RTC_OSCILLATOR	-- define RTC clock frequency
 RTC_DEBUG		-- define to show RTC debug message
-CONFIG_CMD_DATE		-- enable to use date feature in u-boot
+CONFIG_CMD_DATE		-- enable to use date feature in U-Boot
 
 CONFIG_MCFFEC		-- define to use common CF FEC driver
 CONFIG_MII		-- enable to use MII driver
@@ -117,7 +117,7 @@
 	SRAM:		0x80000000-0x8FFFFFFF (256MB)
 	IP:		0xF0000000-0xFFFFFFFF (256MB)
 
-2.2. For the initial bringup, we adopted a consistent memory scheme between u-boot and
+2.2. For the initial bringup, we adopted a consistent memory scheme between U-Boot and
 	linux kernel, you can customize it based on your system requirements:
 	Flash0:		0x00000000-0x00FFFFFF (16MB)
 
diff --git a/board/freescale/m54455evb/README b/board/freescale/m54455evb/README
index c70c4c5..c563ad9 100644
--- a/board/freescale/m54455evb/README
+++ b/board/freescale/m54455evb/README
@@ -48,7 +48,7 @@
 - include/asm-m68k/timer.h		Timer structure and definition
 - include/asm-m68k/types.h		Data types definition
 - include/asm-m68k/uart.h		Uart structure and definition
-- include/asm-m68k/u-boot.h		u-boot structure
+- include/asm-m68k/u-boot.h		U-Boot structure
 
 - include/configs/M54455EVB.h	Board specific configuration file
 
@@ -78,7 +78,7 @@
 CONFIG_SYS_MCFRTC_BASE		-- provide base address for RTC in immap.h
 CONFIG_SYS_RTC_OSCILLATOR	-- define RTC clock frequency
 RTC_DEBUG		-- define to show RTC debug message
-CONFIG_CMD_DATE		-- enable to use date feature in u-boot
+CONFIG_CMD_DATE		-- enable to use date feature in U-Boot
 
 CONFIG_MCFFEC		-- define to use common CF FEC driver
 CONFIG_MII		-- enable to use MII driver
@@ -91,7 +91,7 @@
 CONFIG_SYS_FEC0_MIIBASE	-- Set FEC0 MII base register
 CONFIG_SYS_FEC1_MIIBASE	-- Set FEC0 MII base register
 MCFFEC_TOUT_LOOP	-- set FEC timeout loop
-CONFIG_HAS_ETH1		-- define to enable second FEC in u-boot
+CONFIG_HAS_ETH1		-- define to enable second FEC in U-Boot
 
 CONFIG_ISO_PARTITION	-- enable ISO read/write
 CONFIG_DOS_PARTITION	-- enable DOS read/write
@@ -136,7 +136,7 @@
 
 CONFIG_SYS_MBAR		-- define MBAR offset
 
-CONFIG_SYS_ATMEL_BOOT		-- To determine the u-boot is booted from Atmel or Intel
+CONFIG_SYS_ATMEL_BOOT		-- To determine the U-Boot is booted from Atmel or Intel
 
 CONFIG_MONITOR_IS_IN_RAM -- Not support
 
@@ -163,7 +163,7 @@
 	FlexBus:	0xC0000000-0xDFFFFFFF (512MB)
 	IP:		0xF0000000-0xFFFFFFFF (256MB)
 
-2.2. For the initial bringup, we adopted a consistent memory scheme between u-boot and
+2.2. For the initial bringup, we adopted a consistent memory scheme between U-Boot and
 	linux kernel, you can customize it based on your system requirements:
 	Atmel boot:
 	Flash0:		0x00000000-0x0007FFFF (512KB)
diff --git a/board/freescale/m547xevb/README b/board/freescale/m547xevb/README
index ce497c0..30c5ded 100644
--- a/board/freescale/m547xevb/README
+++ b/board/freescale/m547xevb/README
@@ -54,7 +54,7 @@
 - include/asm-m68k/timer.h		Timer structure and definition
 - include/asm-m68k/types.h		Data types definition
 - include/asm-m68k/uart.h		Uart structure and definition
-- include/asm-m68k/u-boot.h		u-boot structure
+- include/asm-m68k/u-boot.h		U-Boot structure
 
 - include/configs/M5475EVB.h		Board specific configuration file
 
@@ -88,7 +88,7 @@
 CONFIG_SYS_FEC0_MIIBASE	-- Set FEC0 MII base register
 CONFIG_SYS_FEC1_MIIBASE	-- Set FEC0 MII base register
 MCFFEC_TOUT_LOOP	-- set FEC timeout loop
-CONFIG_HAS_ETH1		-- define to enable second FEC in u-boot
+CONFIG_HAS_ETH1		-- define to enable second FEC in U-Boot
 
 CONFIG_CMD_USB		-- enable USB commands
 CONFIG_USB_OHCI_NEW	-- enable USB OHCI driver
diff --git a/board/freescale/mpc8313erdb/README b/board/freescale/mpc8313erdb/README
index be7ef32..697cee4 100644
--- a/board/freescale/mpc8313erdb/README
+++ b/board/freescale/mpc8313erdb/README
@@ -70,7 +70,7 @@
 
 5.	Downloading and Flashing Images
 
-5.1	Reflash U-boot Image using U-boot
+5.1	Reflash U-Boot Image using U-Boot
 
 	NOR flash:
 
@@ -81,7 +81,7 @@
 	first, to make sure that the TFTP load will succeed before it
 	goes ahead and wipes out your current firmware.  And of course,
 	have an alternate means of programming the flash available
-	if the new u-boot doesn't boot.
+	if the new U-Boot doesn't boot.
 
 	NAND flash:
 
diff --git a/board/freescale/mpc8315erdb/README b/board/freescale/mpc8315erdb/README
index b32132d..8ad6d81 100644
--- a/board/freescale/mpc8315erdb/README
+++ b/board/freescale/mpc8315erdb/README
@@ -63,7 +63,7 @@
 
 5.	Downloading and Flashing Images
 
-5.1	Reflash U-boot Image using U-boot
+5.1	Reflash U-Boot Image using U-Boot
 
 	NOR flash:
 
diff --git a/board/freescale/mpc8323erdb/README b/board/freescale/mpc8323erdb/README
index 6f89829..9a46da0 100644
--- a/board/freescale/mpc8323erdb/README
+++ b/board/freescale/mpc8323erdb/README
@@ -22,10 +22,10 @@
 
 3.	Downloading and Flashing Images
 
-3.1	Reflash U-boot Image using U-boot
+3.1	Reflash U-Boot Image using U-Boot
 
 	N.b, have an alternate means of programming
-	the flash available if the new u-boot doesn't boot.
+	the flash available if the new U-Boot doesn't boot.
 
 	First try a:
 
@@ -44,7 +44,7 @@
 	erase fe000000 +$filesize
 	cp.b $loadaddr fe000000 $filesize
 
-	To keep your old u-boot's environment variables, do a:
+	To keep your old U-Boot's environment variables, do a:
 
 	saveenv
 
diff --git a/board/freescale/mpc832xemds/README b/board/freescale/mpc832xemds/README
index 4142aa9..d141cd3 100644
--- a/board/freescale/mpc832xemds/README
+++ b/board/freescale/mpc832xemds/README
@@ -97,7 +97,7 @@
 		make MPC832XEMDS_config
 		make
 
-	MPC832x support PCI 33MHz and PCI 66MHz, to make u-boot support PCI:
+	MPC832x support PCI 33MHz and PCI 66MHz, to make U-Boot support PCI:
 
 		1)Make sure the DIP SW support PCI mode as described in Section 1.1.
 
@@ -113,7 +113,7 @@
 
 	tftp 10000 u-boot.bin
 
-5.1 Reflash U-boot Image using U-boot
+5.1 Reflash U-Boot Image using U-Boot
 
 	tftp 20000 u-boot.bin
 	protect off fe000000 fe0fffff
diff --git a/board/freescale/mpc837xemds/README b/board/freescale/mpc837xemds/README
index faf21c9..dbb1517 100644
--- a/board/freescale/mpc837xemds/README
+++ b/board/freescale/mpc837xemds/README
@@ -90,7 +90,7 @@
 
 	tftp 40000 u-boot.bin
 
-5.1 Reflash U-boot Image using U-boot
+5.1 Reflash U-Boot Image using U-Boot
 
 	tftp 40000 u-boot.bin
 	protect off fe000000 fe1fffff
diff --git a/board/freescale/mpc837xerdb/README b/board/freescale/mpc837xerdb/README
index cfb6efa..12df2f2 100644
--- a/board/freescale/mpc837xerdb/README
+++ b/board/freescale/mpc837xerdb/README
@@ -84,7 +84,7 @@
 
 	tftp $loadaddr u-boot.bin
 
-5.1 Reflash U-boot Image using U-boot
+5.1 Reflash U-Boot Image using U-Boot
 
 	tftp $loadaddr u-boot.bin
 	protect off fe000000 fe0fffff
diff --git a/board/freescale/mpc8569mds/README b/board/freescale/mpc8569mds/README
index 3d12a96..86c3ccd 100644
--- a/board/freescale/mpc8569mds/README
+++ b/board/freescale/mpc8569mds/README
@@ -3,7 +3,7 @@
 MPC8569MDS is composed of two boards - PB (Processor Board) and PIB (Platform
 I/O Board). The mpc8569 PowerTM processor is mounted on PB board.
 
-Building U-boot
+Building U-Boot
 -----------
 	make MPC8569MDS_config
 	make
@@ -22,10 +22,10 @@
 0xfe00_0000   0xffff_ffff     Flash                   32MB
 
 
-Flashing u-boot Images
+Flashing U-Boot Images
 ---------------
 
-Use the following commands to program u-boot image into flash:
+Use the following commands to program U-Boot image into flash:
 
 	=> tftp 1000000 u-boot.bin
 	=> protect off all
diff --git a/board/freescale/mpc8572ds/README b/board/freescale/mpc8572ds/README
index 57fd2ad..f1ffdd1 100644
--- a/board/freescale/mpc8572ds/README
+++ b/board/freescale/mpc8572ds/README
@@ -3,7 +3,7 @@
 MPC8572DS is a high-performance computing, evaluation and development platform
 supporting the mpc8572 PowerTM processor.
 
-Building U-boot
+Building U-Boot
 -----------
 	make MPC8572DS_config
 	make
@@ -22,14 +22,14 @@
 0xe800_0000 - 0xebff_ffff	Alternate bank		64MB
 0xec00_0000 - 0xefff_ffff	Boot bank		64MB
 
-0xebf8_0000 - 0xebff_ffff	Alternate u-boot address	512KB
-0xeff8_0000 - 0xefff_ffff	Boot u-boot address		512KB
+0xebf8_0000 - 0xebff_ffff	Alternate U-Boot address	512KB
+0xeff8_0000 - 0xefff_ffff	Boot U-Boot address		512KB
 
 
 Flashing Images
 ---------------
 
-To place a new u-boot image in the alternate flash bank and then reset with that
+To place a new U-Boot image in the alternate flash bank and then reset with that
  new image temporarily, use this:
 
 	tftp 1000000 u-boot.bin
@@ -135,7 +135,7 @@
 
 5. Bring up two cores separately:
 
-	a. Power on the board, under u-boot prompt:
+	a. Power on the board, under U-Boot prompt:
 		=> setenv <serverip>
 		=> setenv <ipaddr>
 		=> setenv bootargs root=/dev/ram rw console=ttyS0,115200
@@ -154,7 +154,7 @@
 		=> fdt chosen $initrd_start $initrd_end
 		=> bootm prep
 		=> cpu 1 release $bootm_low - $fdtaddr -
-	c. Bring up core0's kernel(on the same u-boot console):
+	c. Bring up core0's kernel(on the same U-Boot console):
 		=> setenv bootm_low 0
 		=> setenv bootm_size 0x20000000
 		=> tftp 1000000 8572/uImage.core0
@@ -162,5 +162,5 @@
 		=> tftp c00000 8572/mpc8572ds_core0.dtb
 		=> bootm 1000000 2000000 c00000
 
-Please note only core0 will run u-boot, core1 starts kernel directly after
+Please note only core0 will run U-Boot, core1 starts kernel directly after
 "cpu release" command is issued.
diff --git a/board/freescale/mpc8610hpcd/README b/board/freescale/mpc8610hpcd/README
index 31a9af3..066e625 100644
--- a/board/freescale/mpc8610hpcd/README
+++ b/board/freescale/mpc8610hpcd/README
@@ -27,7 +27,7 @@
 	cp.b 1000000 fff00000 $filesize
 
 
-To Flash U-boot into the alternate bank
+To Flash U-Boot into the alternate bank
 
 	tftp 1000000 u-boot.bin
 	erase fbf00000 +$filesize
diff --git a/board/freescale/mpc8641hpcn/README b/board/freescale/mpc8641hpcn/README
index d8fe0a4..77909a8 100644
--- a/board/freescale/mpc8641hpcn/README
+++ b/board/freescale/mpc8641hpcn/README
@@ -80,7 +80,7 @@
 3. Flash U-Boot
 ---------------
 The flash range 0xEF800000 to 0xEFFFFFFF can be divided into 2 halves.
-It is possible to use either half to boot using u-boot.  Switch 5 bit 2
+It is possible to use either half to boot using U-Boot.  Switch 5 bit 2
 is used for this purpose.
 
 0xEF800000 to 0xEFBFFFFF - 4MB
@@ -102,7 +102,7 @@
 or use tftpflash command:
 	run tftpflash
 
-To Flash U-boot into the alternative bank (0xEF800000 - 0xEFBFFFFF):
+To Flash U-Boot into the alternative bank (0xEF800000 - 0xEFBFFFFF):
 
 	tftp 1000000 u-boot.bin
 	erase efb00000 +$filesize
@@ -113,7 +113,7 @@
 -------------
 NOTE:  RIO and PCI are mutually exclusive, so they share an address
 
-For 32-bit u-boot, devices are mapped so that the virtual address ==
+For 32-bit U-Boot, devices are mapped so that the virtual address ==
 the physical address, and the map looks liks this:
 
 	Memory Range			Device		Size
@@ -130,7 +130,7 @@
 	0xffc1_0000	0xffc1_ffff	PCI2/PEX2 IO	64K
 	0xef80_0000	0xefff_ffff	Flash		8M
 
-For 36-bit-enabled u-boot, the virtual map is the same as for 32-bit.
+For 36-bit-enabled U-Boot, the virtual map is the same as for 32-bit.
 However, the physical map is altered to reside in 36-bit space, as follows.
 Addresses are no longer mapped with VA == PA.  All accesses from
 software use the VA; the PA is only used for setting up windows
diff --git a/board/freescale/mx28evk/README b/board/freescale/mx28evk/README
index f9d6324..a248fb2 100644
--- a/board/freescale/mx28evk/README
+++ b/board/freescale/mx28evk/README
@@ -1,7 +1,7 @@
 FREESCALE MX28EVK
 ==================
 
-Supported hardware: MX28EVK rev C and D are supported in U-boot.
+Supported hardware: MX28EVK rev C and D are supported in U-Boot.
 
 Files of the MX28EVK port
 --------------------------
diff --git a/board/freescale/mx35pdk/README b/board/freescale/mx35pdk/README
index 7232b53..6f6841f 100644
--- a/board/freescale/mx35pdk/README
+++ b/board/freescale/mx35pdk/README
@@ -71,7 +71,7 @@
 Flashing U-Boot
 --------------------------------
 
-U-boot should be stored on the NOR flash.
+U-Boot should be stored on the NOR flash.
 
 The boot storage can be select using the switches on the personality board
 (SW1-SW2) and on the DEBUG board (SW4-SW10).
@@ -96,7 +96,7 @@
 To erase the whole partition:
 $ flash_eraseall /dev/mtd0
 
-Writing u-boot:
+Writing U-Boot:
 dd if=u-boot.bin of=/dev/mtd0
 
 To boot from NOR, you have to select the switches as follows:
diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
index 46b4f3f..e9d9664 100644
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -268,7 +268,7 @@
 
 	/*
 	 * According to the board_mmc_init() the following map is done:
-	 * (U-boot device node)    (Physical Port)
+	 * (U-Boot device node)    (Physical Port)
 	 * mmc0                    SD2
 	 * mmc1                    SD3
 	 * mmc2                    eMMC
diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c
index df205ea..4f816c4 100644
--- a/board/freescale/mx6slevk/mx6slevk.c
+++ b/board/freescale/mx6slevk/mx6slevk.c
@@ -202,7 +202,7 @@
 
 	/*
 	 * According to the board_mmc_init() the following map is done:
-	 * (U-boot device node)    (Physical Port)
+	 * (U-Boot device node)    (Physical Port)
 	 * mmc0                    USDHC1
 	 * mmc1                    USDHC2
 	 * mmc2                    USDHC3
diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
index c9631d2..a240982 100644
--- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
+++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
@@ -339,7 +339,7 @@
 
 	/*
 	 * According to the board_mmc_init() the following map is done:
-	 * (U-boot device node)    (Physical Port)
+	 * (U-Boot device node)    (Physical Port)
 	 * mmc0                    USDHC3
 	 * mmc1                    USDHC4
 	 */
diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
index 97e9ed7..41319c6 100644
--- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
+++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
@@ -348,7 +348,7 @@
 
 	/*
 	 * According to the board_mmc_init() the following map is done:
-	 * (U-boot device node)    (Physical Port)
+	 * (U-Boot device node)    (Physical Port)
 	 * mmc0                    USDHC2
 	 * mmc1                    USDHC3
 	 * mmc2                    USDHC4
diff --git a/board/freescale/mx6ul_14x14_evk/README b/board/freescale/mx6ul_14x14_evk/README
index d48c7ba..1edccf6 100644
--- a/board/freescale/mx6ul_14x14_evk/README
+++ b/board/freescale/mx6ul_14x14_evk/README
@@ -1,7 +1,7 @@
-How to use U-boot on Freescale MX6UL 14x14 EVK
+How to use U-Boot on Freescale MX6UL 14x14 EVK
 -----------------------------------------------
 
-- Build U-boot for MX6UL 14x14 EVK:
+- Build U-Boot for MX6UL 14x14 EVK:
 
 $ make mrproper
 $ make mx6ul_14x14_evk_defconfig
@@ -28,5 +28,5 @@
 - Connect the USB cable between the EVK and the PC for the console.
 (The USB console connector is the one close the push buttons)
 
-- Insert the micro SD card in the board, power it up and U-boot messages should
+- Insert the micro SD card in the board, power it up and U-Boot messages should
 come up.
diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index b9b3573..98d5675 100644
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -394,7 +394,7 @@
 
 	/*
 	 * According to the board_mmc_init() the following map is done:
-	 * (U-boot device node)    (Physical Port)
+	 * (U-Boot device node)    (Physical Port)
 	 * mmc0                    USDHC1
 	 * mmc1                    USDHC2
 	 */
diff --git a/board/freescale/mx7dsabresd/mx7dsabresd.c b/board/freescale/mx7dsabresd/mx7dsabresd.c
index 20e56f2..fee24e2 100644
--- a/board/freescale/mx7dsabresd/mx7dsabresd.c
+++ b/board/freescale/mx7dsabresd/mx7dsabresd.c
@@ -366,7 +366,7 @@
 	int i, ret;
 	/*
 	 * According to the board_mmc_init() the following map is done:
-	 * (U-boot device node)    (Physical Port)
+	 * (U-Boot device node)    (Physical Port)
 	 * mmc0                    USDHC1
 	 * mmc2                    USDHC3 (eMMC)
 	 */
diff --git a/board/freescale/p1010rdb/README.P1010RDB-PA b/board/freescale/p1010rdb/README.P1010RDB-PA
index cde246d..105942f 100644
--- a/board/freescale/p1010rdb/README.P1010RDB-PA
+++ b/board/freescale/p1010rdb/README.P1010RDB-PA
@@ -95,7 +95,7 @@
 instead of to CAN/UART1.
 
 
-Build and burn u-boot to NOR flash
+Build and burn U-Boot to NOR flash
 ==================================
 1. Build u-boot.bin image
 	export ARCH=powerpc
@@ -131,7 +131,7 @@
 1 - boot from lower 4 sectors
 
 
-Build and burn u-boot to NAND flash
+Build and burn U-Boot to NAND flash
 ===================================
 1. Build u-boot.bin image
 	export ARCH=powerpc
@@ -146,7 +146,7 @@
 3. Check SW4[1:4]= 1000 and SW6[4]=1, then power on.
 
 
-Build and burn u-boot to SPI flash
+Build and burn U-Boot to SPI flash
 ==================================
 1. Build u-boot-spi.bin image
 	make P1010RDB_SPIFLASH_config; make
diff --git a/board/freescale/p1010rdb/README.P1010RDB-PB b/board/freescale/p1010rdb/README.P1010RDB-PB
index c5d1419..dc82f0d 100644
--- a/board/freescale/p1010rdb/README.P1010RDB-PB
+++ b/board/freescale/p1010rdb/README.P1010RDB-PB
@@ -112,14 +112,14 @@
 
 To enable SDHC in case of NOR/NAND/SPI boot
    a) For temporary use case in runtime without reboot system
-      run 'mux sdhc' in u-boot to validate SDHC with invalidating IFC.
+      run 'mux sdhc' in U-Boot to validate SDHC with invalidating IFC.
 
    b) For long-term use case
       set 'esdhc' in hwconfig and save it.
 
 To enable IFC in case of SD boot
    a) For temporary use case in runtime without reboot system
-      run 'mux ifc' in u-boot to validate IFC with invalidating SDHC.
+      run 'mux ifc' in U-Boot to validate IFC with invalidating SDHC.
 
    b) For long-term use case
       set 'ifc' in hwconfig and save it.
diff --git a/board/freescale/t102xqds/README b/board/freescale/t102xqds/README
index bb0f280..c00e3ba 100644
--- a/board/freescale/t102xqds/README
+++ b/board/freescale/t102xqds/README
@@ -172,16 +172,16 @@
 128MB NOR Flash memory Map
 --------------------------
 Start Address   End Address     Definition			Max size
-0xEFF40000      0xEFFFFFFF      u-boot (current bank)		768KB
-0xEFF20000      0xEFF3FFFF      u-boot env (current bank)	128KB
+0xEFF40000      0xEFFFFFFF      U-Boot (current bank)		768KB
+0xEFF20000      0xEFF3FFFF      U-Boot env (current bank)	128KB
 0xEFF00000      0xEFF1FFFF      FMAN Ucode (current bank)	128KB
 0xEFE00000      0xEFE3FFFF      QE firmware (current bank)	256KB
 0xED300000      0xEFEFFFFF      rootfs (alt bank)		44MB
 0xEC800000      0xEC8FFFFF      Hardware device tree (alt bank) 1MB
 0xEC020000      0xEC7FFFFF      Linux.uImage (alt bank)		7MB + 875KB
 0xEC000000      0xEC01FFFF      RCW (alt bank)			128KB
-0xEBF40000      0xEBFFFFFF      u-boot (alt bank)		768KB
-0xEBF20000      0xEBF3FFFF      u-boot env (alt bank)		128KB
+0xEBF40000      0xEBFFFFFF      U-Boot (alt bank)		768KB
+0xEBF20000      0xEBF3FFFF      U-Boot env (alt bank)		128KB
 0xEBF00000      0xEBF1FFFF      FMAN ucode (alt bank)		128KB
 0xEBE00000      0xEBE3FFFF      QE firmware (alt bank)		256KB
 0xE9300000      0xEBEFFFFF      rootfs (current bank)		44MB
@@ -221,11 +221,11 @@
 
    Switching between default bank0 and alternate bank4 on NOR flash
    To change boot source to vbank4:
-	via software:   run command 'qixis_reset altbank' in u-boot.
+	via software:   run command 'qixis_reset altbank' in U-Boot.
 	via DIP-switch: set SW6[1:4] = '0100'
 
    To change boot source to vbank0:
-	via software:   run command 'qixis_reset' in u-boot.
+	via software:   run command 'qixis_reset' in U-Boot.
 	via DIP-Switch: set SW6[1:4] = '0000'
 
 2. NAND Boot:
@@ -273,8 +273,8 @@
 -------------------------------
 PBL initializes the internal CPC-SRAM and copy SPL(160K) to SRAM.
 SPL further initializes DDR using SPD and environment variables
-and copy u-boot(768 KB) from NAND/SPI/SD device to DDR.
-Finally SPL transers control to u-boot for futher booting.
+and copy U-Boot(768 KB) from NAND/SPI/SD device to DDR.
+Finally SPL transers control to U-Boot for futher booting.
 
 SPL has following features:
  - Executes within 256K
@@ -294,14 +294,14 @@
 -------------------------------------------------
 |STACK		   | 0xFFFD8000 (22KB)		|
 -------------------------------------------------
-|U-boot SPL	   | 0xFFFD8000 (160KB)		|
+|U-Boot SPL	   | 0xFFFD8000 (160KB)		|
 -------------------------------------------------
 
 NAND Flash memory Map on T1024QDS
 -------------------------------------------------------------
 Start		End		Definition	Size
-0x000000	0x0FFFFF	u-boot		1MB
-0x100000	0x15FFFF	u-boot env	8KB
+0x000000	0x0FFFFF	U-Boot		1MB
+0x100000	0x15FFFF	U-Boot env	8KB
 0x160000	0x17FFFF	FMAN Ucode	128KB
 0x180000	0x19FFFF	QE Firmware	128KB
 
@@ -309,8 +309,8 @@
 SD Card memory Map on T1024QDS
 ----------------------------------------------------
 Block		#blocks		Definition	Size
-0x008		2048		u-boot img	1MB
-0x800		0016		u-boot env	8KB
+0x008		2048		U-Boot img	1MB
+0x800		0016		U-Boot env	8KB
 0x820		0256		FMAN Ucode	128KB
 0x920		0256		QE Firmware	128KB
 
@@ -318,8 +318,8 @@
 SPI Flash memory Map on T1024QDS
 ----------------------------------------------------
 Start		End		Definition	Size
-0x000000	0x0FFFFF	u-boot img	1MB
-0x100000	0x101FFF	u-boot env	8KB
+0x000000	0x0FFFFF	U-Boot img	1MB
+0x100000	0x101FFF	U-Boot env	8KB
 0x110000	0x12FFFF	FMAN Ucode	128KB
 0x130000	0x14FFFF	QE Firmware	128KB
 
diff --git a/board/freescale/t102xqds/eth_t102xqds.c b/board/freescale/t102xqds/eth_t102xqds.c
index ca54e2a..19543c0 100644
--- a/board/freescale/t102xqds/eth_t102xqds.c
+++ b/board/freescale/t102xqds/eth_t102xqds.c
@@ -310,7 +310,7 @@
 	case 0x95:
 	case 0x99:
 		/*
-		 * XFI does not need a PHY to work, but to avoid U-boot use
+		 * XFI does not need a PHY to work, but to avoid U-Boot use
 		 * default PHY address which is zero to a MAC when it found
 		 * a MAC has no PHY address, we give a PHY address to XFI
 		 * MAC, and should not use a real XAUI PHY address, since
diff --git a/board/freescale/t102xrdb/README b/board/freescale/t102xrdb/README
index 7d3794a..a0af25a 100644
--- a/board/freescale/t102xrdb/README
+++ b/board/freescale/t102xrdb/README
@@ -145,8 +145,8 @@
 128MB NOR Flash Memory Layout
 -----------------------------
 Start Address   End Address     Definition			Max size
-0xEFF40000      0xEFFFFFFF      u-boot (current bank)		768KB
-0xEFF20000      0xEFF3FFFF      u-boot env (current bank)	128KB
+0xEFF40000      0xEFFFFFFF      U-Boot (current bank)		768KB
+0xEFF20000      0xEFF3FFFF      U-Boot env (current bank)	128KB
 0xEFF00000      0xEFF1FFFF      FMAN Ucode (current bank)	128KB
 0xEFE00000      0xEFE3FFFF      QE firmware (current bank)	256KB
 0xED300000      0xEFDFFFFF      rootfs (alt bank)		44MB
@@ -158,8 +158,8 @@
 0xEC700000	0xEC7FFFFF	HV.uImage (alternate bank)	1MB
 0xEC020000      0xEC6FFFFF      Linux.uImage (alt bank)		~7MB
 0xEC000000      0xEC01FFFF      RCW (alt bank)			128KB
-0xEBF40000      0xEBFFFFFF      u-boot (alt bank)		768KB
-0xEBF20000      0xEBF3FFFF      u-boot env (alt bank)		128KB
+0xEBF40000      0xEBFFFFFF      U-Boot (alt bank)		768KB
+0xEBF20000      0xEBF3FFFF      U-Boot env (alt bank)		128KB
 0xEBF00000      0xEBF1FFFF      FMAN ucode (alt bank)		128KB
 0xEBE00000      0xEBE3FFFF      QE firmware (alt bank)		256KB
 0xE9300000      0xEBDFFFFF      rootfs (current bank)		44MB
@@ -198,18 +198,18 @@
    Switching between default bank0 and alternate bank4 on NOR flash
    To change boot source to vbank4:
    on T1024RDB:
-	via software:   run command 'cpld reset altbank' in u-boot.
+	via software:   run command 'cpld reset altbank' in U-Boot.
 	via DIP-switch: set SW3[5:7] = '100'
    on T1023RDB:
-	via software:   run command 'switch bank4' in u-boot.
+	via software:   run command 'switch bank4' in U-Boot.
 	via DIP-switch: set SW3[5:7] = '100'
 
    To change boot source to vbank0:
    on T1024RDB:
-	via software:   run command 'cpld reset' in u-boot.
+	via software:   run command 'cpld reset' in U-Boot.
 	via DIP-Switch: set SW3[5:7] = '000'
    on T1023RDB:
-	via software:   run command 'switch bank0' in u-boot.
+	via software:   run command 'switch bank0' in U-Boot.
 	via DIP-switch: set SW3[5:7] = '000'
 
 2. NAND Boot:
@@ -255,8 +255,8 @@
 -------------------------------
 PBL initializes the internal CPC-SRAM and copy SPL(160K) to SRAM.
 SPL further initializes DDR using SPD and environment variables
-and copy u-boot(768 KB) from NAND/SPI/SD device to DDR.
-Finally SPL transers control to u-boot for futher booting.
+and copy U-Boot(768 KB) from NAND/SPI/SD device to DDR.
+Finally SPL transers control to U-Boot for futher booting.
 
 SPL has following features:
  - Executes within 256K
@@ -276,14 +276,14 @@
 -------------------------------------------------
 |STACK		   | 0xFFFD8000 (22KB)		|
 -------------------------------------------------
-|U-boot SPL	   | 0xFFFD8000 (160KB)		|
+|U-Boot SPL	   | 0xFFFD8000 (160KB)		|
 -------------------------------------------------
 
 NAND Flash memory Map on T1024RDB
 -------------------------------------------------------------
 Start		End		Definition	Size
-0x000000	0x0FFFFF	u-boot		1MB(2 block)
-0x100000	0x17FFFF	u-boot env	512KB(1 block)
+0x000000	0x0FFFFF	U-Boot		1MB(2 block)
+0x100000	0x17FFFF	U-Boot env	512KB(1 block)
 0x180000	0x1FFFFF	FMAN Ucode	512KB(1 block)
 0x200000	0x27FFFF	QE Firmware	512KB(1 block)
 
@@ -291,16 +291,16 @@
 NAND Flash memory Map on T1023RDB
 ----------------------------------------------------
 Start		End		Definition	Size
-0x000000	0x0FFFFF	u-boot		1MB
-0x100000	0x15FFFF	u-boot env	8KB
+0x000000	0x0FFFFF	U-Boot		1MB
+0x100000	0x15FFFF	U-Boot env	8KB
 0x160000	0x17FFFF	FMAN Ucode	128KB
 
 
 SD Card memory Map on T102xRDB
 ----------------------------------------------------
 Block		#blocks		Definition	Size
-0x008		2048		u-boot img	1MB
-0x800		0016		u-boot env	8KB
+0x008		2048		U-Boot img	1MB
+0x800		0016		U-Boot env	8KB
 0x820		0256		FMAN Ucode	128KB
 0x920		0256		QE Firmware	128KB(only T1024RDB)
 
@@ -308,8 +308,8 @@
 64MB SPI Flash memory Map on T102xRDB
 ----------------------------------------------------
 Start		End		Definition	Size
-0x000000	0x0FFFFF	u-boot img	1MB
-0x100000	0x101FFF	u-boot env	8KB
+0x000000	0x0FFFFF	U-Boot img	1MB
+0x100000	0x101FFF	U-Boot env	8KB
 0x110000	0x12FFFF	FMAN Ucode	128KB
 0x130000	0x14FFFF	QE Firmware	128KB(only T1024RDB)
 0x300000	0x3FFFFF	device tree	128KB
diff --git a/board/freescale/t1040qds/README b/board/freescale/t1040qds/README
index 8160ca0..6c5ffc0 100644
--- a/board/freescale/t1040qds/README
+++ b/board/freescale/t1040qds/README
@@ -118,15 +118,15 @@
 NOR Flash memory Map on T1040QDS
 --------------------------------
  Start          End             Definition                       Size
-0xEFF40000      0xEFFFFFFF      u-boot (current bank)            768KB
-0xEFF20000      0xEFF3FFFF      u-boot env (current bank)        128KB
+0xEFF40000      0xEFFFFFFF      U-Boot (current bank)            768KB
+0xEFF20000      0xEFF3FFFF      U-Boot env (current bank)        128KB
 0xEFF00000      0xEFF1FFFF      FMAN Ucode (current bank)        128KB
 0xED300000      0xEFEFFFFF      rootfs (alt bank)                44MB
 0xEC800000      0xEC8FFFFF      Hardware device tree (alt bank)  1MB
 0xEC020000      0xEC7FFFFF      Linux.uImage (alt bank)          7MB + 875KB
 0xEC000000      0xEC01FFFF      RCW (alt bank)                   128KB
-0xEBF40000      0xEBFFFFFF      u-boot (alt bank)                768KB
-0xEBF20000      0xEBF3FFFF      u-boot env (alt bank)            128KB
+0xEBF40000      0xEBFFFFFF      U-Boot (alt bank)                768KB
+0xEBF20000      0xEBF3FFFF      U-Boot env (alt bank)            128KB
 0xEBF00000      0xEBF1FFFF      FMAN ucode (alt bank)            128KB
 0xE9300000      0xEBEFFFFF      rootfs (current bank)            44MB
 0xE8800000      0xE88FFFFF      Hardware device tree (cur bank)  11MB + 512KB
@@ -138,7 +138,7 @@
 --------------------------------------------------------------
 The below commands apply to T1040QDS
 
-1. U-boot environment variable hwconfig
+1. U-Boot environment variable hwconfig
    The default hwconfig is:
 	hwconfig=fsl_ddr:ctlr_intlv=null,bank_intlv=cs0_cs1;usb1:
 					dr_mode=host,phy_type=utmi
diff --git a/board/freescale/t104xrdb/README b/board/freescale/t104xrdb/README
index b9d2212..98b3f63 100644
--- a/board/freescale/t104xrdb/README
+++ b/board/freescale/t104xrdb/README
@@ -186,15 +186,15 @@
 NOR Flash memory Map
 ---------------------
  Start          End             Definition                       Size
-0xEFF40000      0xEFFFFFFF      u-boot (current bank)            768KB
-0xEFF20000      0xEFF3FFFF      u-boot env (current bank)        128KB
+0xEFF40000      0xEFFFFFFF      U-Boot (current bank)            768KB
+0xEFF20000      0xEFF3FFFF      U-Boot env (current bank)        128KB
 0xEFF00000      0xEFF1FFFF      FMAN Ucode (current bank)        128KB
 0xED300000      0xEFEFFFFF      rootfs (alt bank)                44MB
 0xEC800000      0xEC8FFFFF      Hardware device tree (alt bank)  1MB
 0xEC020000      0xEC7FFFFF      Linux.uImage (alt bank)          7MB + 875KB
 0xEC000000      0xEC01FFFF      RCW (alt bank)                   128KB
-0xEBF40000      0xEBFFFFFF      u-boot (alt bank)                768KB
-0xEBF20000      0xEBF3FFFF      u-boot env (alt bank)            128KB
+0xEBF40000      0xEBFFFFFF      U-Boot (alt bank)                768KB
+0xEBF20000      0xEBF3FFFF      U-Boot env (alt bank)            128KB
 0xEBF00000      0xEBF1FFFF      FMAN ucode (alt bank)            128KB
 0xE9300000      0xEBEFFFFF      rootfs (current bank)            44MB
 0xE8800000      0xE88FFFFF      Hardware device tree (cur bank)  11MB + 512KB
@@ -206,7 +206,7 @@
 --------------------------------------------------------------
 The below commands apply to the board
 
-1. U-boot environment variable hwconfig
+1. U-Boot environment variable hwconfig
    The default hwconfig is:
 	hwconfig=fsl_ddr:ctlr_intlv=null,bank_intlv=cs0_cs1;usb1:
 					dr_mode=host,phy_type=utmi
@@ -228,8 +228,8 @@
 ----------------------------------
 PBL initialise the internal SRAM and copy SPL(160KB) in SRAM.
 SPL further initialise DDR using SPD and environment variables and copy
-u-boot(768 KB) from flash to DDR.
-Finally SPL transer control to u-boot for futher booting.
+U-Boot(768 KB) from flash to DDR.
+Finally SPL transer control to U-Boot for futher booting.
 
 SPL has following features:
  - Executes within 256K
@@ -250,30 +250,30 @@
  -----------------------------------------------
  STACK       | 0xFFFD8000 (22KB)               |
  -----------------------------------------------
- U-boot SPL  | 0xFFFD8000 (160KB)              |
+ U-Boot SPL  | 0xFFFD8000 (160KB)              |
  -----------------------------------------------
 
 NAND Flash memory Map on T104xRDB
 ------------------------------------------
  Start		 End		Definition			Size
-0x000000	0x0FFFFF	u-boot                          1MB
-0x180000	0x19FFFF	u-boot env                      128KB
+0x000000	0x0FFFFF	U-Boot                          1MB
+0x180000	0x19FFFF	U-Boot env                      128KB
 0x280000	0x29FFFF	FMAN Ucode                      128KB
 0x380000	0x39FFFF	QE Firmware                     128KB
 
 SD Card memory Map on T104xRDB
 ------------------------------------------
  Block		#blocks		Definition			Size
-0x008		2048		u-boot                          1MB
-0x800		0024		u-boot env                      8KB
+0x008		2048		U-Boot                          1MB
+0x800		0024		U-Boot env                      8KB
 0x820		0256		FMAN Ucode                      128KB
 0x920		0256		QE Firmware                     128KB
 
 SPI Flash memory Map on T104xRDB
 ------------------------------------------
  Start		 End		Definition			Size
-0x000000	0x0FFFFF	u-boot                          1MB
-0x100000	0x101FFF	u-boot env                      8KB
+0x000000	0x0FFFFF	U-Boot                          1MB
+0x100000	0x101FFF	U-Boot env                      8KB
 0x110000	0x12FFFF	FMAN Ucode                      128KB
 0x130000	0x14FFFF	QE Firmware                     128KB
 
diff --git a/board/freescale/t208xqds/README b/board/freescale/t208xqds/README
index 83060c1..2a2a0e5 100755
--- a/board/freescale/t208xqds/README
+++ b/board/freescale/t208xqds/README
@@ -92,7 +92,7 @@
  10GBASE-KR scenario.
  So, for XFI usage, there are two scenarios, one will use fiber cable,
  another will use copper cable. An hwconfig env "fsl_10gkr_copper" is
- introduced to indicate a XFI port will use copper cable, and U-boot
+ introduced to indicate a XFI port will use copper cable, and U-Boot
  will fixup the dtb accordingly.
  It's used as: fsl_10gkr_copper:<10g_mac_name>
  The <10g_mac_name> can be fm1_10g1, fm1_10g2, fm1_10g3, fm1_10g4, they
@@ -108,7 +108,7 @@
  - T2080QDS can support 1G-KX by using SGMII protocol, but serdes lane
  runs in 1G-KX mode. By default, the lane runs in SGMII mode, to set a lane
  in 1G-KX mode, need to set corresponding bit in SerDes Protocol Configuration
- Register 1 (PCCR1), and U-boot fixup the dtb for kernel to do proper
+ Register 1 (PCCR1), and U-Boot fixup the dtb for kernel to do proper
  initialization.
  Hwconfig "fsl_1gkx" is used to indicate a lane runs in 1G-KX mode, MAC
  1/2/5/6/9/10 are available for 1G-KX, MAC 3/4 run in RGMII mode. To set a
@@ -142,15 +142,15 @@
 128M NOR Flash memory Map
 -------------------------
 Start Address   End Address	Definition			Max size
-0xEFF40000	0xEFFFFFFF	u-boot (current bank)		768KB
-0xEFF20000	0xEFF3FFFF	u-boot env (current bank)	128KB
+0xEFF40000	0xEFFFFFFF	U-Boot (current bank)		768KB
+0xEFF20000	0xEFF3FFFF	U-Boot env (current bank)	128KB
 0xEFF00000	0xEFF1FFFF	FMAN Ucode (current bank)	128KB
 0xED300000	0xEFEFFFFF	rootfs (alt bank)		44MB
 0xEC800000	0xEC8FFFFF	Hardware device tree (alt bank)	1MB
 0xEC020000	0xEC7FFFFF	Linux.uImage (alt bank)		7MB + 875KB
 0xEC000000	0xEC01FFFF	RCW (alt bank)			128KB
-0xEBF40000	0xEBFFFFFF	u-boot (alt bank)		768KB
-0xEBF20000	0xEBF3FFFF	u-boot env (alt bank)		128KB
+0xEBF40000	0xEBFFFFFF	U-Boot (alt bank)		768KB
+0xEBF20000	0xEBF3FFFF	U-Boot env (alt bank)		128KB
 0xEBF00000	0xEBF1FFFF	FMAN ucode (alt bank)		128KB
 0xE9300000	0xEBEFFFFF	rootfs (current bank)		44MB
 0xE8800000	0xE88FFFFF	Hardware device tree (cur bank)	1MB
@@ -172,11 +172,11 @@
 
    Switching between default bank0 and alternate bank4 on NOR flash
    To change boot source to vbank4:
-	by software:   run command 'qixis_reset altbank' in u-boot.
+	by software:   run command 'qixis_reset altbank' in U-Boot.
 	by DIP-switch: set SW6[1:4] = '0100'
 
    To change boot source to vbank0:
-	by software:   run command 'qixis_reset' in u-boot.
+	by software:   run command 'qixis_reset' in U-Boot.
 	by DIP-Switch: set SW6[1:4] = '0000'
 
 2. NAND Boot:
@@ -216,8 +216,8 @@
 -------------------------------
 PBL initializes the internal CPC-SRAM and copy SPL(160K) to SRAM.
 SPL further initializes DDR using SPD and environment variables
-and copy u-boot(768 KB) from NAND/SPI/SD device to DDR.
-Finally SPL transers control to u-boot for futher booting.
+and copy U-Boot(768 KB) from NAND/SPI/SD device to DDR.
+Finally SPL transers control to U-Boot for futher booting.
 
 SPL has following features:
  - Executes within 256K
@@ -237,30 +237,30 @@
 -------------------------------------------------
 |STACK		   | 0xFFFD8000 (22KB)		|
 -------------------------------------------------
-|U-boot SPL	   | 0xFFFD8000 (160KB)		|
+|U-Boot SPL	   | 0xFFFD8000 (160KB)		|
 -------------------------------------------------
 
 NAND Flash memory Map on T2080QDS
 --------------------------------------------------------------
 Start		End		Definition	Size
-0x000000	0x0FFFFF	u-boot img	1MB  (2 blocks)
-0x100000	0x17FFFF	u-boot env	512KB (1 block)
+0x000000	0x0FFFFF	U-Boot img	1MB  (2 blocks)
+0x100000	0x17FFFF	U-Boot env	512KB (1 block)
 0x180000	0x1FFFFF	FMAN ucode	512KB (1 block)
 
 
 Micro SD Card memory Map on T2080QDS
 ----------------------------------------------------
 Block		#blocks		Definition	Size
-0x008		2048		u-boot img	1MB
-0x800		0016		u-boot env	8KB
+0x008		2048		U-Boot img	1MB
+0x800		0016		U-Boot env	8KB
 0x820		0128		FMAN ucode	64KB
 
 
 SPI Flash memory Map on T2080QDS
 ----------------------------------------------------
 Start		End		Definition	Size
-0x000000	0x0FFFFF	u-boot img	1MB
-0x100000	0x101FFF	u-boot env	8KB
+0x000000	0x0FFFFF	U-Boot img	1MB
+0x100000	0x101FFF	U-Boot env	8KB
 0x110000	0x11FFFF	FMAN ucode	64KB
 
 
diff --git a/board/freescale/t208xqds/eth_t208xqds.c b/board/freescale/t208xqds/eth_t208xqds.c
index f08cff2..e92b5d3 100644
--- a/board/freescale/t208xqds/eth_t208xqds.c
+++ b/board/freescale/t208xqds/eth_t208xqds.c
@@ -600,7 +600,7 @@
 	case 0x66:
 	case 0x67:
 		/*
-		 * XFI does not need a PHY to work, but to avoid U-boot use
+		 * XFI does not need a PHY to work, but to avoid U-Boot use
 		 * default PHY address which is zero to a MAC when it found
 		 * a MAC has no PHY address, we give a PHY address to XFI
 		 * MAC, and should not use a real XAUI PHY address, since
diff --git a/board/freescale/t208xrdb/README b/board/freescale/t208xrdb/README
index 24484cd..42b2b92 100644
--- a/board/freescale/t208xrdb/README
+++ b/board/freescale/t208xrdb/README
@@ -107,16 +107,16 @@
 128M NOR Flash memory Map
 -------------------------
 Start Address   End Address	Definition			Max size
-0xEFF40000	0xEFFFFFFF	u-boot (current bank)		768KB
-0xEFF20000	0xEFF3FFFF	u-boot env (current bank)	128KB
+0xEFF40000	0xEFFFFFFF	U-Boot (current bank)		768KB
+0xEFF20000	0xEFF3FFFF	U-Boot env (current bank)	128KB
 0xEFF00000	0xEFF1FFFF	FMAN Ucode (current bank)	128KB
 0xEFE00000	0xEFE3FFFF	PHY CS4315 firmware		256KB
 0xED300000	0xEFEFFFFF	rootfs (alt bank)		44MB
 0xEC800000	0xEC8FFFFF	Hardware device tree (alt bank)	1MB
 0xEC020000	0xEC7FFFFF	Linux.uImage (alt bank)		7MB + 875KB
 0xEC000000	0xEC01FFFF	RCW (alt bank)			128KB
-0xEBF40000	0xEBFFFFFF	u-boot (alt bank)		768KB
-0xEBF20000	0xEBF3FFFF	u-boot env (alt bank)		128KB
+0xEBF40000	0xEBFFFFFF	U-Boot (alt bank)		768KB
+0xEBF20000	0xEBF3FFFF	U-Boot env (alt bank)		128KB
 0xEBF00000	0xEBF1FFFF	FMAN ucode (alt bank)		128KB
 0xEBE00000	0xEBE3FFFF	PHY CS4315 firmware (alt bank)	256KB
 0xE9300000	0xEBEFFFFF	rootfs (current bank)		44MB
@@ -155,11 +155,11 @@
 
    Switching between default bank and alternate bank on NOR flash
    To change boot source to vbank4:
-	via software:   run command 'cpld reset altbank' in u-boot.
+	via software:   run command 'cpld reset altbank' in U-Boot.
 	via DIP-switch: set SW3[5:7] = '100'
 
    To change boot source to vbank0:
-	via software:   run command 'cpld reset' in u-boot.
+	via software:   run command 'cpld reset' in U-Boot.
 	via DIP-Switch: set SW3[5:7] = '000'
 
 2. NAND Boot:
@@ -197,8 +197,8 @@
 -------------------------------
 PBL initializes the internal CPC-SRAM and copy SPL(160K) to SRAM.
 SPL further initializes DDR using SPD and environment variables
-and copy u-boot(768 KB) from NAND/SPI/SD device to DDR.
-Finally SPL transers control to u-boot for futher booting.
+and copy U-Boot(768 KB) from NAND/SPI/SD device to DDR.
+Finally SPL transers control to U-Boot for futher booting.
 
 SPL has following features:
  - Executes within 256K
@@ -218,14 +218,14 @@
 -------------------------------------------------
 |STACK		   | 0xFFFD8000 (22KB)		|
 -------------------------------------------------
-|U-boot SPL	   | 0xFFFD8000 (160KB)		|
+|U-Boot SPL	   | 0xFFFD8000 (160KB)		|
 -------------------------------------------------
 
 NAND Flash memory Map on T2080RDB
 --------------------------------------------------------------
 Start		End		Definition	Size
-0x000000	0x0FFFFF	u-boot img	1MB  (2 blocks)
-0x100000	0x17FFFF	u-boot env	512KB (1 block)
+0x000000	0x0FFFFF	U-Boot img	1MB  (2 blocks)
+0x100000	0x17FFFF	U-Boot env	512KB (1 block)
 0x180000	0x1FFFFF	FMAN ucode	512KB (1 block)
 0x200000	0x27FFFF	CS4315 ucode	512KB (1 block)
 
@@ -233,8 +233,8 @@
 Micro SD Card memory Map on T2080RDB
 ----------------------------------------------------
 Block		#blocks		Definition	Size
-0x008		2048		u-boot img	1MB
-0x800		0016		u-boot env	8KB
+0x008		2048		U-Boot img	1MB
+0x800		0016		U-Boot env	8KB
 0x820		0128		FMAN ucode	64KB
 0x8a0		0512		CS4315 ucode	256KB
 
@@ -242,8 +242,8 @@
 SPI Flash memory Map on T2080RDB
 ----------------------------------------------------
 Start		End		Definition	Size
-0x000000	0x0FFFFF	u-boot img	1MB
-0x100000	0x101FFF	u-boot env	8KB
+0x000000	0x0FFFFF	U-Boot img	1MB
+0x100000	0x101FFF	U-Boot env	8KB
 0x110000	0x11FFFF	FMAN ucode	64KB
 0x120000        0x15FFFF        CS4315 ucode	256KB
 
diff --git a/board/freescale/t4qds/README b/board/freescale/t4qds/README
index 3962fee..bf23814 100644
--- a/board/freescale/t4qds/README
+++ b/board/freescale/t4qds/README
@@ -86,7 +86,7 @@
 	10GBASE-KR scenario.
 	So, for XFI usage, there are two scenarios, one will use fiber cable,
 	another will use copper cable. An hwconfig env "fsl_10gkr_copper" is
-	introduced to indicate a XFI port will use copper cable, and U-boot
+	introduced to indicate a XFI port will use copper cable, and U-Boot
 	will fixup the dtb accordingly.
 	It's used as: fsl_10gkr_copper:<10g_mac_name>
 	The <10g_mac_name> can be fm1_10g1, fm1_10g2, fm2_10g1, fm2_10g2, they
@@ -118,7 +118,7 @@
 
 Voltage ID and VDD override
 --------------------
-T4240 has a VID feature. U-boot reads the VID efuses and adjust the voltage
+T4240 has a VID feature. U-Boot reads the VID efuses and adjust the voltage
 accordingly. The voltage can also be override by command vdd_override. The
 syntax is
 
@@ -144,8 +144,8 @@
 -------------------------------
 PBL initializes the internal SRAM and copy SPL(160K) in SRAM.
 SPL further initialise DDR using SPD and environment variables
-and copy u-boot(768 KB) from NAND/SD device to DDR.
-Finally SPL transers control to u-boot for futher booting.
+and copy U-Boot(768 KB) from NAND/SD device to DDR.
+Finally SPL transers control to U-Boot for futher booting.
 
 SPL has following features:
  - Executes within 256K
@@ -165,21 +165,21 @@
 -------------------------------------------------
 |STACK		| 0xFFFD8000	(22KB)		|
 -------------------------------------------------
-|U-boot SPL	| 0xFFFD8000 	(160KB)		|
+|U-Boot SPL	| 0xFFFD8000 	(160KB)		|
 -------------------------------------------------
 
 NAND Flash memory Map on T4QDS
 --------------------------------------------------------------
 Start		End		Definition	Size
-0x000000	0x0FFFFF	u-boot img	1MB
-0x140000	0x15FFFF	u-boot env      128KB
+0x000000	0x0FFFFF	U-Boot img	1MB
+0x140000	0x15FFFF	U-Boot env      128KB
 0x160000	0x17FFFF	FMAN Ucode      128KB
 
 Micro SD Card memory Map on T4QDS
 ----------------------------------------------------
 Block		#blocks		Definition	Size
-0x008		2048		u-boot img	1MB
-0x800		0016		u-boot env	8KB
+0x008		2048		U-Boot img	1MB
+0x800		0016		U-Boot env	8KB
 0x820		0128		FMAN ucode	64KB
 
 Switch Settings: (ON is 1, OFF is 0)
diff --git a/board/freescale/t4qds/eth.c b/board/freescale/t4qds/eth.c
index 83a3a9b..95f8c04 100644
--- a/board/freescale/t4qds/eth.c
+++ b/board/freescale/t4qds/eth.c
@@ -658,7 +658,7 @@
 		switch (fm_info_get_enet_if(i)) {
 		case PHY_INTERFACE_MODE_XGMII:
 			if ((srds_prtcl_s2 == 55) || (srds_prtcl_s2 == 57)) {
-				/* A fake PHY address to make U-boot happy */
+				/* A fake PHY address to make U-Boot happy */
 				fm_info_set_phy_address(i, i);
 			} else {
 				lane = serdes_get_first_lane(FSL_SRDS_1,
@@ -839,7 +839,7 @@
 		switch (fm_info_get_enet_if(i)) {
 		case PHY_INTERFACE_MODE_XGMII:
 			if ((srds_prtcl_s2 == 55) || (srds_prtcl_s2 == 57)) {
-				/* A fake PHY address to make U-boot happy */
+				/* A fake PHY address to make U-Boot happy */
 				fm_info_set_phy_address(i, i);
 			} else {
 				lane = serdes_get_first_lane(FSL_SRDS_2,
diff --git a/board/gateworks/gw_ventana/README b/board/gateworks/gw_ventana/README
index 697e5c8..9418907 100644
--- a/board/gateworks/gw_ventana/README
+++ b/board/gateworks/gw_ventana/README
@@ -16,13 +16,13 @@
 an executable image from various boot devices.
 
 The Gateworks Ventana board config uses an SPL build configuration. This
-will build the following artifacts from u-boot source:
+will build the following artifacts from U-Boot source:
  - SPL - Secondary Program Loader that the i.MX6 BOOT ROM (Primary Program
          Loader) boots.  This detects CPU/DRAM configuration, configures
          The DRAM controller, loads u-boot.img from the detected boot device,
          and jumps to it.  As this is booted from the PPL, it has an IVT/DCD
          table.
- - u-boot.img - The main u-boot core which is u-boot.bin with a image header.
+ - u-boot.img - The main U-Boot core which is u-boot.bin with a image header.
 
 
 2. Build
@@ -71,15 +71,15 @@
 The kobs-ng application uses an imximage which contains the Image Vector Table
 (IVT) and Device Configuration Data (DCD) structures that the i.MX6 BOOT ROM
 requires to boot.  The kobs-ng adds the Firmware Configuration Block (FCB) and
-Discovered Bad Block Table (DBBT).  The SPL build artifact from u-boot is
+Discovered Bad Block Table (DBBT).  The SPL build artifact from U-Boot is
 an imximage.
 
-The u-boot.img, which is the non SPL u-boot binary appended to a u-boot image
+The u-boot.img, which is the non SPL U-Boot binary appended to a U-Boot image
 header must be programmed in the NAND flash boot device at an offset hard
 coded in the SPL. For the Ventana boards, this has been chosen to be 14MB.
-The image can be programmed from either u-boot or Linux:
+The image can be programmed from either U-Boot or Linux:
 
-u-boot:
+U-Boot:
 Ventana > setenv mtdparts mtdparts=nand:14m(spl),2m(uboot),1m(env),-(rootfs)
 Ventana > tftp ${loadaddr} u-boot.img && nand erase.part uboot && \
           nand write ${loadaddr} uboot ${filesize}
@@ -104,7 +104,7 @@
 
 When the IMX6 eFUSE settings have been factory programmed to boot from
 micro-SD the SPL will be loaded from offset 0x400 (1KB). Once the SPL is
-booted, it will load and execute U-boot (u-boot.img) from offset 69KB
+booted, it will load and execute U-Boot (u-boot.img) from offset 69KB
 on the micro-SD (defined by CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR).
 
 While it is technically possible to enable the SPL to be able to load
diff --git a/board/ibf-dsp561/Makefile b/board/ibf-dsp561/Makefile
index 5b05ba8..cbf1612 100644
--- a/board/ibf-dsp561/Makefile
+++ b/board/ibf-dsp561/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2007 Analog Device Inc.
 #
diff --git a/board/ibf-dsp561/ibf-dsp561.c b/board/ibf-dsp561/ibf-dsp561.c
index d2ac7a5..8475fda 100644
--- a/board/ibf-dsp561/ibf-dsp561.c
+++ b/board/ibf-dsp561/ibf-dsp561.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2008-2009 I-SYST.
  *
diff --git a/board/imgtec/malta/malta.c b/board/imgtec/malta/malta.c
index e31331a..3a9e780 100644
--- a/board/imgtec/malta/malta.c
+++ b/board/imgtec/malta/malta.c
@@ -93,7 +93,7 @@
 {
 	enum core_card core;
 
-	malta_lcd_puts("U-boot");
+	malta_lcd_puts("U-Boot");
 	puts("Board: MIPS Malta");
 
 	core = malta_core_card();
diff --git a/board/ip04/Makefile b/board/ip04/Makefile
index caba16f..44fa684 100644
--- a/board/ip04/Makefile
+++ b/board/ip04/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2010 Analog Device Inc.
 #
diff --git a/board/ip04/ip04.c b/board/ip04/ip04.c
index 70765bc..c7bc334 100644
--- a/board/ip04/ip04.c
+++ b/board/ip04/ip04.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2007 David Rowe,
  *           (c) 2006 Ivan Danov
diff --git a/board/keymile/km83xx/README.kmeter1 b/board/keymile/km83xx/README.kmeter1
index 7f4fc99..b85d776 100644
--- a/board/keymile/km83xx/README.kmeter1
+++ b/board/keymile/km83xx/README.kmeter1
@@ -60,7 +60,7 @@
     Bytes transferred = 204204 (31dac hex)
     =>
 
-4.1 Reflash U-boot Image using U-boot
+4.1 Reflash U-Boot Image using U-Boot
 
     => run update
     ..... done
diff --git a/board/pr1/Makefile b/board/pr1/Makefile
index 4f375a8..8caa360 100644
--- a/board/pr1/Makefile
+++ b/board/pr1/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) Switchfin Org. <dpn@switchfin.org>
 #
diff --git a/board/pr1/pr1.c b/board/pr1/pr1.c
index bb907f3..3fffabd 100644
--- a/board/pr1/pr1.c
+++ b/board/pr1/pr1.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) Switchfin Org. <dpn@switchfin.org>
  *
diff --git a/board/sbc8349/README b/board/sbc8349/README
index e2d60cc..3c142e0 100644
--- a/board/sbc8349/README
+++ b/board/sbc8349/README
@@ -30,21 +30,21 @@
 Restoring a corrupted or missing flash image:
 =============================================
 
-Note that U-boot versions up to and including 2009.06 had essentially
-two copies of u-boot in flash; one at the very beginning, which set
+Note that U-Boot versions up to and including 2009.06 had essentially
+two copies of U-Boot in flash; one at the very beginning, which set
 the HRCW, and one at the very end, which was the image that was run.
 As of this point in time, the two have been combined into just one
 at the beginning of flash, which provides both the HRCW, and the image
 that is executed.  This frees up the remainder of flash for other uses.
-Use of the u-boot command "fli" will indicate what parts are in use.
-Details for storing U-boot to flash using a Wind River ICE can be found
+Use of the U-Boot command "fli" will indicate what parts are in use.
+Details for storing U-Boot to flash using a Wind River ICE can be found
 on page 19 of the board manual (request ERG-00328-001).  The following
 is a summary of that information:
 
   - Connect ICE and establish connection to it from WorkBench/OCD.
   - Ensure you have background mode (BKM) in the OCD terminal window.
   - Select the appropriate flash type (listed above)
-  - Prepare a u-boot image by using the Wind River Convert utility;
+  - Prepare a U-Boot image by using the Wind River Convert utility;
     by using "Convert and Add file" on the ELF file from your build.
     Convert from FF80_0000 to FFFF_FFFF (or to FF83_FFFF if you are
     trying to preserve your old environment settings and user flash).
@@ -55,9 +55,9 @@
 
 Note that some versions of the register files used with Workbench
 would zero some TSEC registers, which inhibits ethernet operation
-by u-boot when this register file is played to the target.  Using
+by U-Boot when this register file is played to the target.  Using
 "INN" in the OCD terminal window instead of "IN" before the "GO"
-will not play the register file, and allow u-boot to use the TSEC
+will not play the register file, and allow U-Boot to use the TSEC
 interface while executed from the ICE "GO" command.
 
 Alternatively, you can locate the register file which will be named
@@ -74,7 +74,7 @@
 Updating U-Boot with U-Boot:
 ============================
 
-This procedure is very similar to other boards that have u-boot installed.
+This procedure is very similar to other boards that have U-Boot installed.
 Assuming that the network has been configured, and that the new u-boot.bin
 has been copied to the TFTP server, the commands are:
 
@@ -98,7 +98,7 @@
 
 The 1st does not enable CONFIG_PCI, and assumes that the PCI slot
 will be left empty (M66EN high), and so the board will operate with
-a base clock of 66MHz.  Note that you need both PCI enabled in u-boot
+a base clock of 66MHz.  Note that you need both PCI enabled in U-Boot
 and linux in order to have functional PCI under linux.  The only
 reason for choosing to not enable PCI would be if you had a very
 early (rev 1.0) CPU with possible PCI issues.
diff --git a/board/sbc8548/README b/board/sbc8548/README
index feac5e3..0def245 100644
--- a/board/sbc8548/README
+++ b/board/sbc8548/README
@@ -7,10 +7,10 @@
 and a PCI-X slot, dual mini-DB9 for UART, and dual RJ-45 for eTSEC
 ethernet connections.
 
-U-boot Configuration:
+U-Boot Configuration:
 =====================
 
-The following possible u-boot configuration targets are available:
+The following possible U-Boot configuration targets are available:
 
 	1) sbc8548_config
 	2) sbc8548_PCI_33_config
@@ -23,7 +23,7 @@
 
 Choice #1 does not enable CONFIG_PCI, and assumes that the PCI slot
 will be left empty (M66EN high), and so the board will operate with
-a base clock of 66MHz.	Note that you need both PCI enabled in u-boot
+a base clock of 66MHz.	Note that you need both PCI enabled in U-Boot
 and linux in order to have functional PCI under linux.
 
 The second enables PCI support and builds for a 33MHz clock rate.  Note
@@ -100,13 +100,13 @@
 issue and allow SPD autodetection of RAM to work.
 
 
-Updating U-boot with U-boot:
+Updating U-Boot with U-Boot:
 ============================
 
-Note that versions of u-boot up to and including 2009.08 had u-boot stored
+Note that versions of U-Boot up to and including 2009.08 had U-Boot stored
 at 0xfff8_0000 -> 0xffff_ffff (512k).  Currently it is being stored from
 0xfffa_0000 -> 0xffff_ffff (384k).  If you use an old macro/script to
-update u-boot with u-boot and it uses the old address, you will render
+update U-Boot with U-Boot and it uses the old address, you will render
 your board inoperable, and you will require JTAG recovery.
 
 The following steps list how to update with the current address:
@@ -120,11 +120,11 @@
 	protect on all
 
 The "md" steps in the above are just a precautionary step that allow
-you to confirm the u-boot version that was downloaded, and then confirm
+you to confirm the U-Boot version that was downloaded, and then confirm
 that it was copied to flash.
 
 The above assumes that you are using the default board settings which
-have u-boot in the 8MB flash, tied to /CS0.
+have U-Boot in the 8MB flash, tied to /CS0.
 
 If you are running the default 8MB /CS0 settings but want to store an
 image in the SODIMM that is built with CONFIG_SYS_ALT_BOOT enabled,
@@ -139,7 +139,7 @@
 	protect on all
 
 Finally, if you are running the alternate 64MB /CS0 settings and want
-to update the in-use u-boot image, then (again with CONFIG_SYS_ALT_BOOT
+to update the in-use U-Boot image, then (again with CONFIG_SYS_ALT_BOOT
 enabled) the steps will become:
 
 	tftp u-boot.bin
@@ -155,7 +155,7 @@
 ===================
 
 The following contains some summary information on hardware settings
-that are relevant to u-boot, based on the board manual.	 For the
+that are relevant to U-Boot, based on the board manual.	 For the
 most up to date and complete details of the board, please request the
 reference manual ERG-00327-001.pdf from www.windriver.com
 
@@ -166,7 +166,7 @@
 	intel V28F128Jx, 16384x8 (4 devices) at 0xfb80_0000
 	Note that this address reflects the default setting for
 	the JTAG debugging tools, but since the alignment is
-	rather inconvenient, u-boot puts it at 0xec00_0000.
+	rather inconvenient, U-Boot puts it at 0xec00_0000.
 
 
 	Jumpers:
@@ -193,7 +193,7 @@
 SODIMM flash and /CS6 is for the boot flash.  Note that in this
 alternate setting, you also need to switch SW2.8 to ON.
 See the setting CONFIG_SYS_ALT_BOOT if you want to use this setting
-and boot u-boot from the 64MB SODIMM
+and boot U-Boot from the 64MB SODIMM
 
 
 	Switches:
@@ -257,7 +257,7 @@
 ff80_0000	ffff_ffff	CS0	8	Boot flash (8MB)
 
 [*] fb80 represents the default programmed by WR JTAG register files,
-    but u-boot places the flash at either ec00 or fc00 based on JP12.
+    but U-Boot places the flash at either ec00 or fc00 based on JP12.
 
 The EPLD on CS5 demuxes the following devices at the following offsets:
 
diff --git a/board/sbc8641d/README b/board/sbc8641d/README
index d07f1cc..4999b77 100644
--- a/board/sbc8641d/README
+++ b/board/sbc8641d/README
@@ -30,15 +30,15 @@
 4. Reflashing U-Boot
 --------------------
 The board has two independent flash devices which can be used for dual
-booting, or for u-boot backup and recovery.  A two pin jumper on the
+booting, or for U-Boot backup and recovery.  A two pin jumper on the
 three pin JP10 determines which device is attached to /CS0 line.
 
-Assuming one device has a functional u-boot, and the other device has
+Assuming one device has a functional U-Boot, and the other device has
 a recently installed non-functional image, to perform a recovery from
 that non-functional image goes essentially as follows:
 
 a) power down the board and jumper JP10 to select the functional image.
-b) power on the board and let it get to u-boot prompt.
+b) power on the board and let it get to U-Boot prompt.
 c) while on, using static precautions, move JP10 back to the failed image.
 d) use "md fff00000" to confirm you are looking at the failed image
 e) turn off write protect with "prot off all"
diff --git a/board/seco/mx6quq7/mx6quq7.c b/board/seco/mx6quq7/mx6quq7.c
index ea1d4b8..e7523f1 100644
--- a/board/seco/mx6quq7/mx6quq7.c
+++ b/board/seco/mx6quq7/mx6quq7.c
@@ -103,7 +103,7 @@
 
 	/*
 	 * Following map is done:
-	 * (U-boot device node)    (Physical Port)
+	 * (U-Boot device node)    (Physical Port)
 	 * mmc0                    eMMC on Board
 	 * mmc1                    Ext SD
 	 */
diff --git a/board/solidrun/mx6cuboxi/README b/board/solidrun/mx6cuboxi/README
index b417ff0..5d0a45d 100644
--- a/board/solidrun/mx6cuboxi/README
+++ b/board/solidrun/mx6cuboxi/README
@@ -1,7 +1,7 @@
-How to use U-boot on Solid-run mx6 Hummingboard and Cubox-i
+How to use U-Boot on Solid-run mx6 Hummingboard and Cubox-i
 -----------------------------------------------------------
 
-- Build U-boot for Hummingboard/Cubox-i:
+- Build U-Boot for Hummingboard/Cubox-i:
 
 $ make mrproper
 $ make mx6cuboxi_defconfig
@@ -17,5 +17,5 @@
 
 sudo dd if=u-boot.img of=/dev/mmcblk0 bs=1k seek=69; sync
 
-- Insert the SD card in the board, power it up and U-boot messages should
+- Insert the SD card in the board, power it up and U-Boot messages should
 come up.
diff --git a/board/tbs/tbs2910/tbs2910.c b/board/tbs/tbs2910/tbs2910.c
index 0b509b6..7707cf5 100644
--- a/board/tbs/tbs2910/tbs2910.c
+++ b/board/tbs/tbs2910/tbs2910.c
@@ -220,7 +220,7 @@
 int board_mmc_init(bd_t *bis)
 {
 	/*
-	 * (U-boot device node)    (Physical Port)
+	 * (U-Boot device node)    (Physical Port)
 	 * mmc0                    SD2
 	 * mmc1                    SD3
 	 * mmc2                    eMMC
diff --git a/board/tcm-bf518/Makefile b/board/tcm-bf518/Makefile
index 2e029f5..1ce8f64 100644
--- a/board/tcm-bf518/Makefile
+++ b/board/tcm-bf518/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2008 Analog Device Inc.
 #
diff --git a/board/tcm-bf518/tcm-bf518.c b/board/tcm-bf518/tcm-bf518.c
index 4348678..7923eae 100644
--- a/board/tcm-bf518/tcm-bf518.c
+++ b/board/tcm-bf518/tcm-bf518.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2008-2009 Analog Devices Inc.
  *
diff --git a/board/tcm-bf537/Makefile b/board/tcm-bf537/Makefile
index 93a01e4..0fe25e8 100644
--- a/board/tcm-bf537/Makefile
+++ b/board/tcm-bf537/Makefile
@@ -1,5 +1,5 @@
 #
-# U-boot - Makefile
+# U-Boot - Makefile
 #
 # Copyright (c) 2005-2008 Analog Device Inc.
 #
diff --git a/board/tcm-bf537/tcm-bf537.c b/board/tcm-bf537/tcm-bf537.c
index 2cf70ca..19df51a 100644
--- a/board/tcm-bf537/tcm-bf537.c
+++ b/board/tcm-bf537/tcm-bf537.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - main board file
+ * U-Boot - main board file
  *
  * Copyright (c) 2005-2009 Analog Devices Inc.
  *
diff --git a/board/ti/ks2_evm/README b/board/ti/ks2_evm/README
index 0fe5c3b..05baff6 100644
--- a/board/ti/ks2_evm/README
+++ b/board/ti/ks2_evm/README
@@ -3,7 +3,7 @@
 
 Author: Murali Karicheri <m-karicheri2@ti.com>
 
-This README has information on the u-boot port for K2HK, K2E, and K2L EVM boards.
+This README has information on the U-Boot port for K2HK, K2E, and K2L EVM boards.
 Documentation for this board can be found at
 http://www.advantech.com/Support/TI-EVM/EVMK2HX_sd.aspx
 https://www.einfochips.com/index.php/partnerships/texas-instruments/k2e-evm.html
@@ -23,7 +23,7 @@
 Board configuration:
 ====================
 
-Some of the peripherals that are configured by u-boot
+Some of the peripherals that are configured by U-Boot
 +------+-------+-------+-----------+-----------+-------+-------+----+
 |      |DDR3   |NAND   |MSM SRAM   |ETH ports  |UART   |I2C    |SPI |
 +------+-------+-------+-----------+-----------+-------+-------+----+
@@ -37,7 +37,7 @@
 There are separate PLLs to drive clocks to Tetris ARM and Peripherals.
 To bring up SMP Linux on this board, there is a boot monitor
 code that will be installed in MSMC SRAM. There is command available
-to install this image from u-boot.
+to install this image from U-Boot.
 
 The port related files can be found at following folders
  keystone2 SoC related files: arch/arm/cpu/armv7/keystone/
@@ -48,7 +48,7 @@
 include/configs/k2e_evm.h
 include/configs/k2l_evm.h
 
-As u-boot is migrating to Kconfig there is also board defconfig files
+As U-Boot is migrating to Kconfig there is also board defconfig files
 configs/k2e_evm_defconfig
 configs/k2hk_evm_defconfig
 configs/k2l_evm_defconfig
@@ -80,7 +80,7 @@
 on EVM. See instructions at below link for installing CCS on a Windows PC.
 http://processors.wiki.ti.com/index.php/MCSDK_UG_Chapter_Getting_Started#
 Installing_Code_Composer_Studio
-Use u-boot-dtb.bin from the build folder for loading and running u-boot binary
+Use u-boot-dtb.bin from the build folder for loading and running U-Boot binary
 on EVM. Follow instructions at
 K2HK http://processors.wiki.ti.com/index.php/EVMK2H_Hardware_Setup
 K2E  http://processors.wiki.ti.com/index.php/EVMK2E_Hardware_Setup
@@ -94,7 +94,7 @@
 configuration as instructed at http://processors.wiki.ti.com/index.php/
 MCSDK_UG_Chapter_Exploring#Loading_and_Running_U-Boot_on_EVM_through_CCS.
 The instructions provided in the above link uses a script for
-loading the u-boot binary on the target EVM. Instead do the following:-
+loading the U-Boot binary on the target EVM. Instead do the following:-
 
 1. Right click to "Texas Instruments XDS2xx USB Emulator_0/CortexA15_1 core (D
    is connected: Unknown)" at the debug window (This is created once Target
@@ -126,41 +126,41 @@
 U-Boot image can be flashed to first 512KB of the NOR flash using following
 instructions:
 
-1. Start CCS and run U-boot as described above.
+1. Start CCS and run U-Boot as described above.
 2. Suspend Target. Select Run -> Suspend from top level menu
    CortexA15_1 (Free Running)"
 3. Load u-boot-spi.gph binary from build folder on to DDR address 0x87000000
    through CCS as described in step 2 of "Load and Run U-Boot on K2HK/K2E/K2L
    EVM using CCS", but using address 0x87000000.
-4. Free Run the target as described earlier (step 4) to get u-boot prompt
-5. At the U-Boot console type following to setup u-boot environment variables.
+4. Free Run the target as described earlier (step 4) to get U-Boot prompt
+5. At the U-Boot console type following to setup U-Boot environment variables.
    setenv addr_uboot 0x87000000
    setenv filesize <size in hex of u-boot-spi.gph rounded to hex 0x10000>
    run burn_uboot_spi
-   Once u-boot prompt is available, Power OFF the EVM. Set the SW1 dip switch
+   Once U-Boot prompt is available, Power OFF the EVM. Set the SW1 dip switch
    to "SPI Little Endian Boot mode" as per instruction at
    http://processors.wiki.ti.com/index.php/*_Hardware_Setup.
-6. Power ON the EVM. The EVM now boots with u-boot image on the NOR flash.
+6. Power ON the EVM. The EVM now boots with U-Boot image on the NOR flash.
 
 AEMIF NAND Flash programming instructions
 ======================================
 U-Boot image can be flashed to first 1024KB of the NAND flash using following
 instructions:
 
-1. Start CCS and run U-boot as described above.
+1. Start CCS and run U-Boot as described above.
 2. Suspend Target. Select Run -> Suspend from top level menu
    CortexA15_1 (Free Running)"
 3. Load MLO binary from build folder on to DDR address 0x87000000
    through CCS as described in step 2 of "Load and Run U-Boot on K2HK EVM
    using CCS", but using address 0x87000000.
-4. Free Run the target as described earlier (step 4) to get u-boot prompt
-5. At the U-Boot console type following to setup u-boot environment variables.
+4. Free Run the target as described earlier (step 4) to get U-Boot prompt
+5. At the U-Boot console type following to setup U-Boot environment variables.
    setenv filesize <size in hex of MLO rounded to hex 0x10000>
    run burn_uboot_nand
-   Once u-boot prompt is available, Power OFF the EVM. Set the SW1 dip switch
+   Once U-Boot prompt is available, Power OFF the EVM. Set the SW1 dip switch
    to "ARM NAND Boot mode" as per instruction at
    http://processors.wiki.ti.com/index.php/*_Hardware_Setup.
-6. Power ON the EVM. The EVM now boots with u-boot image on the NAND flash.
+6. Power ON the EVM. The EVM now boots with U-Boot image on the NAND flash.
 
 Load and Run U-Boot on keystone EVMs using UART download
 ========================================================
@@ -171,4 +171,4 @@
 2. Using BMC terminal set the ARM-UART bootmode and reboot the EVM
    BMC> bootmode #4
    MBC> reboot
-3. When xmodem is complete you should see the u-boot starts on the UART port
+3. When xmodem is complete you should see the U-Boot starts on the UART port
diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
index 8656782..7fc57da 100644
--- a/board/tqc/tqma6/tqma6.c
+++ b/board/tqc/tqma6/tqma6.c
@@ -77,7 +77,7 @@
 
 /*
  * According to board_mmc_init() the following map is done:
- * (U-boot device node)    (Physical Port)
+ * (U-Boot device node)    (Physical Port)
  * mmc0                    eMMC (SD3) on TQMa6
  * mmc1 .. n               optional slots used on baseboard
  */
diff --git a/board/wandboard/README b/board/wandboard/README
index c6c0132..6345416 100644
--- a/board/wandboard/README
+++ b/board/wandboard/README
@@ -9,7 +9,7 @@
 For more details about Wandboard, please refer to:
 http://www.wandboard.org/
 
-Building U-boot for Wandboard
+Building U-Boot for Wandboard
 -----------------------------
 
 To build U-Boot for the Wandboard:
@@ -17,7 +17,7 @@
 $ make wandboard_config
 $ make
 
-Flashing U-boot into the SD card
+Flashing U-Boot into the SD card
 --------------------------------
 
 - After the 'make' command completes, the generated 'SPL' binary must be
@@ -36,4 +36,4 @@
 
 - Connect the serial cable to the host PC
 
-- Power up the board and U-boot messages will appear in the serial console.
+- Power up the board and U-Boot messages will appear in the serial console.
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c
index ac001ed..4ce74cd 100644
--- a/board/wandboard/wandboard.c
+++ b/board/wandboard/wandboard.c
@@ -155,7 +155,7 @@
 
 	/*
 	 * Following map is done:
-	 * (U-boot device node)    (Physical Port)
+	 * (U-Boot device node)    (Physical Port)
 	 * mmc0                    SOM MicroSD
 	 * mmc1                    Carrier board MicroSD
 	 */
diff --git a/board/warp/README b/board/warp/README
index 22f9055..3cfd22e 100644
--- a/board/warp/README
+++ b/board/warp/README
@@ -1,4 +1,4 @@
-How to Update U-boot on Warp board
+How to Update U-Boot on Warp board
 ----------------------------------
 
 Required software on the host PC:
@@ -7,13 +7,13 @@
 
 - dfu-util: http://dfu-util.sourceforge.net/releases/
 
-Build U-boot for Warp:
+Build U-Boot for Warp:
 
 $ make mrproper
 $ make warp_config
 $ make
 
-This will generate the U-boot binary called u-boot.imx.
+This will generate the U-Boot binary called u-boot.imx.
 
 Put warp board in USB download mode
 
@@ -29,7 +29,7 @@
 
 $ sudo ./imx_usb u-boot.imx
 
-Then U-boot should start and its messages will appear in the console program.
+Then U-Boot should start and its messages will appear in the console program.
 
 Use the default environment variables:
 
@@ -43,7 +43,7 @@
 
 $ sudo dfu-util -D u-boot.imx -a boot
 
-Then on the U-boot prompt the following message should be seen after a
+Then on the U-Boot prompt the following message should be seen after a
 successful upgrade:
 
 #DOWNLOAD ... OK
@@ -53,4 +53,4 @@
 
 Put warp board into normal boot mode
 
-Power up the board and the new updated U-boot should boot from eMMC
+Power up the board and the new updated U-Boot should boot from eMMC
diff --git a/cmd/bootldr.c b/cmd/bootldr.c
index bc5c1f9..38b3b2f 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 1d31326..270701b 100644
--- a/cmd/cramfs.c
+++ b/cmd/cramfs.c
@@ -77,7 +77,7 @@
 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 bce0983..0b2eefa 100644
--- a/cmd/jffs2.c
+++ b/cmd/jffs2.c
@@ -456,7 +456,7 @@
 }
 
 /***************************************************/
-/* U-boot commands				   */
+/* U-Boot commands				   */
 /***************************************************/
 
 /**
diff --git a/cmd/ldrinfo.c b/cmd/ldrinfo.c
index 2aa56bd..2b49297 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 dab1958..86a4689 100644
--- a/cmd/mtdparts.c
+++ b/cmd/mtdparts.c
@@ -1877,7 +1877,7 @@
 }
 
 /***************************************************/
-/* U-boot commands				   */
+/* U-Boot commands				   */
 /***************************************************/
 /* command line only */
 /**
diff --git a/cmd/pxe.c b/cmd/pxe.c
index 080b376..9434a18 100644
--- a/cmd/pxe.c
+++ b/cmd/pxe.c
@@ -571,7 +571,7 @@
 
 /*
  * 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 @@
 }
 
 /*
- * 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 ca76dde..acbb0f6 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.
  *
diff --git a/common/image-fdt.c b/common/image-fdt.c
index 5e4e5bd..79fa655 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -450,7 +450,7 @@
  * addresses of some of the devices in the device tree are compared with the
  * actual addresses at which U-Boot has placed them.
  *
- * Returns 1 on success, 0 on failure.  If 0 is returned, U-boot will halt the
+ * Returns 1 on success, 0 on failure.  If 0 is returned, U-Boot will halt the
  * boot process.
  */
 __weak int ft_verify_fdt(void *fdt)
diff --git a/common/image.c b/common/image.c
index f4a1dc8..75b1104 100644
--- a/common/image.c
+++ b/common/image.c
@@ -1265,7 +1265,7 @@
  * @cmd_end: pointer to a ulong variable, will hold cmdline end
  *
  * boot_get_cmdline() allocates space for kernel command line below
- * BOOTMAPSZ + getenv_bootm_low() address. If "bootargs" U-boot environemnt
+ * BOOTMAPSZ + getenv_bootm_low() address. If "bootargs" U-Boot environemnt
  * variable is present its contents is copied to allocated kernel
  * command line.
  *
diff --git a/common/kgdb_stubs.c b/common/kgdb_stubs.c
index 19b0c18..5278209 100644
--- a/common/kgdb_stubs.c
+++ b/common/kgdb_stubs.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - stub functions for common kgdb code,
+ * U-Boot - stub functions for common kgdb code,
  *          can be overridden in board specific files
  *
  * Copyright 2009 Analog Devices Inc.
diff --git a/doc/README.440-DDR-performance b/doc/README.440-DDR-performance
index 17bc747..66b97bc 100644
--- a/doc/README.440-DDR-performance
+++ b/doc/README.440-DDR-performance
@@ -9,7 +9,7 @@
 
 
 ----------------------------------------
-SDRAM0_CFG0[PMU] = 1 (U-boot default for Bamboo, Yosemite and Yellowstone)
+SDRAM0_CFG0[PMU] = 1 (U-Boot default for Bamboo, Yosemite and Yellowstone)
 ----------------------------------------
 Stream benchmark results
 -------------------------------------------------------------
diff --git a/doc/README.arm64 b/doc/README.arm64
index f32108f..de669cb 100644
--- a/doc/README.arm64
+++ b/doc/README.arm64
@@ -1,20 +1,20 @@
-U-boot for arm64
+U-Boot for arm64
 
 Summary
 =======
-No hardware platform of arm64 is available now. The u-boot is
+No hardware platform of arm64 is available now. The U-Boot is
 simulated on Foundation Model and Fast Model for ARMv8.
 
 Notes
 =====
 
-1. Currenly, u-boot run at the highest exception level processor
+1. Currenly, U-Boot run at the highest exception level processor
    supported and jump to EL2 or optionally EL1 before enter OS.
 
-2. U-boot for arm64 is compiled with AArch64-gcc. AArch64-gcc
+2. U-Boot for arm64 is compiled with AArch64-gcc. AArch64-gcc
    use rela relocation format, a tool(tools/relocate-rela) by Scott Wood
    is used to encode the initial addend of rela to u-boot.bin. After running,
-   the u-boot will be relocated to destination again.
+   the U-Boot will be relocated to destination again.
 
 3. Fdt should be placed at a 2-megabyte boundary and within the first 512
    megabytes from the start of the kernel image. So, fdt_high should be
diff --git a/doc/README.b4860qds b/doc/README.b4860qds
index 6fcc3bd..889c8a9 100644
--- a/doc/README.b4860qds
+++ b/doc/README.b4860qds
@@ -227,15 +227,15 @@
 NOR Flash memory Map on B4860 and B4420QDS
 ------------------------------------------
  Start		 End		Definition			Size
-0xEFF40000	0xEFFFFFFF	u-boot (current bank)		768KB
-0xEFF20000	0xEFF3FFFF	u-boot env (current bank)	128KB
+0xEFF40000	0xEFFFFFFF	U-Boot (current bank)		768KB
+0xEFF20000	0xEFF3FFFF	U-Boot env (current bank)	128KB
 0xEFF00000	0xEFF1FFFF	FMAN Ucode (current bank)	128KB
 0xEF300000	0xEFEFFFFF	rootfs (alternate bank)		12MB
 0xEE800000	0xEE8FFFFF	device tree (alternate bank)	1MB
 0xEE020000	0xEE6FFFFF	Linux.uImage (alternate bank)	6MB+896KB
 0xEE000000	0xEE01FFFF	RCW (alternate bank)		128KB
-0xEDF40000	0xEDFFFFFF	u-boot (alternate bank)		768KB
-0xEDF20000	0xEDF3FFFF	u-boot env (alternate bank)	128KB
+0xEDF40000	0xEDFFFFFF	U-Boot (alternate bank)		768KB
+0xEDF20000	0xEDF3FFFF	U-Boot env (alternate bank)	128KB
 0xEDF00000	0xEDF1FFFF	FMAN ucode (alternate bank)	128KB
 0xED300000	0xEDEFFFFF	rootfs (current bank)		12MB
 0xEC800000	0xEC8FFFFF	device tree (current bank)	1MB
@@ -246,7 +246,7 @@
 --------------------------------------------------------------
 The below commands apply to both B4860QDS and B4420QDS.
 
-1. U-boot environment variable hwconfig
+1. U-Boot environment variable hwconfig
    The default hwconfig is:
 	hwconfig=fsl_ddr:ctlr_intlv=null,bank_intlv=cs0_cs1;usb1:
 					dr_mode=host,phy_type=ulpi
@@ -267,7 +267,7 @@
 4. To change personality of board
    For changing personality from B4860 to B4420
 	1)Boot from vbank0
-	2)Flash vbank2 with b4420 rcw and u-boot
+	2)Flash vbank2 with b4420 rcw and U-Boot
 	3)Give following commands to uboot prompt
 	   => mw.b ffdf0040 0x30;
 	   => mw.b ffdf0010 0x00;
@@ -309,7 +309,7 @@
 
    When using [DEFAULT] RCW, which including 2 * 1G SGMII on board and 2 * 1G
    SGMII on SGMII riser card.
-   Under U-boot these network interfaces are recognized as:
+   Under U-Boot these network interfaces are recognized as:
    FM1@DTSEC3, FM1@DTSEC4, FM1@DTSEC5 and FM1@DTSEC6.
 
    On Linux the interfaces are renamed as:
@@ -322,7 +322,7 @@
    Serdes protocosl tested:
    0x18, 0x9e (serdes1, serdes2)
 
-   Under U-boot these network interfaces are recognized as:
+   Under U-Boot these network interfaces are recognized as:
    FM1@DTSEC3, FM1@DTSEC4 and  e1000#0.
 
    On Linux the interfaces are renamed as:
@@ -333,8 +333,8 @@
 ----------------------------------
 PBL initialise the internal SRAM and copy SPL(160KB) in SRAM.
 SPL further initialise DDR using SPD and environment variables and copy
-u-boot(768 KB) from flash to DDR.
-Finally SPL transer control to u-boot for futher booting.
+U-Boot(768 KB) from flash to DDR.
+Finally SPL transer control to U-Boot for futher booting.
 
 SPL has following features:
  - Executes within 256K
@@ -355,12 +355,12 @@
  -----------------------------------------------
  STACK       | 0xFFFD8000 (22KB)               |
  -----------------------------------------------
- U-boot SPL  | 0xFFFD8000 (160KB)              |
+ U-Boot SPL  | 0xFFFD8000 (160KB)              |
  -----------------------------------------------
 
 NAND Flash memory Map on B4860 and B4420QDS
 ------------------------------------------
  Start		 End		Definition			Size
-0x000000	0x0FFFFF	u-boot                          1MB
-0x140000	0x15FFFF	u-boot env                      128KB
+0x000000	0x0FFFFF	U-Boot                          1MB
+0x140000	0x15FFFF	U-Boot env                      128KB
 0x1A0000	0x1BFFFF	FMAN Ucode                      128KB
diff --git a/doc/README.clang b/doc/README.clang
index fe36909..7ce5ae4 100644
--- a/doc/README.clang
+++ b/doc/README.clang
@@ -1,4 +1,4 @@
-The biggest problem when trying to compile U-boot with clang is that
+The biggest problem when trying to compile U-Boot with clang is that
 almost all archs rely on storing gd in a global register and clang user
 manual states: "clang does not support global register variables; this
 is unlikely to be implemented soon because it requires additional LLVM
@@ -17,9 +17,9 @@
 in the ARM world, since crt0.S takes care of this. These assignments
 can be avoided by changing the init calls but this is not in mainline yet.
 
-NOTE: without the -mllvm -arm-use-movt=0 flags u-boot will compile
+NOTE: without the -mllvm -arm-use-movt=0 flags U-Boot will compile
 fine, but llvm might hardcode addresses in movw / movt pairs, which
-cannot be relocated and u-boot will fail at runtime.
+cannot be relocated and U-Boot will fail at runtime.
 
 Debian (based)
 --------------
@@ -45,7 +45,7 @@
 gmake CC="clang -target arm-freebsd-eabi --sysroot /usr/arm-freebsd -no-integrated-as -mllvm -arm-use-movt=0" rpi_defconfig
 gmake CC="clang -target arm-freebsd-eabi --sysroot /usr/arm-freebsd -no-integrated-as -mllvm -arm-use-movt=0" -j8
 
-Given that u-boot will default to gcc, above commands can be
+Given that U-Boot will default to gcc, above commands can be
 simplified with a simple wrapper script, listed below.
 
 /usr/local/bin/arm-gnueabi-freebsd-gcc
diff --git a/doc/README.fec_mxc b/doc/README.fec_mxc
index 30e05da..ed7e47d 100644
--- a/doc/README.fec_mxc
+++ b/doc/README.fec_mxc
@@ -1,4 +1,4 @@
-U-boot config options used in fec_mxc.c
+U-Boot config options used in fec_mxc.c
 
 CONFIG_FEC_MXC
 	Selects fec_mxc.c to be compiled into u-boot. Can read out the
diff --git a/doc/README.fsl-ddr b/doc/README.fsl-ddr
index 1243a12..cd71ec8 100644
--- a/doc/README.fsl-ddr
+++ b/doc/README.fsl-ddr
@@ -61,7 +61,7 @@
 	 "hwconfig=fsl_ddr:ctlr_intlv=bank"			\
 	 ......
 
-2. Run u-boot "setenv" command to configure the memory interleaving mode.
+2. Run U-Boot "setenv" command to configure the memory interleaving mode.
    Either numerical or string value is accepted.
 
   # disable memory controller interleaving
@@ -125,7 +125,7 @@
 
 Memory testing options for mpc85xx
 ==================================
-1. Memory test can be done once U-boot prompt comes up using mtest, or
+1. Memory test can be done once U-Boot prompt comes up using mtest, or
 2. Memory test can be done with Power-On-Self-Test function, activated at
    compile time.
 
@@ -267,7 +267,7 @@
 be activated by setting the environment variable "ddr_interactive" to any
 value.  (The value of ddr_interactive may have a meaning in the future, but,
 for now, the presence of the variable will cause the debugger to run.)  Once
-activated, U-boot will show the prompt "FSL DDR>" before enabling the DDR
+activated, U-Boot will show the prompt "FSL DDR>" before enabling the DDR
 controller.  The available commands are printed by typing "help".
 
 Another way to enter the interactive DDR debugger without setting the
@@ -275,7 +275,7 @@
 process.  To save booting time, no additional delay is added, so the window
 to send the key press is very short -- basically, it is the time before the
 memory controller code starts to run.  For example, when rebooting from
-within u-boot, the user must press 'd' IMMEDIATELY after hitting enter to
+within U-Boot, the user must press 'd' IMMEDIATELY after hitting enter to
 initiate a 'reset' command.  In case of power on/reset, the user can hold
 down the 'd' key while applying power or hitting the board's reset button.
 
@@ -341,7 +341,7 @@
 	no argument	- print a list of all commands
 
 go
-	no argument	- program memory controller(s) and continue with U-boot
+	no argument	- program memory controller(s) and continue with U-Boot
 
 Examples of debugging flow
 
diff --git a/doc/README.imx6 b/doc/README.imx6
index 7c9a4ac..1823fb2 100644
--- a/doc/README.imx6
+++ b/doc/README.imx6
@@ -37,7 +37,7 @@
 bank = 4
 word = 2
 
-And the U-boot command would be:
+And the U-Boot command would be:
 
 => fuse read 4 2
 Reading bank 4:
@@ -58,7 +58,7 @@
 bank = 4
 word = 3
 
-And the U-boot command would be:
+And the U-Boot command would be:
 
 => fuse read 4 3
 Reading bank 4:
diff --git a/doc/README.m68k b/doc/README.m68k
index c85febc..9d5c08f 100644
--- a/doc/README.m68k
+++ b/doc/README.m68k
@@ -17,7 +17,7 @@
 Bernhard Kuhn ported U-Boot 0.4.0 to the Motorola Coldfire
 architecture. The patches of Bernhard support the MCF5272 and
 MCF5282. A great disadvantage of these patches was that they needed
-a pre-bootloader to start u-boot. Because of this, a new port was
+a pre-bootloader to start U-Boot. Because of this, a new port was
 created which no longer needs a first stage booter.
 
 Although this port is intended to cover all M68k processors, only
@@ -53,8 +53,8 @@
 
 U-Boot Memory Map:
 ------------------
-0xffe00000 - 0xffe3ffff		u-boot
-0xffe04000 - 0xffe05fff		environment (embedded in u-boot!)
+0xffe00000 - 0xffe3ffff		U-Boot
+0xffe04000 - 0xffe05fff		environment (embedded in U-Boot!)
 0xffe40000 - 0xffffffff		free for linux/applications
 
 
@@ -65,13 +65,13 @@
 To configure the board, type: make M5272C3_config
 
 At the moment the code isn't fully implemented and still needs a pre-loader!
-The preloader must initialize the processor and then start u-boot. The board
+The preloader must initialize the processor and then start U-Boot. The board
 must be configured for a pre-loader (see 4.1)
 
 For the preloader, please see
 http://mailman.uclinux.org/pipermail/uclinux-dev/2003-December/023384.html
 
-U-boot is configured to run at 0x20000 at default. This can be configured by
+U-Boot is configured to run at 0x20000 at default. This can be configured by
 change CONFIG_SYS_TEXT_BASE in board/m5282evb/config.mk and CONFIG_SYS_MONITOR_BASE in
 include/configs/M5282EVB.h.
 
@@ -91,10 +91,10 @@
 
 4.1 Configuration to use a pre-loader
 -------------------------------------
-If u-boot should be loaded to RAM and started by a pre-loader
+If U-Boot should be loaded to RAM and started by a pre-loader
 CONFIG_MONITOR_IS_IN_RAM must be defined. If it is defined the
 initial vector table and basic processor initialization will not
-be compiled in. The start address of u-boot must be adjusted in
+be compiled in. The start address of U-Boot must be adjusted in
 the boards config header file (CONFIG_SYS_MONITOR_BASE) and Makefile
 (CONFIG_SYS_TEXT_BASE) to the load address.
 
@@ -105,7 +105,7 @@
 CONFIG_M5272	-- defined for all Motorola MCF5272 CPUs
 
 CONFIG_MONITOR_IS_IN_RAM
-		-- defined if u-boot is loaded by a pre-loader
+		-- defined if U-Boot is loaded by a pre-loader
 
 CONFIG_SYS_MBAR	-- defines the base address of the MCF5272 configuration registers
 CONFIG_SYS_INIT_RAM_ADDR
@@ -130,7 +130,7 @@
 CONFIG_M5282	-- defined for all Motorola MCF5282 CPUs
 
 CONFIG_MONITOR_IS_IN_RAM
-		-- defined if u-boot is loaded by a pre-loader
+		-- defined if U-Boot is loaded by a pre-loader
 
 CONFIG_SYS_MBAR	-- defines the base address of the MCF5282 internal register space
 CONFIG_SYS_INIT_RAM_ADDR
diff --git a/doc/README.malta b/doc/README.malta
index c8db8a0..8614696 100644
--- a/doc/README.malta
+++ b/doc/README.malta
@@ -13,4 +13,4 @@
       reset
       flash-boot /path/to/u-boot/u-boot.bin
 
-  - You should now be able to reboot your Malta to a U-boot shell.
+  - You should now be able to reboot your Malta to a U-Boot shell.
diff --git a/doc/README.menu b/doc/README.menu
index ad520ab..cf14231 100644
--- a/doc/README.menu
+++ b/doc/README.menu
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-U-boot provides a set of interfaces for creating and using simple, text
+U-Boot provides a set of interfaces for creating and using simple, text
 based menus. Menus are displayed as lists of labeled entries on the
 console, and an entry can be selected by entering its label.
 
diff --git a/doc/README.mpc83xxads b/doc/README.mpc83xxads
index d456103..7a8b706 100644
--- a/doc/README.mpc83xxads
+++ b/doc/README.mpc83xxads
@@ -80,7 +80,7 @@
 
 	tftp 10000 u-boot.bin
 
-5.1 Reflash U-boot Image using U-boot
+5.1 Reflash U-Boot Image using U-Boot
 
     tftp 10000 u-boot.bin
     protect off fe000000 fe09ffff
diff --git a/doc/README.mpc85xx-spin-table b/doc/README.mpc85xx-spin-table
index 8da768a..72c7bd7 100644
--- a/doc/README.mpc85xx-spin-table
+++ b/doc/README.mpc85xx-spin-table
@@ -1,7 +1,7 @@
 Spin table in cache
 =====================================
 As specified by ePAPR v1.1, the spin table needs to be in cached memory. After
-DDR is initialized and U-boot relocates itself into DDR, the spin table is
+DDR is initialized and U-Boot relocates itself into DDR, the spin table is
 accessible for core 0. It is part of release.S, within 4KB range after
 __secondary_start_page. For other cores to use the spin table, the booting
 process is described below:
diff --git a/doc/README.mpc85xxads b/doc/README.mpc85xxads
index 28bbcbe..ef92739 100644
--- a/doc/README.mpc85xxads
+++ b/doc/README.mpc85xxads
@@ -107,7 +107,7 @@
 2. MEMORY MAP TO WORK WITH LINUX KERNEL
 
 2.1. For the initial bringup, we adopted a consistent memory scheme
-     between u-boot and linux kernel, you can customize it based on your
+     between U-Boot and linux kernel, you can customize it based on your
      system requirements:
 
      0x0000_0000     0x7fff_ffff     DDR		     2G
@@ -192,7 +192,7 @@
     and future revisions of 8540/8560.
 
 
-4.4 Reflash U-boot Image using U-boot
+4.4 Reflash U-Boot Image using U-Boot
 
     tftp 10000 u-boot.bin
     protect off fff80000 ffffffff
diff --git a/doc/README.mpc85xxcds b/doc/README.mpc85xxcds
index bc5db0c..79d71cb 100644
--- a/doc/README.mpc85xxcds
+++ b/doc/README.mpc85xxcds
@@ -25,7 +25,7 @@
 Memory Map
 ----------
 
-The memory map for u-boot and linux has been extended w.r.t. the ADS
+The memory map for U-Boot and linux has been extended w.r.t. the ADS
 platform to allow for utilization of all 85xx CDS devices.  The memory
 map is setup for linux to operate properly.  The linux source when
 configured for MPC85xx CDS has been updated to reflect the new memory
@@ -55,14 +55,14 @@
 There is a switch which allows the boot-bank to be selected.  The switch
 settings for updating flash are given below.
 
-The u-boot commands for copying the boot-bank into the secondary bank are
+The U-Boot commands for copying the boot-bank into the secondary bank are
 as follows:
 
      erase ff780000 ff7fffff
      cp.b fff80000 ff780000 80000
 
 
-U-boot/kermit commands for downloading an image, then copying
+U-Boot/kermit commands for downloading an image, then copying
 it into the secondary bank:
 
      loadb
@@ -76,7 +76,7 @@
      cp.b $loadaddr ff780000 80000
 
 
-U-boot commands for downloading an image via tftp and flashing
+U-Boot commands for downloading an image via tftp and flashing
 it into the second bank:
 
      tftp 10000 <u-boot.bin.image>
@@ -211,7 +211,7 @@
    Flash Bank 2 @ 0xff000000
    Ram @ 0
 
-Commands for downloading a u-boot image to memory from edink:
+Commands for downloading a U-Boot image to memory from edink:
 
    env -c
    time -s 4/8/2004 4:30p
diff --git a/doc/README.mxs b/doc/README.mxs
index ed2e568..6ea73b9 100644
--- a/doc/README.mxs
+++ b/doc/README.mxs
@@ -1,4 +1,4 @@
-Booting U-boot on a MXS processor
+Booting U-Boot on a MXS processor
 =================================
 
 This document describes the MXS U-Boot port. This document mostly covers topics
@@ -23,7 +23,7 @@
 2) Compiling U-Boot for a MXS based board
 3) Installation of U-Boot for a MXS based board to SD card
 4) Installation of U-Boot into NAND flash on a MX28 based board
-5) Installation of U-boot into SPI NOR flash on a MX28 based board
+5) Installation of U-Boot into SPI NOR flash on a MX28 based board
 
 1) Prerequisites
 ----------------
@@ -95,19 +95,19 @@
 
 Examples:
 
-1. For building U-boot for Denx M28EVK board:
+1. For building U-Boot for Denx M28EVK board:
 
 	$ make m28evk_config
 
-2. For building U-boot for Freescale MX28EVK board:
+2. For building U-Boot for Freescale MX28EVK board:
 
 	$ make mx28evk_config
 
-3. For building U-boot for Freescale MX23EVK board:
+3. For building U-Boot for Freescale MX23EVK board:
 
 	$ make mx23evk_config
 
-4. For building U-boot for Olimex MX23 Olinuxino board:
+4. For building U-Boot for Olimex MX23 Olinuxino board:
 
 	$ make mx23_olinuxino_config
 
@@ -267,7 +267,7 @@
 5) Installation of U-Boot into SPI NOR flash on a MX28 based board
 ------------------------------------------------------------------
 
-The u-boot.sb file can be directly written to SPI NOR from U-boot prompt.
+The u-boot.sb file can be directly written to SPI NOR from U-Boot prompt.
 
 Load u-boot.sb into RAM, this can be done in several ways and one way is to use
 tftp:
@@ -278,7 +278,7 @@
 
 (SPI NOR should be succesfully detected in this step)
 
-Erase the blocks where U-boot binary will be written to:
+Erase the blocks where U-Boot binary will be written to:
        => sf erase 0x0 0x80000
 
 Write u-boot.sb to SPI NOR:
@@ -287,4 +287,4 @@
 Power off the board and set the boot mode DIP switches to boot from the SPI NOR
 according to MX28 manual section 12.2.1 (Table 12-2)
 
-Last step is to power up the board and U-boot should start from SPI NOR.
+Last step is to power up the board and U-Boot should start from SPI NOR.
diff --git a/doc/README.odroid b/doc/README.odroid
index 8a004ca..ef243d1 100644
--- a/doc/README.odroid
+++ b/doc/README.odroid
@@ -1,4 +1,4 @@
- U-boot for Odroid X2/U3/XU3
+ U-Boot for Odroid X2/U3/XU3
 ========================
 
 1. Summary
@@ -36,7 +36,7 @@
 
 4. Boot media layout
 ====================
-The table below shows SD/eMMC cards layout for U-boot.
+The table below shows SD/eMMC cards layout for U-Boot.
 The block offset is starting from 0 and the block size is 512B.
  -------------------------------------
 |  Binary   | Block offset| part type |
@@ -44,7 +44,7 @@
  -------------------------------------
 | Bl1       | 1    | 0    |  1 (boot) |
 | Bl2       | 31   | 30   |  1 (boot) |
-| U-boot    | 63   | 62   |  1 (boot) |
+| U-Boot    | 63   | 62   |  1 (boot) |
 | Tzsw      | 2111 | 2110 |  1 (boot) |
 | Uboot Env | 2560 | 2560 |  0 (user) |
  -------------------------------------
@@ -62,18 +62,18 @@
 without problem)
 
 This is all you need to boot this board. But if you want to use your custom
-u-boot then you need to change u-boot.bin with your own u-boot binary*
+U-Boot then you need to change u-boot.bin with your own U-Boot binary*
 and run the script "sd_fusing.sh" - this script is valid only for SD card.
 
 *note:
-The proper binary file of current U-boot is u-boot-dtb.bin.
+The proper binary file of current U-Boot is u-boot-dtb.bin.
 
 quick steps for Linux:
 - Download all files from the link at point 3 and extract it if needed.
 - put any SD card into the SD reader
 - check the device with "dmesg"
 - run ./sd_fusing.sh /dev/sdX - where X is SD card device (but not a partition)
-Check if Hardkernel U-boot is booting, and next do the same with your U-boot.
+Check if Hardkernel U-Boot is booting, and next do the same with your U-Boot.
 
 6. Prepare the eMMC boot card
    with a eMMC card reader (boot from eMMC card slot)
@@ -92,19 +92,19 @@
 If you have an eMMC->microSD adapter you can prepare the card as in point 5.
 But then the device can boot only from the SD card slot.
 
-8. Prepare the boot media using Hardkernel U-boot
+8. Prepare the boot media using Hardkernel U-Boot
 =================================================
-You can update the U-boot to the custom one if you have a working bootloader
+You can update the U-Boot to the custom one if you have a working bootloader
 delivered with the board on the eMMC/SD card. Then follow the steps:
 - install the android fastboot tool
 - connect a micro usb cable to the board
-- on the U-boot prompt, run command: fastboot (as a root)
+- on the U-Boot prompt, run command: fastboot (as a root)
 - on the host, run command: "fastboot flash bootloader u-boot-dtb.bin"
-- the custom U-boot should start after the board resets.
+- the custom U-Boot should start after the board resets.
 
 9. Partition layout
 ====================
-Default U-boot environment is setup for fixed partition layout.
+Default U-Boot environment is setup for fixed partition layout.
 
 Partition table: MSDOS. Disk layout and files as listed in the table below.
  ----- ------ ------ ------ -------- ---------------------------------
diff --git a/doc/README.pxe b/doc/README.pxe
index bd175eb..cc182c9 100644
--- a/doc/README.pxe
+++ b/doc/README.pxe
@@ -5,8 +5,8 @@
  */
 
 The 'pxe' commands provide a near subset of the functionality provided by
-the PXELINUX boot loader. This allows U-boot based systems to be controlled
-remotely using the same PXE based techniques that many non U-boot based servers
+the PXELINUX boot loader. This allows U-Boot based systems to be controlled
+remotely using the same PXE based techniques that many non U-Boot based servers
 use.
 
 Commands
@@ -99,7 +99,7 @@
 lines is ignored.
 
 The size of pxe files and the number of labels is only limited by the amount
-of RAM available to U-boot. Memory for labels is dynamically allocated as
+of RAM available to U-Boot. Memory for labels is dynamically allocated as
 they're parsed, and memory for pxe files is statically allocated, and its
 location is given by the pxefile_addr_r environment variable. The pxe code is
 not aware of the size of the pxefile memory and will outgrow it if pxe files
@@ -206,38 +206,38 @@
 
 Differences with PXELINUX
 =========================
-The biggest difference between U-boot's pxe and PXELINUX is that since
-U-boot's pxe support is written entirely in C, it can run on any platform
-with network support in U-boot. Here are some other differences between
-PXELINUX and U-boot's pxe support.
+The biggest difference between U-Boot's pxe and PXELINUX is that since
+U-Boot's pxe support is written entirely in C, it can run on any platform
+with network support in U-Boot. Here are some other differences between
+PXELINUX and U-Boot's pxe support.
 
-- U-boot's pxe does not support the PXELINUX DHCP option codes specified
+- U-Boot's pxe does not support the PXELINUX DHCP option codes specified
   in RFC 5071, but could be extended to do so.
 
-- when U-boot's pxe fails to boot, it will return control to U-boot,
-  allowing another command to run, other U-boot command, instead of resetting
+- when U-Boot's pxe fails to boot, it will return control to U-Boot,
+  allowing another command to run, other U-Boot command, instead of resetting
   the machine like PXELINUX.
 
-- U-boot's pxe doesn't rely on or provide an UNDI/PXE stack in memory, it
-  only uses U-boot.
+- U-Boot's pxe doesn't rely on or provide an UNDI/PXE stack in memory, it
+  only uses U-Boot.
 
-- U-boot's pxe doesn't provide the full menu implementation that PXELINUX
+- U-Boot's pxe doesn't provide the full menu implementation that PXELINUX
   does, only a simple text based menu using the commands described in
   this README.	With PXELINUX, it's possible to have a graphical boot
-  menu, submenus, passwords, etc. U-boot's pxe could be extended to support
+  menu, submenus, passwords, etc. U-Boot's pxe could be extended to support
   a more robust menuing system like that of PXELINUX's.
 
-- U-boot's pxe expects U-boot uimg's as kernels.  Anything that would work
-  with the 'bootm' command in U-boot could work with the 'pxe boot' command.
+- U-Boot's pxe expects U-Boot uimg's as kernels.  Anything that would work
+  with the 'bootm' command in U-Boot could work with the 'pxe boot' command.
 
-- U-boot's pxe only recognizes a single file on the initrd command line.  It
+- U-Boot's pxe only recognizes a single file on the initrd command line.  It
   could be extended to support multiple.
 
-- in U-boot's pxe, the localboot command doesn't necessarily cause a local
+- in U-Boot's pxe, the localboot command doesn't necessarily cause a local
   disk boot - it will do whatever is defined in the 'localcmd' env
   variable. And since it doesn't support a full UNDI/PXE stack, the
   type field is ignored.
 
-- the interactive prompt in U-boot's pxe only allows you to choose a label
+- the interactive prompt in U-Boot's pxe only allows you to choose a label
   from the menu.  If you want to boot something not listed, you can ctrl+c
-  out of 'pxe boot' and use existing U-boot commands to accomplish it.
+  out of 'pxe boot' and use existing U-Boot commands to accomplish it.
diff --git a/doc/README.qemu-mips b/doc/README.qemu-mips
index a192752..3940fac 100644
--- a/doc/README.qemu-mips
+++ b/doc/README.qemu-mips
@@ -157,7 +157,7 @@
 (gdb)  target remote localhost:1234
 Remote debugging using localhost:1234
 _start () at start.S:64
-64		RVECENT(reset,0)	/* U-boot entry point */
+64		RVECENT(reset,0)	/* U-Boot entry point */
 Current language:  auto; currently asm
 (gdb)  b board.c:289
 Breakpoint 1 at 0xbfc00cc8: file board.c, line 289.
diff --git a/doc/README.sata b/doc/README.sata
index d0ce667..b1104bb 100644
--- a/doc/README.sata
+++ b/doc/README.sata
@@ -1,4 +1,4 @@
-1. SATA usage in U-boot
+1. SATA usage in U-Boot
 
 	There are two ways to operate the hard disk
 
@@ -45,9 +45,9 @@
 	boot
 	=> bootm 200000 1000000 2000000
 
-1.3 How to load an image from an ext2 file system in U-boot?
+1.3 How to load an image from an ext2 file system in U-Boot?
 
-	U-boot doesn't support writing to an ext2 file system, so the
+	U-Boot doesn't support writing to an ext2 file system, so the
 	files must be written by other means (e.g. linux).
 
 	=> ext2ls sata 0:1 /
diff --git a/doc/README.video b/doc/README.video
index 62ac17b..e7ae98a 100644
--- a/doc/README.video
+++ b/doc/README.video
@@ -32,13 +32,13 @@
 Example: video-mode=fslfb:1280x1024-32@60,monitor=dvi
 
 
-U-boot sunxi video controller driver
+U-Boot sunxi video controller driver
 ====================================
 
-U-boot supports hdmi and lcd output on Allwinner sunxi SoCs, lcd output
+U-Boot supports hdmi and lcd output on Allwinner sunxi SoCs, lcd output
 requires the CONFIG_VIDEO_LCD_MODE Kconfig value to be set.
 
-The sunxi u-boot driver supports the following video-mode options:
+The sunxi U-Boot driver supports the following video-mode options:
 
 - monitor=[none|dvi|hdmi|lcd|vga|composite-*] - Select the video output to use
  none:     Disable video output.
diff --git a/doc/SPI/README.ti_qspi_flash b/doc/SPI/README.ti_qspi_flash
index 1b86d01..9064739 100644
--- a/doc/SPI/README.ti_qspi_flash
+++ b/doc/SPI/README.ti_qspi_flash
@@ -1,4 +1,4 @@
-QSPI U-boot support
+QSPI U-Boot support
 ------------------
 
 Host processor is connected to serial flash device via qpsi
@@ -44,4 +44,4 @@
 Testing
 -------
 A seperated file named README.dra_qspi_test has been created which gives all the
-details about the commands required to test qspi at u-boot level.
+details about the commands required to test qspi at U-Boot level.
diff --git a/doc/uImage.FIT/kernel.its b/doc/uImage.FIT/kernel.its
index 539cdbf..e668c3f 100644
--- a/doc/uImage.FIT/kernel.its
+++ b/doc/uImage.FIT/kernel.its
@@ -1,5 +1,5 @@
 /*
- * Simple U-boot uImage source file containing a single kernel
+ * Simple U-Boot uImage source file containing a single kernel
  */
 
 /dts-v1/;
diff --git a/doc/uImage.FIT/kernel_fdt.its b/doc/uImage.FIT/kernel_fdt.its
index 7e940d2..7c52148 100644
--- a/doc/uImage.FIT/kernel_fdt.its
+++ b/doc/uImage.FIT/kernel_fdt.its
@@ -1,5 +1,5 @@
 /*
- * Simple U-boot uImage source file containing a single kernel and FDT blob
+ * Simple U-Boot uImage source file containing a single kernel and FDT blob
  */
 
 /dts-v1/;
diff --git a/doc/uImage.FIT/multi.its b/doc/uImage.FIT/multi.its
index 881b749..37369ec 100644
--- a/doc/uImage.FIT/multi.its
+++ b/doc/uImage.FIT/multi.its
@@ -1,5 +1,5 @@
 /*
- * U-boot uImage source file with multiple kernels, ramdisks and FDT blobs
+ * U-Boot uImage source file with multiple kernels, ramdisks and FDT blobs
  */
 
 /dts-v1/;
diff --git a/doc/uImage.FIT/source_file_format.txt b/doc/uImage.FIT/source_file_format.txt
index 029f481..3175c9f 100644
--- a/doc/uImage.FIT/source_file_format.txt
+++ b/doc/uImage.FIT/source_file_format.txt
@@ -1,4 +1,4 @@
-U-boot new uImage source file format (bindings definition)
+U-Boot new uImage source file format (bindings definition)
 ==========================================================
 
 Author: Marian Balakowicz <m8@semihalf.com>
@@ -14,7 +14,7 @@
 replace direct passing of 'struct bd_info' which was used to boot pre-FDT
 kernels.
 
-However, U-boot needs to support both techniques to provide backward
+However, U-Boot needs to support both techniques to provide backward
 compatibility for platforms which are not FDT ready. Number of elements
 playing role in the booting process has increased and now includes the FDT
 blob. Kernel image, FDT blob and possibly ramdisk image - all must be placed
@@ -36,15 +36,15 @@
 
 Libfdt has been selected for the new uImage format implementation as (1) it
 provides needed functionality, (2) is actively maintained and developed and
-(3) increases code reuse as it is already part of the U-boot source tree.
+(3) increases code reuse as it is already part of the U-Boot source tree.
 
 b) Terminology
 
 This document defines new uImage structure by providing FDT bindings for new
-uImage internals. Bindings are defined from U-boot perspective, i.e. describe
-final form of the uImage at the moment when it reaches U-boot. User
+uImage internals. Bindings are defined from U-Boot perspective, i.e. describe
+final form of the uImage at the moment when it reaches U-Boot. User
 perspective may be simpler, as some of the properties (like timestamps and
-hashes) will need to be filled in automatically by the U-boot mkimage tool.
+hashes) will need to be filled in automatically by the U-Boot mkimage tool.
 
 To avoid confusion with the kernel FDT the following naming convention is
 proposed for the new uImage format related terms:
@@ -61,7 +61,7 @@
 
 The following picture shows how the new uImage is prepared. Input consists of
 image source file (.its) and a set of data files. Image is created with the
-help of standard U-boot mkimage tool which in turn uses dtc (device tree
+help of standard U-Boot mkimage tool which in turn uses dtc (device tree
 compiler) to produce image tree blob (.itb).  Resulting .itb file is the
 actual binary of a new uImage.
 
diff --git a/drivers/block/mvsata_ide.c b/drivers/block/mvsata_ide.c
index 2c6d424..7b6a155 100644
--- a/drivers/block/mvsata_ide.c
+++ b/drivers/block/mvsata_ide.c
@@ -83,7 +83,7 @@
  * Status codes to return to client callers. Currently, callers ignore
  * exact value and only care for zero or nonzero, so no need to make this
  * public, it is only #define'd for clarity.
- * If/when standard negative codes are implemented in U-boot, then these
+ * If/when standard negative codes are implemented in U-Boot, then these
  * #defines should be moved to, or replaced by ones from, the common list
  * of status codes.
  */
diff --git a/drivers/ddr/marvell/axp/ddr3_hw_training.c b/drivers/ddr/marvell/axp/ddr3_hw_training.c
index a8c5e6a..c8d7041 100644
--- a/drivers/ddr/marvell/axp/ddr3_hw_training.c
+++ b/drivers/ddr/marvell/axp/ddr3_hw_training.c
@@ -450,7 +450,7 @@
 	ddr3_set_performance_params(&dram_info);
 
 	if (dram_info.ecc_ena) {
-		/* Need to SCRUB the DRAM memory area to load U-boot */
+		/* Need to SCRUB the DRAM memory area to load U-Boot */
 		mv_sys_xor_finish();
 		dram_info.num_cs = 1;
 		dram_info.cs_ena = 1;
diff --git a/drivers/gpio/db8500_gpio.c b/drivers/gpio/db8500_gpio.c
index d5cb383..db32db6 100644
--- a/drivers/gpio/db8500_gpio.c
+++ b/drivers/gpio/db8500_gpio.c
@@ -1,14 +1,14 @@
 /*
  * Code ported from Nomadik GPIO driver in ST-Ericsson Linux kernel code.
  * The purpose is that GPIO config found in kernel should work by simply
- * copy-paste it to U-boot.
+ * copy-paste it to U-Boot.
  *
  * Original Linux authors:
  * Copyright (C) 2008,2009 STMicroelectronics
  * Copyright (C) 2009 Alessandro Rubini <rubini@unipv.it>
  *   Rewritten based on work by Prafulla WADASKAR <prafulla.wadaskar@st.com>
  *
- * Ported to U-boot by:
+ * Ported to U-Boot by:
  * Copyright (C) 2010 Joakim Axelsson <joakim.axelsson AT stericsson.com>
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/drivers/mmc/sh_sdhi.c b/drivers/mmc/sh_sdhi.c
index cc62c89..30e538c 100644
--- a/drivers/mmc/sh_sdhi.c
+++ b/drivers/mmc/sh_sdhi.c
@@ -526,7 +526,7 @@
 	opc = sh_sdhi_set_cmd(host, data, opc);
 
 	/*
-	 *  U-boot cannot use interrupt.
+	 *  U-Boot cannot use interrupt.
 	 *  So this flag may not be clear by timing
 	 */
 	sh_sdhi_writew(host, SDHI_INFO1, ~INFO1_RESP_END);
diff --git a/drivers/mtd/nand/fsl_ifc_spl.c b/drivers/mtd/nand/fsl_ifc_spl.c
index fccbfb5..cbeb74a 100644
--- a/drivers/mtd/nand/fsl_ifc_spl.c
+++ b/drivers/mtd/nand/fsl_ifc_spl.c
@@ -236,7 +236,7 @@
 
 /*
  * Main entrypoint for NAND Boot. It's necessary that SDRAM is already
- * configured and available since this code loads the main U-boot image
+ * configured and available since this code loads the main U-Boot image
  * from NAND into SDRAM and starts from there.
  */
 void nand_boot(void)
diff --git a/drivers/mtd/nand/lpc32xx_nand_slc.c b/drivers/mtd/nand/lpc32xx_nand_slc.c
index 2e5f139..4e1be36 100644
--- a/drivers/mtd/nand/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/lpc32xx_nand_slc.c
@@ -516,7 +516,7 @@
 /*
  * LPC32xx has only one SLC NAND controller, don't utilize
  * CONFIG_SYS_NAND_SELF_INIT to be able to reuse this function
- * both in SPL NAND and U-boot images.
+ * both in SPL NAND and U-Boot images.
  */
 int board_nand_init(struct nand_chip *lpc32xx_chip)
 {
diff --git a/drivers/mtd/nand/mxc_nand_spl.c b/drivers/mtd/nand/mxc_nand_spl.c
index 69b736a..6ac2c96 100644
--- a/drivers/mtd/nand/mxc_nand_spl.c
+++ b/drivers/mtd/nand/mxc_nand_spl.c
@@ -337,7 +337,7 @@
 	if (!nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
 			CONFIG_SYS_NAND_U_BOOT_SIZE,
 			(uchar *)CONFIG_SYS_NAND_U_BOOT_DST)) {
-		/* Copy from NAND successful, start U-boot */
+		/* Copy from NAND successful, start U-Boot */
 		uboot = (void *)CONFIG_SYS_NAND_U_BOOT_START;
 		uboot();
 	} else {
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 70fc02e..6a434d7 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -5380,7 +5380,7 @@
 	for (i = 0; (devno = pci_find_devices(e1000_supported, i)) >= 0; i++) {
 		/*
 		 * These will never get freed due to errors, this allows us to
-		 * perform SPI EEPROM programming from U-boot, for example.
+		 * perform SPI EEPROM programming from U-Boot, for example.
 		 */
 		struct eth_device *nic = malloc(sizeof(*nic));
 		struct e1000_hw *hw = malloc(sizeof(*hw));
diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c
index fdbd584..53c4966 100644
--- a/drivers/net/fsl-mc/mc.c
+++ b/drivers/net/fsl-mc/mc.c
@@ -455,7 +455,7 @@
 
 	/*
 	 * Management Complex cores should be held at reset out of POR.
-	 * U-boot should be the first software to touch MC. To be safe,
+	 * U-Boot should be the first software to touch MC. To be safe,
 	 * we reset all cores again by setting GCR1 to 0. It doesn't do
 	 * anything if they are held at reset. After we setup the firmware
 	 * we kick off MC by deasserting the reset bit for core 0, and
diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c
index c4dd01e..3526876 100644
--- a/drivers/net/lan91c96.c
+++ b/drivers/net/lan91c96.c
@@ -1,7 +1,7 @@
 /*------------------------------------------------------------------------
  * lan91c96.c
  * This is a driver for SMSC's LAN91C96 single-chip Ethernet device, based
- * on the SMC91111 driver from U-boot.
+ * on the SMC91111 driver from U-Boot.
  *
  * (C) Copyright 2002
  * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c
index 887cfd9..71d133c 100644
--- a/drivers/net/ne2000_base.c
+++ b/drivers/net/ne2000_base.c
@@ -650,7 +650,7 @@
 }
 
 
-/* U-boot specific routines */
+/* U-Boot specific routines */
 static u8 *pbuf = NULL;
 
 static int pkey = -1;
diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c
index 45dff98..58f882b 100644
--- a/drivers/serial/sandbox.c
+++ b/drivers/serial/sandbox.c
@@ -25,7 +25,7 @@
 /*
  *
  *   serial_buf: A buffer that holds keyboard characters for the
- *		 Sandbox U-boot.
+ *		 Sandbox U-Boot.
  *
  * invariants:
  *   serial_buf_write		 == serial_buf_read -> empty buffer
diff --git a/drivers/serial/serial_bfin.c b/drivers/serial/serial_bfin.c
index 0443b84..1d5be2a 100644
--- a/drivers/serial/serial_bfin.c
+++ b/drivers/serial/serial_bfin.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - serial.c Blackfin Serial Driver
+ * U-Boot - serial.c Blackfin Serial Driver
  *
  * Copyright (c) 2005-2008 Analog Devices Inc.
  *
diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
index 99345eb..69f680c 100644
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@ -1,5 +1,5 @@
 #
-# Makefile for the U-boot SOC specific device drivers.
+# Makefile for the U-Boot SOC specific device drivers.
 #
 # SPDX-License-Identifier:	GPL-2.0+
 #
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index a13b21d..60f9272 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -2,7 +2,7 @@
  * composite.c - infrastructure for Composite USB Gadgets
  *
  * Copyright (C) 2006-2008 David Brownell
- * U-boot porting: Lukasz Majewski <l.majewski@samsung.com>
+ * U-Boot porting: Lukasz Majewski <l.majewski@samsung.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
diff --git a/drivers/usb/gadget/config.c b/drivers/usb/gadget/config.c
index 014a679..64284b0 100644
--- a/drivers/usb/gadget/config.c
+++ b/drivers/usb/gadget/config.c
@@ -5,7 +5,7 @@
  *
  * SPDX-License-Identifier:	GPL-2.0+
  *
- * Ported to U-boot by: Thomas Smits <ts.smits@gmail.com> and
+ * Ported to U-Boot by: Thomas Smits <ts.smits@gmail.com> and
  *                      Remy Bohmer <linux@bohmer.net>
  */
 
diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c
index 6ddbe83..a53a6dc 100644
--- a/drivers/usb/gadget/epautoconf.c
+++ b/drivers/usb/gadget/epautoconf.c
@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier:	GPL-2.0+
  *
- * Ported to U-boot by: Thomas Smits <ts.smits@gmail.com> and
+ * Ported to U-Boot by: Thomas Smits <ts.smits@gmail.com> and
  *                      Remy Bohmer <linux@bohmer.net>
  */
 
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index cfe9a24..9b06f02 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -256,7 +256,7 @@
 #if defined(CONFIG_USBNET_MANUFACTURER)
 static char *iManufacturer = CONFIG_USBNET_MANUFACTURER;
 #else
-static char *iManufacturer = "U-boot";
+static char *iManufacturer = "U-Boot";
 #endif
 
 /* These probably need to be configurable. */
diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h
index e9811c3..973cd97 100644
--- a/drivers/usb/gadget/gadget_chips.h
+++ b/drivers/usb/gadget/gadget_chips.h
@@ -11,7 +11,7 @@
  * Some are available on 2.4 kernels; several are available, but not
  * yet pushed in the 2.6 mainline tree.
  *
- * Ported to U-boot by: Thomas Smits <ts.smits@gmail.com> and
+ * Ported to U-Boot by: Thomas Smits <ts.smits@gmail.com> and
  *                      Remy Bohmer <linux@bohmer.net>
  */
 #ifdef CONFIG_USB_GADGET_NET2280
diff --git a/drivers/usb/gadget/usbstring.c b/drivers/usb/gadget/usbstring.c
index 8c3ff64..3e24fbf 100644
--- a/drivers/usb/gadget/usbstring.c
+++ b/drivers/usb/gadget/usbstring.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier:	LGPL-2.1+
  *
- * Ported to U-boot by: Thomas Smits <ts.smits@gmail.com> and
+ * Ported to U-Boot by: Thomas Smits <ts.smits@gmail.com> and
  *                      Remy Bohmer <linux@bohmer.net>
  */
 
diff --git a/examples/standalone/README.smc91111_eeprom b/examples/standalone/README.smc91111_eeprom
index f73a8d3..0d8bc63 100644
--- a/examples/standalone/README.smc91111_eeprom
+++ b/examples/standalone/README.smc91111_eeprom
@@ -7,14 +7,14 @@
 
 Contents:
 ------------------------
-1. Ensuring U-boot's MAC address can be set in hardware
+1. Ensuring U-Boot's MAC address can be set in hardware
 2. Running the smc91111_eeprom program
 3. Setting MAC addresses
 4. Other things you can do with this
 5. Things to be done.
 
 
-1. Ensuring U-boot's MAC address can be set in hardware
+1. Ensuring U-Boot's MAC address can be set in hardware
 --------------------------------------------------------------------------
 
 On the Internet - MAC addresses are very important. Short for Media
@@ -130,14 +130,14 @@
 The MAC address can be stored in four locations:
 
 -Boot environmental variable in Flash <- can not change, without
-					  re-flashing U-boot.
+					  re-flashing U-Boot.
 U-Boot environmental variable	       <- can not change, without
 					  resetting board/U-Boot
 LAN91C111 Registers		       <- volatile
 LAN91C111 EEPROM		       <- Non-volatile
 
 If you have not activated the network, and do not have a hardcoded
-or pre-assigned MAC address in U-boot, the environmental variables
+or pre-assigned MAC address in U-Boot, the environmental variables
 should be blank, and allow you to set things one time.
 
 To set the EEPROM MAC address to 12:34:56:78:9A:BC
diff --git a/examples/standalone/smc91111_eeprom.c b/examples/standalone/smc91111_eeprom.c
index afecbb1..38faded 100644
--- a/examples/standalone/smc91111_eeprom.c
+++ b/examples/standalone/smc91111_eeprom.c
@@ -6,7 +6,7 @@
  *
  * Heavily borrowed from the following peoples GPL'ed software:
  *  - Wolfgang Denk, DENX Software Engineering, wd@denx.de
- *       Das U-boot
+ *       Das U-Boot
  *  - Ladislav Michl ladis@linux-mips.org
  *       A rejected patch on the U-Boot mailing list
  */
diff --git a/examples/standalone/smc911x_eeprom.c b/examples/standalone/smc911x_eeprom.c
index 364ad2d..2c05ed9 100644
--- a/examples/standalone/smc911x_eeprom.c
+++ b/examples/standalone/smc911x_eeprom.c
@@ -9,7 +9,7 @@
  * Based on smc91111_eeprom.c which:
  * Heavily borrowed from the following peoples GPL'ed software:
  *  - Wolfgang Denk, DENX Software Engineering, wd@denx.de
- *       Das U-boot
+ *       Das U-Boot
  *  - Ladislav Michl ladis@linux-mips.org
  *       A rejected patch on the U-Boot mailing list
  */
diff --git a/include/asm-generic/errno.h b/include/asm-generic/errno.h
index 523defb..464cfb7 100644
--- a/include/asm-generic/errno.h
+++ b/include/asm-generic/errno.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - errno.h Error number defines
+ * U-Boot - errno.h Error number defines
  *
  * Copyright (c) 2005-2007 Analog Devices Inc.
  *
diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
index 9d1de55..0f85cd0 100644
--- a/include/config_distro_defaults.h
+++ b/include/config_distro_defaults.h
@@ -24,15 +24,15 @@
 #define CONFIG_BOOTP_PXE_CLIENTARCH     0x100
 #if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__)
 #if !defined(CONFIG_BOOTP_VCI_STRING)
-#define CONFIG_BOOTP_VCI_STRING         "U-boot.armv7"
+#define CONFIG_BOOTP_VCI_STRING         "U-Boot.armv7"
 #endif
 #elif defined(__aarch64__)
 #if !defined(CONFIG_BOOTP_VCI_STRING)
-#define CONFIG_BOOTP_VCI_STRING         "U-boot.armv8"
+#define CONFIG_BOOTP_VCI_STRING         "U-Boot.armv8"
 #endif
 #else
 #if !defined(CONFIG_BOOTP_VCI_STRING)
-#define CONFIG_BOOTP_VCI_STRING         "U-boot.arm"
+#define CONFIG_BOOTP_VCI_STRING         "U-Boot.arm"
 #endif
 #endif
 #elif defined(__i386__)
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 342fdfe..535dc6e 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 2499b39..f6c0147 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 36637ae..658b16d 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 597f1cd..68a91a6 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 84bb044..9f44ebd 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 d12963a..5a6067e 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 35a2228..e9d900e 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 2f3dec5..dd62e7e 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 aee7761..44de44f 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 51814a6..6b51201 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 1b7290e..9581101 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 4876169..c8c48ae 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 4fbdca7..be474ad 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 2474adb..5794f47 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 89d2604..6d4a93b 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 f250cdb..b178713 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 b1d4f26..55becdc 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 65009c6..8198cb8 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 92251fc..31862da 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 efbc6c2..1a3b33f 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 b5d4847..3e0bff5 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 60650aa..b9e859c 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 16949aa..a262e79 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 7dda472..85f31a4 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 e9e4e14..761e2c5 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 a464785..d06333d 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 0eebe56..746a5bd 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 3a2d726..71008aa 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 cde23ad..37205a9 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 9d8a2c6..284ec83 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 8e70d8c..67a143f 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 3b2da0d..c46e60d 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 9fce1cd..7bc58dc 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 d854341..4896498 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 9c3ea88..834a22f 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 4757929..7cb2346 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 0993ffa..3638648 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 4a7ba24..534ebb6 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 876ee30..2c2ce7b 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 863b032..3813e25 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 d5f517c..a541613 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 1dd71a8..996f772 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 2004d14..0f16a6e 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 27cd9be..23a8a07 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 124e8c6..bb908fa 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 ef80bf6..fa71874 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 2e5ce75..1af9ef7 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 7148f1d..0fd2caf 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 2492f99..b7ac402 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 d2630f4..a309448 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 f421321..6db628a 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 1e74535..0f4d959 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 a8947c5..fc98d24 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 2f6c97c..50e1abb 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 599b269..bf89a0e 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 814934a..133041b 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 59b6310..883e58e 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 a4ffdf5..4385027 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 71233d8..99be50a 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 */
diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index efb04ee..8e2f15a 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - linkage.h
+ * U-Boot - linkage.h
  *
  * Copyright (c) 2005-2007 Analog Devices Inc.
  *
diff --git a/include/linux/usb/cdc.h b/include/linux/usb/cdc.h
index c1d039c..442316b 100644
--- a/include/linux/usb/cdc.h
+++ b/include/linux/usb/cdc.h
@@ -5,7 +5,7 @@
  * notably ethernet adapters and various modems.  It's used mostly with
  * firmware based USB peripherals.
  *
- * Ported to U-boot by: Thomas Smits <ts.smits@gmail.com> and
+ * Ported to U-Boot by: Thomas Smits <ts.smits@gmail.com> and
  *                      Remy Bohmer <linux@bohmer.net>
  */
 
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index 4adf35e..b824f13 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -11,7 +11,7 @@
  *
  * This software is licensed under the GNU GPL version 2.
  *
- * Ported to U-boot by: Thomas Smits <ts.smits@gmail.com> and
+ * Ported to U-Boot by: Thomas Smits <ts.smits@gmail.com> and
  *                      Remy Bohmer <linux@bohmer.net>
  */
 
diff --git a/lib/Kconfig b/lib/Kconfig
index 46d7034..c7eab46 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -16,7 +16,7 @@
 	depends on HAVE_PRIVATE_LIBGCC
 	help
 	  This option allows you to use the built-in libgcc implementation
-	  of U-boot instead of the one privided by the compiler.
+	  of U-Boot instead of the one privided by the compiler.
 	  If unsure, say N.
 
 config SYS_HZ
diff --git a/lib/zlib/inffast.c b/lib/zlib/inffast.c
index 0700e04..e3c7f3b 100644
--- a/lib/zlib/inffast.c
+++ b/lib/zlib/inffast.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* U-boot: we already included these
+/* U-Boot: we already included these
 #include "zutil.h"
 #include "inftrees.h"
 #include "inflate.h"
diff --git a/lib/zlib/inftrees.c b/lib/zlib/inftrees.c
index 7474a52..b71b969 100644
--- a/lib/zlib/inftrees.c
+++ b/lib/zlib/inftrees.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* U-boot: we already included these
+/* U-Boot: we already included these
 #include "zutil.h"
 #include "inftrees.h"
 */
diff --git a/lib/zlib/zutil.h b/lib/zlib/zutil.h
index 7e05c3b..e63bf68 100644
--- a/lib/zlib/zutil.h
+++ b/lib/zlib/zutil.h
@@ -95,7 +95,7 @@
 
 /* Diagnostic functions */
 #ifdef DEBUG
-/* Not valid for U-boot
+/* Not valid for U-Boot
 #  include <stdio.h> */
    extern int z_verbose;
    extern void z_error    OF((char *m));
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index 074234f..e8e8c77 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -123,7 +123,7 @@
 char *target;
 char *depfile;
 char *cmdline;
-int is_spl_build = 0; /* hack for U-boot */
+int is_spl_build = 0; /* hack for U-Boot */
 
 static void usage(void)
 {
@@ -459,7 +459,7 @@
 	target = argv[2];
 	cmdline = argv[3];
 
-	/* hack for U-boot */
+	/* hack for U-Boot */
 	if (!strncmp(target, "spl/", 4) || !strncmp(target, "tpl/", 4))
 		is_spl_build = 1;
 
diff --git a/tools/palmtreo680/flash_u-boot.c b/tools/palmtreo680/flash_u-boot.c
index 3d8296f..832d3fe 100644
--- a/tools/palmtreo680/flash_u-boot.c
+++ b/tools/palmtreo680/flash_u-boot.c
@@ -97,7 +97,7 @@
 		return -errsv;
 	}
 	printf("The mtd partition contains %d blocks\n", devinfo.eb_cnt);
-	printf("U-boot will occupy %d blocks\n", num_blocks);
+	printf("U-Boot will occupy %d blocks\n", num_blocks);
 	if (num_blocks > devinfo.eb_cnt) {
 		fprintf(stderr, "Insufficient blocks on partition\n");
 		return -EINVAL;
diff --git a/tools/patman/README b/tools/patman/README
index 5bd74c4..e36857d 100644
--- a/tools/patman/README
+++ b/tools/patman/README
@@ -138,7 +138,7 @@
 How to install it
 =================
 
-The most up to date version of patman can be found in the U-boot sources.
+The most up to date version of patman can be found in the U-Boot sources.
 However to use it on other projects it may be more convenient to install it as
 a standalone application. A distutils installer is included, this can be used
 to install patman: