Replace all occurences of UBoot with U-Boot

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

7 files changed, 10 insertions, 10 deletions

diff --git a/Documentation/developers_manual.dox b/Documentation/developers_manual.dox
index 0eca7e1a2d..3163c9447f 100644
--- a/Documentation/developers_manual.dox
+++ b/Documentation/developers_manual.dox
@@ -2,11 +2,11 @@
 
 This part of the documentation is intended for developers.
 
-Some background knowledge for some frameworks in UBootv2
+Some background knowledge for some frameworks in U-Boot v2
 
  - @subpage driver_model
 
-Hints and tips for simply adapting UBootv2
+Hints and tips for simply adapting U-Boot v2
 
  - @subpage dev_board
  - @subpage dev_cpu
diff --git a/Documentation/users_manual.dox b/Documentation/users_manual.dox
index 58f87a0b45..1decdc06a1 100644
--- a/Documentation/users_manual.dox
+++ b/Documentation/users_manual.dox
@@ -1,6 +1,6 @@
 /** @page users_manual User's Manual
 
-FIXME: Hints and tips for simply using UBootv2
+FIXME: Hints and tips for simply using U-Boot v2
 
 
  - @subpage shell_notes
diff --git a/arch/arm/mach-arm.dox b/arch/arm/mach-arm.dox
index 4c810956ce..8443b731aa 100644
--- a/arch/arm/mach-arm.dox
+++ b/arch/arm/mach-arm.dox
@@ -1,5 +1,5 @@
 /* This document is intended to provide the developer with information
- * how to integrate a new CPU (MACH) into this part of the UBoot tree
+ * how to integrate a new CPU (MACH) into this part of the U-Boot tree
  */
 
 /** @page dev_arm_mach ARM based CPU (MACH) into the tree
@@ -25,9 +25,9 @@ As its board specific, your can do whatever you need to bring your board up.
 When <board_init_lowlevel> returns it will be assumed there is now a working
 RAM that can be used for all further steps.
 
-Next step is relocation of UBoot itself. It gets copied to RAM and the last
+Next step is relocation of U-Boot itself. It gets copied to RAM and the last
 assembler instruction is a jump into <start_uboot>. This target address is
-the first C instruction in UBoot. At this point of time:
+the first C instruction in U-Boot. At this point of time:
 "runtime address == link address".
 
 */
diff --git a/arch/blackfin/mach-bf.dox b/arch/blackfin/mach-bf.dox
index 9812acec35..d40595779f 100644
--- a/arch/blackfin/mach-bf.dox
+++ b/arch/blackfin/mach-bf.dox
@@ -1,5 +1,5 @@
 /* This document is intended to provide the developer with information
- * how to integrate a new CPU (MACH) into this part of the UBoot tree
+ * how to integrate a new CPU (MACH) into this part of the U-Boot tree
  */
 
 /** @page dev_bf_mach Blackfin based CPU (MACH) into the tree
diff --git a/arch/ppc/mach-ppc.dox b/arch/ppc/mach-ppc.dox
index 01343a34eb..381909adbf 100644
--- a/arch/ppc/mach-ppc.dox
+++ b/arch/ppc/mach-ppc.dox
@@ -1,5 +1,5 @@
 /* This document is intended to provide the developer with information
- * how to integrate a new CPU (MACH) into this part of the UBoot tree
+ * how to integrate a new CPU (MACH) into this part of the U-Boot tree
  */
 
 /** @page dev_ppc_mach PowerPC based CPU into the tree
diff --git a/commands/mount.c b/commands/mount.c
index db47be724c..22794f0d7e 100644
--- a/commands/mount.c
+++ b/commands/mount.c
@@ -93,7 +93,7 @@ U_BOOT_CMD_END
  * root directory.
  */
 
-/** @page how_mount_works How mount works in UBoot
+/** @page how_mount_works How mount works in U-Boot
  *
  * Mounting a filesystem ontop of a device is working like devices and drivers
  * are finding together.
diff --git a/common/Kconfig b/common/Kconfig
index 9141cd52ae..94f9c52385 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -185,7 +185,7 @@ config SKIP_LOWLEVEL_INIT
 	prompt "Skip lowlevel init"
 	help
 	  This entry skips the SDRAM initialising on many ARM based boards.
-	  It enables using UBoot2 as a second stage bootloader.
+	  It enables using U-boot as a second stage bootloader.
 
 config ENABLE_FLASH_NOISE
 	bool