rename U-Boot-v2 project to barebox

This has been done with the following script: find -path ./.git -prune -o -type f -print0 | xargs -0 -r sed -i \ -e 's/u2boot/barebox/g' \ -e 's/U2Boot/barebox/g' \ -e 's/U-boot V2/barebox/g' \ -e 's/u-boot v2/barebox/g' \ -e 's/U-Boot V2/barebox/g' \ -e 's/U-Boot-v2/barebox/g' \ -e 's/U_BOOT/BAREBOX/g' \ -e 's/UBOOT/BAREBOX/g' \ -e 's/uboot/barebox/g' \ -e 's/u-boot/barebox/g' \ -e 's/u_boot/barebox/g' \ -e 's/U-Boot/barebox/g' \ -e 's/U-boot/barebox/g' \ -e 's/U-BOOT/barebox/g' find -path ./.git -prune -o \( -name "*u-boot*" -o -name "*uboot*" -o -name "*u_boot*" \) -print0 | \ xargs -0 -r rename 's/u[-_]?boot/barebox/' It needs some manual fixup following in the next patch Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
author: Sascha Hauer <s.hauer@pengutronix.de> 2009-12-15 09:11:09 +0100
committer: Sascha Hauer <s.hauer@pengutronix.de> 2009-12-15 10:18:30 +0100
commit: a3ffa97f40dc81f2d6b07ee964f2340fe0c1ba97 (patch)
tree: 7a9076c1a20df00baeadca9a07d4c1f5cd0611e2 /arch
parent: caa5cec7b1c93d660aa89d24eb160ab18e4eb628 (diff)
download: barebox-a3ffa97f40dc81f2d6b07ee964f2340fe0c1ba97.tar.gz
barebox-a3ffa97f40dc81f2d6b07ee964f2340fe0c1ba97.tar.xz
186 files changed, 620 insertions, 620 deletions
diff --git a/arch/architecture.dox b/arch/architecture.dox
index 238385275b..5f2b458797 100644
--- a/arch/architecture.dox
+++ b/arch/architecture.dox
@@ -5,7 +5,7 @@
 Never include an object file by name directly! Linker Script Files defines the
 layout, not the content. Content is defined in objecfiles instead.
 
-Don't rely on the given object file order to create your binary U-Boot v2! This
+Don't rely on the given object file order to create your binary barebox v2! This
 may work, but is not relyable in all cases (and its a very bad style)!
 
 For the special case some layout contraints exists, use specific section
@@ -19,11 +19,11 @@ For example the ARM architecture starts its reset code at address 0x0000000,
 the x86 architecture at 0x000FFFF0, PowerPC at 0x00000100 or 0xFFFFF100.
 
 So for the special reset code on all architectures it must be located at
-architecture specific locations within the binary U-Boot image.
+architecture specific locations within the binary barebox image.
 
 All reset code uses section ".text_entry" for its localisation within the
-binary U-Boot image. Its up to the linker script file to use this section name
-to find the right place in whatever environment and U-Boot sizes.
+binary barebox image. Its up to the linker script file to use this section name
+to find the right place in whatever environment and barebox sizes.
 
 @code
 	.section ".text_entry","ax"
@@ -45,7 +45,7 @@ Features required for every CPU:
 
 @section time_keeping Time keeping
 
-In U-Boot-v2 we are using the clocksource mechanism from the Linux Kernel.
+In barebox we are using the clocksource mechanism from the Linux Kernel.
 This makes it fairly easy to add timer functionality for a new board or
 architecture.
 
@@ -78,7 +78,7 @@ the Linux Kernel can be used nearly 1:1, except for the register accesses.
 Note: For clocksources the __lshrdi3 symbol is needed. You can find the
 function for your architecture in the Linux Kernel or a libc of your choice.
 
-Note: U-Boot-v2 expects an upward counting counter!
+Note: barebox expects an upward counting counter!
 
 @section reset_function Reset function
 
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a4b6c9eccf..8a8323ffe0 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -57,9 +57,9 @@ source arch/arm/mach-omap/Kconfig
 source arch/arm/mach-s3c24xx/Kconfig
 
 config AEABI
-	bool "Use the ARM EABI to compile u-boot"
+	bool "Use the ARM EABI to compile barebox"
 	help
-	  This option allows for u-boot to be compiled using the latest
+	  This option allows for barebox to be compiled using the latest
 	  ARM ABI (aka EABI).
 
 	  To use this you need GCC version 4.0.0 or later.
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 4f8421737e..47b002f9d9 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -82,11 +82,11 @@ CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -P
 ifndef CONFIG_MODULES
 # Add cleanup flags
 CPPFLAGS += -fdata-sections -ffunction-sections
-LDFLAGS_uboot += -static --gc-sections
+LDFLAGS_barebox += -static --gc-sections
 endif
 
-uboot.netx: uboot.bin
-	$(Q)scripts/gen_netx_image -i uboot.bin -o uboot.netx		\
+barebox.netx: barebox.bin
+	$(Q)scripts/gen_netx_image -i barebox.bin -o barebox.netx		\
 		--sdramctrl=$(CONFIG_NETX_SDRAM_CTRL)			\
 		--sdramtimctrl=$(CONFIG_NETX_SDRAM_TIMING_CTRL)		\
 		--memctrl=$(CONFIG_NETX_MEM_CTRL)			\
@@ -94,7 +94,7 @@ uboot.netx: uboot.bin
 		--cookie=$(CONFIG_NETX_COOKIE);
 
 ifeq ($(machine-y),netx)
-KBUILD_IMAGE := uboot.netx
+KBUILD_IMAGE := barebox.netx
 endif
 
 all: $(KBUILD_IMAGE)
@@ -120,7 +120,7 @@ endif
 common-y += $(BOARD) $(MACH)
 common-y += arch/arm/lib/ arch/arm/cpu/
 
-lds-$(CONFIG_GENERIC_LINKER_SCRIPT)	:= arch/arm/lib/u-boot.lds
-lds-$(CONFIG_BOARD_LINKER_SCRIPT)	:= $(BOARD)/u-boot.lds
+lds-$(CONFIG_GENERIC_LINKER_SCRIPT)	:= arch/arm/lib/barebox.lds
+lds-$(CONFIG_BOARD_LINKER_SCRIPT)	:= $(BOARD)/barebox.lds
 
-CLEAN_FILES += arch/arm/include/asm/mach-types.h arch/arm/lib/u-boot.lds
+CLEAN_FILES += arch/arm/include/asm/mach-types.h arch/arm/lib/barebox.lds
diff --git a/arch/arm/configs/a9m2410_defconfig b/arch/arm/configs/a9m2410_defconfig
index e973a30684..5cd1ac2ac0 100644
--- a/arch/arm/configs/a9m2410_defconfig
+++ b/arch/arm/configs/a9m2410_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-rc9
+# barebox version: 2.0.0-rc9
 # Wed Jul  1 14:15:55 2009
 #
 CONFIG_ARCH_TEXT_BASE=0x31fc0000
@@ -75,7 +75,7 @@ CONFIG_EXPERIMENTAL=y
 # CONFIG_KALLSYMS is not set
 CONFIG_MACH_HAS_LOWLEVEL_INIT=y
 CONFIG_MACH_DO_LOWLEVEL_INIT=y
-CONFIG_PROMPT="uboot:"
+CONFIG_PROMPT="barebox:"
 CONFIG_BAUDRATE=38400
 CONFIG_LONGHELP=y
 CONFIG_CBSIZE=1024
diff --git a/arch/arm/configs/a9m2440_defconfig b/arch/arm/configs/a9m2440_defconfig
index 5e49aab316..f77bb70ccc 100644
--- a/arch/arm/configs/a9m2440_defconfig
+++ b/arch/arm/configs/a9m2440_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-rc9
+# barebox version: 2.0.0-rc9
 # Wed Jul  1 14:23:41 2009
 #
 CONFIG_ARCH_TEXT_BASE=0x31fc0000
@@ -75,7 +75,7 @@ CONFIG_EXPERIMENTAL=y
 # CONFIG_KALLSYMS is not set
 CONFIG_MACH_HAS_LOWLEVEL_INIT=y
 CONFIG_MACH_DO_LOWLEVEL_INIT=y
-CONFIG_PROMPT="uboot:"
+CONFIG_PROMPT="barebox:"
 CONFIG_BAUDRATE=38400
 CONFIG_LONGHELP=y
 CONFIG_CBSIZE=1024
diff --git a/arch/arm/configs/at91sam9260ek_defconfig b/arch/arm/configs/at91sam9260ek_defconfig
index f198e5a409..258b82eea9 100644
--- a/arch/arm/configs/at91sam9260ek_defconfig
+++ b/arch/arm/configs/at91sam9260ek_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-rc5-git
+# barebox version: 2.0.0-rc5-git
 # Tue Oct 21 18:24:32 2008
 #
 CONFIG_ARCH_TEXT_BASE=0x23f00000
@@ -51,7 +51,7 @@ CONFIG_STACK_SIZE=0x8000
 CONFIG_MALLOC_SIZE=0x400000
 # CONFIG_BROKEN is not set
 # CONFIG_EXPERIMENTAL is not set
-CONFIG_PROMPT="uboot:"
+CONFIG_PROMPT="barebox:"
 CONFIG_BAUDRATE=115200
 CONFIG_LONGHELP=y
 CONFIG_CBSIZE=1024
diff --git a/arch/arm/configs/at91sam9263ek_defconfig b/arch/arm/configs/at91sam9263ek_defconfig
index b1f8b30390..c81371d57d 100644
--- a/arch/arm/configs/at91sam9263ek_defconfig
+++ b/arch/arm/configs/at91sam9263ek_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-rc10
+# barebox version: 2.0.0-rc10
 # Sat Sep 26 18:45:28 2009
 #
 CONFIG_ARCH_TEXT_BASE=0x23f00000
diff --git a/arch/arm/configs/eukrea_cpuimx27_defconfig b/arch/arm/configs/eukrea_cpuimx27_defconfig
index c54c340028..0e15bc56e8 100644
--- a/arch/arm/configs/eukrea_cpuimx27_defconfig
+++ b/arch/arm/configs/eukrea_cpuimx27_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-rc10
+# barebox version: 2.0.0-rc10
 # Thu Oct 22 16:38:29 2009
 #
 CONFIG_ARCH_TEXT_BASE=0xa0000000
@@ -84,7 +84,7 @@ CONFIG_MALLOC_SIZE=0x400000
 # CONFIG_EXPERIMENTAL is not set
 CONFIG_MACH_HAS_LOWLEVEL_INIT=y
 CONFIG_MACH_DO_LOWLEVEL_INIT=y
-CONFIG_PROMPT="uboot:"
+CONFIG_PROMPT="barebox:"
 CONFIG_BAUDRATE=115200
 CONFIG_LONGHELP=y
 CONFIG_CBSIZE=1024
diff --git a/arch/arm/configs/freescale_mx25_3stack_defconfig b/arch/arm/configs/freescale_mx25_3stack_defconfig
index 62ec009d91..d9cefd417a 100644
--- a/arch/arm/configs/freescale_mx25_3stack_defconfig
+++ b/arch/arm/configs/freescale_mx25_3stack_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-rc8
+# barebox version: 2.0.0-rc8
 # Wed Apr  8 13:06:07 2009
 #
 CONFIG_ARCH_TEXT_BASE=0x87f00000
@@ -67,7 +67,7 @@ CONFIG_MALLOC_SIZE=0x400000
 # CONFIG_EXPERIMENTAL is not set
 CONFIG_MACH_HAS_LOWLEVEL_INIT=y
 CONFIG_MACH_DO_LOWLEVEL_INIT=y
-CONFIG_PROMPT="uboot:"
+CONFIG_PROMPT="barebox:"
 CONFIG_BAUDRATE=115200
 # CONFIG_LONGHELP is not set
 CONFIG_CBSIZE=1024
diff --git a/arch/arm/configs/freescale_mx35_3stack_defconfig b/arch/arm/configs/freescale_mx35_3stack_defconfig
index 6dbea506e0..d48adf5ecf 100644
--- a/arch/arm/configs/freescale_mx35_3stack_defconfig
+++ b/arch/arm/configs/freescale_mx35_3stack_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-rc7
+# barebox version: 2.0.0-rc7
 # Mon Feb  2 16:43:49 2009
 #
 CONFIG_ARCH_TEXT_BASE=0x87f00000
@@ -64,7 +64,7 @@ CONFIG_MALLOC_SIZE=0x400000
 # CONFIG_EXPERIMENTAL is not set
 CONFIG_MACH_HAS_LOWLEVEL_INIT=y
 CONFIG_MACH_DO_LOWLEVEL_INIT=y
-CONFIG_PROMPT="uboot:"
+CONFIG_PROMPT="barebox:"
 CONFIG_BAUDRATE=115200
 CONFIG_LONGHELP=y
 CONFIG_CBSIZE=1024
diff --git a/arch/arm/configs/mmccpu_defconfig b/arch/arm/configs/mmccpu_defconfig
index af6e3cd4de..bc9bd6ac9a 100644
--- a/arch/arm/configs/mmccpu_defconfig
+++ b/arch/arm/configs/mmccpu_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-rc8
+# barebox version: 2.0.0-rc8
 # Tue May 19 09:44:44 2009
 #
 CONFIG_ARCH_TEXT_BASE=0x23f00000
@@ -67,7 +67,7 @@ CONFIG_MALLOC_SIZE=0x400000
 # CONFIG_EXPERIMENTAL is not set
 CONFIG_MACH_HAS_LOWLEVEL_INIT=y
 CONFIG_MACH_DO_LOWLEVEL_INIT=y
-CONFIG_PROMPT="uboot:"
+CONFIG_PROMPT="barebox:"
 CONFIG_BAUDRATE=115200
 CONFIG_LONGHELP=y
 CONFIG_CBSIZE=1024
diff --git a/arch/arm/configs/mx21ads_defconfig b/arch/arm/configs/mx21ads_defconfig
index 8c1a77ed12..6589ca8dba 100644
--- a/arch/arm/configs/mx21ads_defconfig
+++ b/arch/arm/configs/mx21ads_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-rc8
+# barebox version: 2.0.0-rc8
 # Tue Apr 28 08:40:15 2009
 #
 CONFIG_ARCH_TEXT_BASE=0xc0000000
@@ -67,7 +67,7 @@ CONFIG_MALLOC_SIZE=0x400000
 # CONFIG_EXPERIMENTAL is not set
 CONFIG_MACH_HAS_LOWLEVEL_INIT=y
 CONFIG_MACH_DO_LOWLEVEL_INIT=y
-CONFIG_PROMPT="uboot:"
+CONFIG_PROMPT="barebox:"
 CONFIG_BAUDRATE=115200
 CONFIG_LONGHELP=y
 CONFIG_CBSIZE=1024
diff --git a/arch/arm/configs/mx27ads_defconfig b/arch/arm/configs/mx27ads_defconfig
index 79f6e9fbf1..d40fbd2fb8 100644
--- a/arch/arm/configs/mx27ads_defconfig
+++ b/arch/arm/configs/mx27ads_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-rc5-git
+# barebox version: 2.0.0-rc5-git
 # Thu Aug 21 16:59:40 2008
 #
 CONFIG_ARCH_TEXT_BASE=0xa0000000
@@ -53,7 +53,7 @@ CONFIG_MALLOC_SIZE=0x400000
 # CONFIG_EXPERIMENTAL is not set
 CONFIG_MACH_HAS_LOWLEVEL_INIT=y
 CONFIG_MACH_DO_LOWLEVEL_INIT=y
-CONFIG_PROMPT="uboot:"
+CONFIG_PROMPT="barebox:"
 CONFIG_BAUDRATE=115200
 CONFIG_LONGHELP=y
 CONFIG_CBSIZE=1024
diff --git a/arch/arm/configs/netx_nxdb500_defconfig b/arch/arm/configs/netx_nxdb500_defconfig
index b84f6a39cc..531533307d 100644
--- a/arch/arm/configs/netx_nxdb500_defconfig
+++ b/arch/arm/configs/netx_nxdb500_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-rc5-git
+# barebox version: 2.0.0-rc5-git
 # Thu Jul  3 09:34:20 2008
 #
 CONFIG_ARCH_TEXT_BASE=0x81f00000
@@ -55,7 +55,7 @@ CONFIG_BROKEN=y
 # CONFIG_KALLSYMS is not set
 CONFIG_MACH_HAS_LOWLEVEL_INIT=y
 CONFIG_MACH_DO_LOWLEVEL_INIT=y
-CONFIG_PROMPT="uboot:"
+CONFIG_PROMPT="barebox:"
 CONFIG_BAUDRATE=115200
 CONFIG_CMDLINE_EDITING=y
 CONFIG_AUTO_COMPLETE=y
diff --git a/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig b/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig
index 0c6d398508..81bd0c1017 100644
--- a/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig
+++ b/arch/arm/configs/omap3430_sdp3430_per_uart_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-rc5-git
+# barebox version: 2.0.0-rc5-git
 # Wed Jun  4 13:18:29 2008
 #
 CONFIG_ARCH_TEXT_BASE=0x80e80000
diff --git a/arch/arm/configs/omap3530_beagle_per_uart_defconfig b/arch/arm/configs/omap3530_beagle_per_uart_defconfig
index f72b10c543..10e2a05a02 100644
--- a/arch/arm/configs/omap3530_beagle_per_uart_defconfig
+++ b/arch/arm/configs/omap3530_beagle_per_uart_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-rc5-git
+# barebox version: 2.0.0-rc5-git
 # Tue Jun 24 02:22:41 2008
 #
 CONFIG_ARCH_TEXT_BASE=0x80e80000
diff --git a/arch/arm/configs/pca100_defconfig b/arch/arm/configs/pca100_defconfig
index 25ca7ed2fe..7ae2065d71 100644
--- a/arch/arm/configs/pca100_defconfig
+++ b/arch/arm/configs/pca100_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-rc9
+# barebox version: 2.0.0-rc9
 #
 CONFIG_ARCH_TEXT_BASE=0xa7f00000
 CONFIG_BOARDINFO="Phytec phyCard-i.MX27"
@@ -68,7 +68,7 @@ CONFIG_MALLOC_SIZE=0x500000
 # CONFIG_EXPERIMENTAL is not set
 CONFIG_MACH_HAS_LOWLEVEL_INIT=y
 CONFIG_MACH_DO_LOWLEVEL_INIT=y
-CONFIG_PROMPT="uboot:"
+CONFIG_PROMPT="barebox:"
 CONFIG_BAUDRATE=115200
 CONFIG_LONGHELP=y
 CONFIG_CBSIZE=1024
diff --git a/arch/arm/configs/pcm037_defconfig b/arch/arm/configs/pcm037_defconfig
index c35d7aa661..b4fb2d9948 100644
--- a/arch/arm/configs/pcm037_defconfig
+++ b/arch/arm/configs/pcm037_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-rc5-git
+# barebox version: 2.0.0-rc5-git
 # Thu Jul  3 09:29:45 2008
 #
 CONFIG_ARCH_TEXT_BASE=0x87f00000
@@ -48,7 +48,7 @@ CONFIG_STACK_SIZE=0x8000
 CONFIG_MALLOC_SIZE=0x400000
 # CONFIG_BROKEN is not set
 # CONFIG_EXPERIMENTAL is not set
-CONFIG_PROMPT="uboot:"
+CONFIG_PROMPT="barebox:"
 CONFIG_BAUDRATE=115200
 CONFIG_CMDLINE_EDITING=y
 CONFIG_AUTO_COMPLETE=y
diff --git a/arch/arm/configs/pcm038_defconfig b/arch/arm/configs/pcm038_defconfig
index 88183d5197..0c9ac5fef2 100644
--- a/arch/arm/configs/pcm038_defconfig
+++ b/arch/arm/configs/pcm038_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-rc10
+# barebox version: 2.0.0-rc10
 # Wed Dec  9 17:03:10 2009
 #
 # CONFIG_BOARD_LINKER_SCRIPT is not set
@@ -91,7 +91,7 @@ CONFIG_MALLOC_SIZE=0x1000000
 # CONFIG_EXPERIMENTAL is not set
 CONFIG_MACH_HAS_LOWLEVEL_INIT=y
 CONFIG_MACH_DO_LOWLEVEL_INIT=y
-CONFIG_PROMPT="uboot:"
+CONFIG_PROMPT="barebox:"
 CONFIG_BAUDRATE=115200
 CONFIG_LONGHELP=y
 CONFIG_CBSIZE=1024
diff --git a/arch/arm/configs/pcm043_defconfig b/arch/arm/configs/pcm043_defconfig
index 0367929006..c4df354705 100644
--- a/arch/arm/configs/pcm043_defconfig
+++ b/arch/arm/configs/pcm043_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-rc8
+# barebox version: 2.0.0-rc8
 # Fri Apr 17 13:27:24 2009
 #
 CONFIG_ARCH_TEXT_BASE=0x87f00000
@@ -67,7 +67,7 @@ CONFIG_MALLOC_SIZE=0x400000
 # CONFIG_EXPERIMENTAL is not set
 CONFIG_MACH_HAS_LOWLEVEL_INIT=y
 CONFIG_MACH_DO_LOWLEVEL_INIT=y
-CONFIG_PROMPT="uboot:"
+CONFIG_PROMPT="barebox:"
 CONFIG_BAUDRATE=115200
 CONFIG_LONGHELP=y
 CONFIG_CBSIZE=1024
diff --git a/arch/arm/configs/pm9263_defconfig b/arch/arm/configs/pm9263_defconfig
index 9c9a0b7639..18543453c6 100644
--- a/arch/arm/configs/pm9263_defconfig
+++ b/arch/arm/configs/pm9263_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-rc5-git
+# barebox version: 2.0.0-rc5-git
 # Tue Aug 26 09:41:29 2008
 #
 CONFIG_ARCH_TEXT_BASE=0x23f00000
@@ -52,7 +52,7 @@ CONFIG_MALLOC_SIZE=0x400000
 # CONFIG_EXPERIMENTAL is not set
 CONFIG_MACH_HAS_LOWLEVEL_INIT=y
 CONFIG_MACH_DO_LOWLEVEL_INIT=y
-CONFIG_PROMPT="uboot:"
+CONFIG_PROMPT="barebox:"
 CONFIG_BAUDRATE=115200
 CONFIG_LONGHELP=y
 CONFIG_CBSIZE=1024
diff --git a/arch/arm/configs/scb9328_defconfig b/arch/arm/configs/scb9328_defconfig
index 71a53a7b29..d3d723f554 100644
--- a/arch/arm/configs/scb9328_defconfig
+++ b/arch/arm/configs/scb9328_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-git
+# barebox version: 2.0.0-git
 # Fri Oct 19 11:00:09 2007
 #
 CONFIG_ARCH_TEXT_BASE=0x08f80000
@@ -34,7 +34,7 @@ CONFIG_HAS_MODULES=y
 CONFIG_TEXT_BASE=0x08f80000
 # CONFIG_BROKEN is not set
 # CONFIG_EXPERIMENTAL is not set
-CONFIG_PROMPT="uboot:"
+CONFIG_PROMPT="barebox:"
 CONFIG_BAUDRATE=115200
 CONFIG_CMDLINE_EDITING=y
 # CONFIG_AUTO_COMPLETE is not set
diff --git a/arch/arm/cpu/cpu.c b/arch/arm/cpu/cpu.c
index 154f8cc46d..501e9b99e7 100644
--- a/arch/arm/cpu/cpu.c
+++ b/arch/arm/cpu/cpu.c
@@ -135,14 +135,14 @@ int icache_status (void)
  * Prepare a "clean" CPU for Linux to run
  * @return 0 (always)
  *
- * This function is called by the generic U-Boot part just before we call
+ * This function is called by the generic barebox part just before we call
  * Linux. It prepares the processor for Linux.
  */
 int cleanup_before_linux (void)
 {
 	int i;
 
-	shutdown_uboot();
+	shutdown_barebox();
 
 #ifdef CONFIG_MMU
 	mmu_disable();
@@ -158,7 +158,7 @@ int cleanup_before_linux (void)
  *
  * For ARM we never enable data cache so we do not need to disable it again.
  * Linux can be called with instruction cache enabled. As this is the
- * default setting we are running in U-Boot, there's no special preparation
+ * default setting we are running in barebox, there's no special preparation
  * required.
  */
 
@@ -180,8 +180,8 @@ static int do_icache(cmd_tbl_t *cmdtp, int argc, char *argv[])
 static const __maybe_unused char cmd_icache_help[] =
 "Usage: icache [0|1]\n";
 
-U_BOOT_CMD_START(icache)
+BAREBOX_CMD_START(icache)
 	.cmd		= do_icache,
 	.usage		= "show/change icache status",
-	U_BOOT_CMD_HELP(cmd_icache_help)
-U_BOOT_CMD_END
+	BAREBOX_CMD_HELP(cmd_icache_help)
+BAREBOX_CMD_END
diff --git a/arch/arm/cpu/cpuinfo.c b/arch/arm/cpu/cpuinfo.c
index b990cadee5..e7bcda9783 100644
--- a/arch/arm/cpu/cpuinfo.c
+++ b/arch/arm/cpu/cpuinfo.c
@@ -129,8 +129,8 @@ static int do_cpuinfo(cmd_tbl_t *cmdtp, int argc, char *argv[])
 	return 0;
 }
 
-U_BOOT_CMD_START(cpuinfo)
+BAREBOX_CMD_START(cpuinfo)
 	.cmd            = do_cpuinfo,
 	.usage          = "Show info about CPU",
-U_BOOT_CMD_END
+BAREBOX_CMD_END
 
diff --git a/arch/arm/cpu/start-arm.S b/arch/arm/cpu/start-arm.S
index 8ad03e410a..43bc5dddda 100644
--- a/arch/arm/cpu/start-arm.S
+++ b/arch/arm/cpu/start-arm.S
@@ -83,8 +83,8 @@ _fiq:			.word fiq
 /*
  * These are defined in the board-specific linker script.
  */
-.globl _u_boot_start
-_u_boot_start:
+.globl _barebox_start
+_barebox_start:
 	.word _start
 
 .globl _bss_start
@@ -210,13 +210,13 @@ finished_inval:
 	bl	board_init_lowlevel
 #endif
 
-relocate:				/* relocate U-Boot to RAM	    */
+relocate:				/* relocate barebox to RAM	    */
 	adr	r0, _start		/* r0 <- current position of code   */
 	ldr	r1, _TEXT_BASE		/* test if we run from flash or RAM */
 	cmp     r0, r1                  /* don't reloc during debug         */
 	beq     stack_setup
 
-	ldr	r2, _u_boot_start
+	ldr	r2, _barebox_start
 	ldr	r3, _bss_start
 	sub	r2, r3, r2		/* r2 <- size of armboot            */
 	add	r2, r0, r2		/* r2 <- source end address         */
@@ -246,4 +246,4 @@ clbss_l:
 	ldr	pc, _start_armboot
 
 _start_armboot:
-	.word start_uboot
+	.word start_barebox
diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/barebox-arm.h
index 539135add0..6a00d10d1d 100644
--- a/arch/arm/include/asm/u-boot-arm.h
+++ b/arch/arm/include/asm/barebox-arm.h
@@ -26,8 +26,8 @@
  * MA 02111-1307 USA
  */
 
-#ifndef _U_BOOT_ARM_H_
-#define _U_BOOT_ARM_H_	1
+#ifndef _BAREBOX_ARM_H_
+#define _BAREBOX_ARM_H_	1
 
 /* for the following variables, see start.S */
 extern ulong _armboot_start;	/* code start */
@@ -41,4 +41,4 @@ int	cleanup_before_linux(void);
 int	board_init(void);
 int	dram_init (void);
 
-#endif	/* _U_BOOT_ARM_H_ */
+#endif	/* _BAREBOX_ARM_H_ */
diff --git a/arch/arm/include/asm/u-boot.h b/arch/arm/include/asm/barebox.h
index 298f9e37b1..c9372dab93 100644
--- a/arch/arm/include/asm/u-boot.h
+++ b/arch/arm/include/asm/barebox.h
@@ -26,16 +26,16 @@
  * MA 02111-1307 USA
  *
  ********************************************************************
- * NOTE: This header file defines an interface to U-Boot. Including
+ * NOTE: This header file defines an interface to barebox. Including
  * this (unmodified) header file in another file is considered normal
- * use of U-Boot, and does *not* fall under the heading of "derived
+ * use of barebox, and does *not* fall under the heading of "derived
  * work".
  ********************************************************************
  */
 
-#ifndef _U_BOOT_H_
-#define _U_BOOT_H_	1
+#ifndef _BAREBOX_H_
+#define _BAREBOX_H_	1
 
 //typedef struct bd_info {} bd_t;
 
-#endif	/* _U_BOOT_H_ */
+#endif	/* _BAREBOX_H_ */
diff --git a/arch/arm/lib/.gitignore b/arch/arm/lib/.gitignore
index 09f1be04eb..d1165788c9 100644
--- a/arch/arm/lib/.gitignore
+++ b/arch/arm/lib/.gitignore
@@ -1 +1 @@
-u-boot.lds
+barebox.lds
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
index 00e0ea5704..26c318b0eb 100644
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@ -20,5 +20,5 @@ obj-$(CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS)	+= memcpy.o
 obj-$(CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS)	+= memset.o
 
 obj-$(CONFIG_MODULES) += module.o
-extra-$(CONFIG_GENERIC_LINKER_SCRIPT) += u-boot.lds
+extra-$(CONFIG_GENERIC_LINKER_SCRIPT) += barebox.lds
 
diff --git a/arch/arm/lib/arm.c b/arch/arm/lib/arm.c
index 489424707e..8ac9ff4ae4 100644
--- a/arch/arm/lib/arm.c
+++ b/arch/arm/lib/arm.c
@@ -1,7 +1,7 @@
 #include <common.h>
 #include <init.h>
 #include <mem_malloc.h>
-#include <asm/u-boot-arm.h>
+#include <asm/barebox-arm.h>
 #include <asm-generic/memory_layout.h>
 #include <reloc.h>
 
diff --git a/arch/arm/lib/armlinux.c b/arch/arm/lib/armlinux.c
index 365a4d278d..25b7744b91 100644
--- a/arch/arm/lib/armlinux.c
+++ b/arch/arm/lib/armlinux.c
@@ -38,7 +38,7 @@
 #include <asm/byteorder.h>
 #include <asm/global_data.h>
 #include <asm/setup.h>
-#include <asm/u-boot-arm.h>
+#include <asm/barebox-arm.h>
 
 static struct tag *params;
 static int armlinux_architecture = 0;
@@ -244,7 +244,7 @@ static int do_bootz(cmd_tbl_t *cmdtp, int argc, char *argv[])
 	void *zimage;
 
 	if (argc != 2) {
-		u_boot_cmd_usage(cmdtp);
+		barebox_cmd_usage(cmdtp);
 		return 1;
 	}
 
@@ -300,11 +300,11 @@ static const __maybe_unused char cmd_bootz_help[] =
 "Usage: bootz [FILE]\n"
 "Boot a Linux zImage\n";
 
-U_BOOT_CMD_START(bootz)
+BAREBOX_CMD_START(bootz)
 	.cmd            = do_bootz,
 	.usage          = "bootz - start a zImage",
-	U_BOOT_CMD_HELP(cmd_bootz_help)
-U_BOOT_CMD_END
+	BAREBOX_CMD_HELP(cmd_bootz_help)
+BAREBOX_CMD_END
 #endif /* CONFIG_CMD_BOOTZ */
 
 #ifdef CONFIG_CMD_BOOTU
@@ -314,7 +314,7 @@ static int do_bootu(cmd_tbl_t *cmdtp, int argc, char *argv[])
 	const char *commandline = getenv("bootargs");
 
 	if (argc != 2) {
-		u_boot_cmd_usage(cmdtp);
+		barebox_cmd_usage(cmdtp);
 		return 1;
 	}
 
@@ -334,9 +334,9 @@ static int do_bootu(cmd_tbl_t *cmdtp, int argc, char *argv[])
 static const __maybe_unused char cmd_bootu_help[] =
 "Usage: bootu <address>\n";
 
-U_BOOT_CMD_START(bootu)
+BAREBOX_CMD_START(bootu)
 	.cmd            = do_bootu,
 	.usage          = "bootu - start a raw linux image",
-	U_BOOT_CMD_HELP(cmd_bootu_help)
-U_BOOT_CMD_END
+	BAREBOX_CMD_HELP(cmd_bootu_help)
+BAREBOX_CMD_END
 #endif /* CONFIG_CMD_BOOTU */
diff --git a/arch/arm/lib/u-boot.lds.S b/arch/arm/lib/barebox.lds.S
index a478281576..c8d1bb9d85 100644
--- a/arch/arm/lib/u-boot.lds.S
+++ b/arch/arm/lib/barebox.lds.S
@@ -22,7 +22,7 @@
  *
  */
 
-#include <asm-generic/u-boot.lds.h>
+#include <asm-generic/barebox.lds.h>
 
 OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
 OUTPUT_ARCH(arm)
@@ -55,16 +55,16 @@ SECTIONS
 	.got : { *(.got*) }
 
 	. = .;
-	__u_boot_cmd_start = .;
-	.u_boot_cmd : { U_BOOT_CMDS }
-	__u_boot_cmd_end = .;
+	__barebox_cmd_start = .;
+	.barebox_cmd : { BAREBOX_CMDS }
+	__barebox_cmd_end = .;
 
-	__u_boot_initcalls_start = .;
-	.u_boot_initcalls : { INITCALLS }
-	__u_boot_initcalls_end = .;
+	__barebox_initcalls_start = .;
+	.barebox_initcalls : { INITCALLS }
+	__barebox_initcalls_end = .;
 
 	__usymtab_start = .;
-	__usymtab : { U_BOOT_SYMS }
+	__usymtab : { BAREBOX_SYMS }
 	__usymtab_end = .;
 
 	. = ALIGN(4);
diff --git a/arch/arm/mach-arm.dox b/arch/arm/mach-arm.dox
index 106aa39df9..3b76f8e34a 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 U-Boot tree
+ * how to integrate a new CPU (MACH) into this part of the barebox tree
  */
 
 /** @page dev_arm_mach ARM based CPU (MACH) into the tree
@@ -26,14 +26,14 @@ In the case the boot happens from NAND flash memory, further steps are required.
 Most of the known processor devices are reading the first few blocks from the
 NAND flash memory into some kind of internal SRAM. This small part must be able
 to initialize the SDRAM controller and to read the remaining rest of the
-U-Boot-v2 binary from the NAND flash memory prior returning from \<board_init_lowlevel\>.
+barebox binary from the NAND flash memory prior returning from \<board_init_lowlevel\>.
 
 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 U-Boot itself (if not already done). 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 U-Boot. At this point of time:\n
+Next step is relocation of barebox itself (if not already done). It gets copied
+to RAM and the last assembler instruction is a jump into start_barebox(). This
+target address is the first C instruction in barebox. At this point of time:\n
 "runtime address == link address".
 
 @section mach_arm_files List of changes
diff --git a/arch/arm/mach-imx/clko.c b/arch/arm/mach-imx/clko.c
index 6a8072213c..b6efe8780a 100644
--- a/arch/arm/mach-imx/clko.c
+++ b/arch/arm/mach-imx/clko.c
@@ -46,9 +46,9 @@ static __maybe_unused char cmd_clko_help[] =
 "  -s  <source> Clock select. See Ref. Manual for valid sources. Use -1\n"
 "               for disabling clock output\n";
 
-U_BOOT_CMD_START(clko)
+BAREBOX_CMD_START(clko)
 	.cmd		= do_clko,
 	.usage		= "Adjust CLKO setting",
-	U_BOOT_CMD_HELP(cmd_clko_help)
-U_BOOT_CMD_END
+	BAREBOX_CMD_HELP(cmd_clko_help)
+BAREBOX_CMD_END
 
diff --git a/arch/arm/mach-imx/include/mach/u-boot.lds.h b/arch/arm/mach-imx/include/mach/barebox.lds.h
index 8e1eccda5b..8e1eccda5b 100644
--- a/arch/arm/mach-imx/include/mach/u-boot.lds.h
+++ b/arch/arm/mach-imx/include/mach/barebox.lds.h
diff --git a/arch/arm/mach-imx/speed.c b/arch/arm/mach-imx/speed.c
index e9b5ca01fd..76ab6b9bed 100644
--- a/arch/arm/mach-imx/speed.c
+++ b/arch/arm/mach-imx/speed.c
@@ -76,8 +76,8 @@ static int do_clocks (cmd_tbl_t *cmdtp, int argc, char *argv[])
 	return 0;
 }
 
-U_BOOT_CMD_START(dump_clocks)
+BAREBOX_CMD_START(dump_clocks)
 	.cmd		= do_clocks,
 	.usage		= "show clock frequencies",
-U_BOOT_CMD_END
+BAREBOX_CMD_END
 
diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c
index 4af945f4d6..76ae6bdfec 100644
--- a/arch/arm/mach-netx/generic.c
+++ b/arch/arm/mach-netx/generic.c
@@ -91,7 +91,7 @@ int loadxc(int xcno) {
 	memset32((void*)NETX_PA_XPEC(xcno) + XPEC_RAM_START, 0, 0x2000);
 	memset32((void*)NETX_PA_XMAC(xcno), 0, 0x800);
 
-	/* can't use u-boot memcpy here, we need 32bit accesses */
+	/* can't use barebox memcpy here, we need 32bit accesses */
 	if(xcno == 0) {
 		memcpy32((void*)(NETX_PA_XMAC(xcno) + XMAC_RPU_PROGRAM_START), rpu_eth0, sizeof(rpu_eth0));
 		memcpy32((void*)(NETX_PA_XMAC(xcno) + XMAC_TPU_PROGRAM_START), tpu_eth0, sizeof(tpu_eth0));
@@ -143,8 +143,8 @@ void reset_cpu(ulong addr)
 }
 
 
-U_BOOT_CMD_START(loadxc)
+BAREBOX_CMD_START(loadxc)
 	.cmd		= do_loadxc,
 	.usage		= "load xmac/xpec engine with ethernet firmware",
-U_BOOT_CMD_END
+BAREBOX_CMD_END
 
diff --git a/arch/arm/mach-omap/arch-omap.dox b/arch/arm/mach-omap/arch-omap.dox
index 857ca3eb5d..d5a7f8be35 100644
--- a/arch/arm/mach-omap/arch-omap.dox
+++ b/arch/arm/mach-omap/arch-omap.dox
@@ -1,10 +1,10 @@
 /* This document is intended to provide the developer with information
- * how to integrate a new OMAP Architecture into this part of the U-Boot tree
+ * how to integrate a new OMAP Architecture into this part of the barebox tree
  */
 
-/** @page dev_omap_arch Texas Instrument's OMAP Platforms in U-Boot V2
+/** @page dev_omap_arch Texas Instrument's OMAP Platforms in barebox
 
-This document highlights some of the factors for supporting Texas Instrument's OMAP platforms in U-Boot V2.
+This document highlights some of the factors for supporting Texas Instrument's OMAP platforms in barebox.
 
 @par Table of Contents
 @li @ref omap_boards
@@ -24,13 +24,13 @@ This document highlights some of the factors for supporting Texas Instrument's O
 
 @li @subpage arch/arm/mach-omap/omap3_generic.c
 
-@section omap_code_arch How is U-Boot V2 OMAP specific architecture code organized?
+@section omap_code_arch How is barebox OMAP specific architecture code organized?
 
-To understand the architecture of U-Boot V2 source code for OMAP processors, we need to understand a bit on OMAP itself.
+To understand the architecture of barebox source code for OMAP processors, we need to understand a bit on OMAP itself.
 
 A typical Texas Instrument's Open Multimedia Application Processor (OMAP) solution is built around ARM core with multiple on-the-silicon peripherals. It also has a TI Digital Signal Processor(DSP) and few hardware accelerators to cater to computing intensive applications such as encoder/decoders. See http://focus.ti.com/general/docs/wtbu/wtbugencontent.tsp?templateId=6123&navigationId=11988&contentId=4638 for further details.
 
-Essentially, OMAP is modular with on-silicon peripherals being reused across multiple OMAP versions. U-Boot V2 code organization is driven by this fact.
+Essentially, OMAP is modular with on-silicon peripherals being reused across multiple OMAP versions. barebox code organization is driven by this fact.
 
 Motivation for code organization is driven from:
 @li Clear distinction between architecture and board features.
@@ -53,13 +53,13 @@ All OMAP common headers are located here. Where we have to incorporate a OMAP va
 include/asm-arm/arch-omap/silicon.h contains includes for omapX-silicon.h which defines the base addresses for the peripherals on that platform. the usual convention is to use #define OMAP_SOMETHING_BASE to allow re-use.
 
 @section board_omap board/omap directory guidelines
-All Board specific files go here. In U-Boot V1, we always had to use common config file which is shared by other drivers to get serial, ethernet baseaddress etc.. we can easily use the device_d structure to handle it with U-Boot V2. This is more like programming for Linux kernel - it is pretty easy.
+All Board specific files go here. In barebox V1, we always had to use common config file which is shared by other drivers to get serial, ethernet baseaddress etc.. we can easily use the device_d structure to handle it with barebox. This is more like programming for Linux kernel - it is pretty easy.
 Each specific board file has board-XYZ.c and potentially and equivalent h file.
 
 We'd potentially use device_initcall and console_initcalls as required.
 
 @section omap_boot The OMAP boot path
-The normal flow is to look for arch_init_lowlevel in the required code. This would be the first function to be called after the ARM common code boots up(arch/arm/cpu/start-arm.S), the job of boot code on OMAP platform would be to preventing watchdog timer from kicking in and spoiling all the fun, setup OMAP clocks to the high performance mode, do other architecture specific initializations. There could be some additional stuff we may need to do based on the specific OMAP we support including setting up a usable interrupt vector table etc - some parts of the code may be desired to be in C code (to let normal humans understand without being an asm junkie), in such a case, U-Boot's stack setup is not ready yet, and we may need to setup a temporary SRAM based stack prior to execution. Some things to keep in mind while handling booting code, we might be executing in eXecute In Place (XIP) mode and that only an SRAM stack is setup. Using global variables or using constructs that create function jump tables is doomed to fail as the required area might not be writable or may not be even initialized. So code in this area tends to use lots of if conditions and local variables. Having C code doing the fun part is easy to maintain, so it is advisable to push as much as possible to C functions where possible.
+The normal flow is to look for arch_init_lowlevel in the required code. This would be the first function to be called after the ARM common code boots up(arch/arm/cpu/start-arm.S), the job of boot code on OMAP platform would be to preventing watchdog timer from kicking in and spoiling all the fun, setup OMAP clocks to the high performance mode, do other architecture specific initializations. There could be some additional stuff we may need to do based on the specific OMAP we support including setting up a usable interrupt vector table etc - some parts of the code may be desired to be in C code (to let normal humans understand without being an asm junkie), in such a case, barebox's stack setup is not ready yet, and we may need to setup a temporary SRAM based stack prior to execution. Some things to keep in mind while handling booting code, we might be executing in eXecute In Place (XIP) mode and that only an SRAM stack is setup. Using global variables or using constructs that create function jump tables is doomed to fail as the required area might not be writable or may not be even initialized. So code in this area tends to use lots of if conditions and local variables. Having C code doing the fun part is easy to maintain, so it is advisable to push as much as possible to C functions where possible.
 
 The responsibility of arch_init_lowlevel and related calls is to setup OMAP. No board specific initializations are to be done here.
 
@@ -69,7 +69,7 @@ Once this is past, the code returns back to arm common code (cpu/start-arm.S). H
 If the proper CONFIG_MACH_DO_LOWLEVEL_INIT flag is setup, board_init_lowlevel is called. This again would call a common file board/omap/platform.S which setups a temporary SRAM stack and bumps the control to board_init.
 Every Board in OMAP platform can potentially define a board_init and enable defconfig in arch/arm/configs directory. The responsibility here is to setup OMAP for board configurations - this includes SDRAM configuration and pin muxing configuration.
 
-Once this is complete, U-boot V2 boot process proceeds by calling init functions and finally entering shell prompt
+Once this is complete, barebox boot process proceeds by calling init functions and finally entering shell prompt
 
 board-XYZ file may potentially register every device it is interested in. You can check out how the code is organized in other board directories also, esentially, the method is as simple as:
 @code
diff --git a/arch/arm/mach-omap/include/mach/clocks.h b/arch/arm/mach-omap/include/mach/clocks.h
index 1221238de8..5c4701fe4f 100644
--- a/arch/arm/mach-omap/include/mach/clocks.h
+++ b/arch/arm/mach-omap/include/mach/clocks.h
@@ -6,7 +6,7 @@
  *
  * This includes each of the architecture Clock definitions under it.
  *
- * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
+ * Originally from http://linux.omap.com/pub/bootloader/3430sdp/barebox-v1.tar.gz
  */
 /*
  * (C) Copyright 2006-2008
diff --git a/arch/arm/mach-omap/include/mach/omap3-clock.h b/arch/arm/mach-omap/include/mach/omap3-clock.h
index 22694f2367..2a509d84fd 100644
--- a/arch/arm/mach-omap/include/mach/omap3-clock.h
+++ b/arch/arm/mach-omap/include/mach/omap3-clock.h
@@ -4,7 +4,7 @@
  *
  * FileName: include/asm-arm/arch-omap/omap3-clock.h
  *
- * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
+ * Originally from http://linux.omap.com/pub/bootloader/3430sdp/barebox-v1.tar.gz
  *
  */
 /*
diff --git a/arch/arm/mach-omap/include/mach/omap3-mux.h b/arch/arm/mach-omap/include/mach/omap3-mux.h
index 2badc3f851..258a122ef8 100644
--- a/arch/arm/mach-omap/include/mach/omap3-mux.h
+++ b/arch/arm/mach-omap/include/mach/omap3-mux.h
@@ -8,7 +8,7 @@
  * @see include/asm-arm/arch-omap/control.h
  * The @ref MUX_VAL macro uses the defines from this file
  *
- * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
+ * Originally from http://linux.omap.com/pub/bootloader/3430sdp/barebox-v1.tar.gz
  */
 /*
  * (C) Copyright 2006-2008
diff --git a/arch/arm/mach-omap/include/mach/sdrc.h b/arch/arm/mach-omap/include/mach/sdrc.h
index 9d2d2d1107..b9fecf81aa 100644
--- a/arch/arm/mach-omap/include/mach/sdrc.h
+++ b/arch/arm/mach-omap/include/mach/sdrc.h
@@ -4,7 +4,7 @@
  *
  * FileName: include/asm-arm/arch-omap/sdrc.h
  *
- * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
+ * Originally from http://linux.omap.com/pub/bootloader/3430sdp/barebox-v1.tar.gz
  */
 /*
  * (C) Copyright 2006-2008
diff --git a/arch/arm/mach-omap/include/mach/sys_info.h b/arch/arm/mach-omap/include/mach/sys_info.h
index 43967209f1..13e17d476f 100644
--- a/arch/arm/mach-omap/include/mach/sys_info.h
+++ b/arch/arm/mach-omap/include/mach/sys_info.h
@@ -7,7 +7,7 @@
  *
  * These are implemented by the System specific code in omapX-generic.c
  *
- * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
+ * Originally from http://linux.omap.com/pub/bootloader/3430sdp/barebox-v1.tar.gz
  */
 /*
  * (C) Copyright 2006-2008
diff --git a/arch/arm/mach-omap/include/mach/syslib.h b/arch/arm/mach-omap/include/mach/syslib.h
index c89f50b816..d7467435de 100644
--- a/arch/arm/mach-omap/include/mach/syslib.h
+++ b/arch/arm/mach-omap/include/mach/syslib.h
@@ -6,7 +6,7 @@
  *
  * Implemented by arch/arm/mach-omap/syslib.c
  *
- * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
+ * Originally from http://linux.omap.com/pub/bootloader/3430sdp/barebox-v1.tar.gz
  */
 /*
  * (C) Copyright 2004-2008
diff --git a/arch/arm/mach-omap/omap3_clock.c b/arch/arm/mach-omap/omap3_clock.c
index 4e81ae80d4..2727fd63d1 100644
--- a/arch/arm/mach-omap/omap3_clock.c
+++ b/arch/arm/mach-omap/omap3_clock.c
@@ -15,7 +15,7 @@
  * @warning: IMPORTANT: These functions run from ISRAM stack, so no bss sections
  * should be used: functions cannot use global variables/switch constructs.
  *
- * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
+ * Originally from http://linux.omap.com/pub/bootloader/3430sdp/barebox-v1.tar.gz
  */
 /*
  * (C) Copyright 2006-2008
diff --git a/arch/arm/mach-omap/omap3_clock_core.S b/arch/arm/mach-omap/omap3_clock_core.S
index 872ae5abcd..21a1902690 100644
--- a/arch/arm/mach-omap/omap3_clock_core.S
+++ b/arch/arm/mach-omap/omap3_clock_core.S
@@ -12,7 +12,7 @@
  * configurations while running in SDRAM/Flash. This provides
  * relocation and execution capability for the same.
  *
- * Orignally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
+ * Orignally from http://linux.omap.com/pub/bootloader/3430sdp/barebox-v1.tar.gz
  */
 /*
  * (C) Copyright 2006-2008
diff --git a/arch/arm/mach-omap/omap3_core.S b/arch/arm/mach-omap/omap3_core.S
index 76f80e68ca..7337d4c545 100644
--- a/arch/arm/mach-omap/omap3_core.S
+++ b/arch/arm/mach-omap/omap3_core.S
@@ -48,7 +48,7 @@ arch_init_lowlevel:
 	mov	r0, pc			/* Store the current pc address */
 	sub	r0, r0, #8		/* Reduce offset */
 	ldr	r1, arch_start		/* Load the link address for arch_int */
-	ldr	r2, uboot_start		/* load the link address of start_init*/
+	ldr	r2, barebox_start		/* load the link address of start_init*/
 	sub	r1, r1, r2		/* get the offset */
 	/* subtract the offset from PC of arch=Current start */
 	sub	r0, r0, r1
@@ -91,7 +91,7 @@ next:
 
 arch_start:
 	.word	arch_init_lowlevel
-uboot_start:
+barebox_start:
 	.word	_start
 SRAM_INTVECT:
 	.word	OMAP_SRAM_INTVECT
diff --git a/arch/arm/mach-omap/omap3_generic.c b/arch/arm/mach-omap/omap3_generic.c
index 794d2fa8f2..e5a2addff5 100644
--- a/arch/arm/mach-omap/omap3_generic.c
+++ b/arch/arm/mach-omap/omap3_generic.c
@@ -11,7 +11,7 @@
  * Important one is @ref a_init which is architecture init code.
  * The implemented functions are present in sys_info.h
  *
- * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
+ * Originally from http://linux.omap.com/pub/bootloader/3430sdp/barebox-v1.tar.gz
  */
 /*
  * (C) Copyright 2006-2008
@@ -400,7 +400,7 @@ void a_init(void)
 
 	try_unlock_memory();
 
-	/* Writing to AuxCR in U-boot using SMI for GP DEV */
+	/* Writing to AuxCR in barebox using SMI for GP DEV */
 	/* Currently SMI in Kernel on ES2 devices seems to have an isse
 	 * Once that is resolved, we can postpone this config to kernel
 	 */
diff --git a/arch/arm/mach-omap/syslib.c b/arch/arm/mach-omap/syslib.c
index 2b25dc153c..e966d8e7c5 100644
--- a/arch/arm/mach-omap/syslib.c
+++ b/arch/arm/mach-omap/syslib.c
@@ -7,7 +7,7 @@
  * Provide APIs which can be used from platform/architecture code
  * to operate on
  *
- * Originally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
+ * Originally from http://linux.omap.com/pub/bootloader/3430sdp/barebox-v1.tar.gz
  */
 /*
  * (C) Copyright 2006-2008
diff --git a/arch/arm/mach-s3c24xx/generic.c b/arch/arm/mach-s3c24xx/generic.c
index 4613e59760..dddd0187c3 100644
--- a/arch/arm/mach-s3c24xx/generic.c
+++ b/arch/arm/mach-s3c24xx/generic.c
@@ -240,7 +240,7 @@ EXPORT_SYMBOL(reset_cpu);
 
 /**
 
-@page dev_s3c24xx_arch Samsung's S3C24xx Platforms in U-Boot-v2
+@page dev_s3c24xx_arch Samsung's S3C24xx Platforms in barebox
 
 @section s3c24xx_boards Boards using S3C24xx Processors
 
@@ -274,20 +274,20 @@ All S3C24xx common headers are located here.
 
 /** @page dev_s3c24xx_mach Samsung's S3C24xx based platforms
 
-@par U-Boot-v2 Map
+@par barebox Map
 
-The location of the U-Boot-v2 itself depends on the available amount of
+The location of the barebox itself depends on the available amount of
 installed SDRAM memory:
 
-- 0x30fc.0000 Start of U-Boot-v2 when 16MiB SDRAM is available
-- 0x31fc.0000 Start of U-Boot-v2 when 32MiB SDRAM is available
-- 0x33fc.0000 Start of U-Boot-v2 when 64MiB SDRAM is available
+- 0x30fc.0000 Start of barebox when 16MiB SDRAM is available
+- 0x31fc.0000 Start of barebox when 32MiB SDRAM is available
+- 0x33fc.0000 Start of barebox when 64MiB SDRAM is available
 
 Adjust the CONFIG_TEXT_BASE/CONFIG_ARCH_TEXT_BASE symbol in accordance to
 the available memory.
 
 @note The RAM based filesystem and the stack resides always below the
-U-Boot-v2 start address.
+barebox start address.
 
 @li @subpage dev_s3c24xx_wd_handling
 @li @subpage dev_s3c24xx_pll_handling
diff --git a/arch/arm/mach-s3c24xx/lowlevel-init.S b/arch/arm/mach-s3c24xx/lowlevel-init.S
index fd6b0f396d..e8004e588c 100644
--- a/arch/arm/mach-s3c24xx/lowlevel-init.S
+++ b/arch/arm/mach-s3c24xx/lowlevel-init.S
@@ -223,7 +223,7 @@ SDRAMDATA:
 @page dev_s3c24xx_sdram_handling SDRAM controller initialisation
 
 The SDRAM controller is very simple and its initialisation requires only a
-few steps. U-Boot-v2 provides a generic routine to do this step.
+few steps. barebox provides a generic routine to do this step.
 
 Enable CONFIG_S3C24XX_SDRAM_INIT and CONFIG_MACH_HAS_LOWLEVEL_INIT to be able
 to call the generic s3c24x0_sdram_init() assembler function from within the
@@ -292,14 +292,14 @@ machine specific board_init_lowlevel() assembler function.
 an initialized stack pointer.
 
 @note Basicly this routine runs from inside the internal SRAM. After load of
-the whole U-Boot-v2 image from the NAND flash memory into the SDRAM it adjusts
+the whole barebox image from the NAND flash memory into the SDRAM it adjusts
 the link register to the final SDRAM adress and returns.
 
 @note In the NAND boot mode, ECC is not checked. So, the first x KBytes used
-by U-Boot-v2 should have no bit error.
+by barebox should have no bit error.
 
-Due to the fact the code to load the whole U-Boot-v2 from NAND must fit into
-the first 4kiB of the U-Boot-v2 image, the shrinked NAND driver is very
+Due to the fact the code to load the whole barebox from NAND must fit into
+the first 4kiB of the barebox image, the shrinked NAND driver is very
 minimalistic. Setup the NAND access timing is done in a safe manner, what
 means: Slowest possible values are used. If you want to increase the speed you
 should define the BOARD_DEFAULT_NAND_TIMING to a valid setting into the
diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile
index 6199fed6f3..dbb90814f9 100644
--- a/arch/blackfin/Makefile
+++ b/arch/blackfin/Makefile
@@ -13,7 +13,7 @@ CFLAGS += -D__blackfin__
 KALLSYMS         += --symbol-prefix=_
 
 ifndef CONFIG_BFIN_BOOT_BYPASS
-all: uboot.ldr
+all: barebox.ldr
 endif
 
 archprepare: maketools
@@ -36,7 +36,7 @@ endif
 common-y += $(BOARD)
 common-y += arch/blackfin/lib/ $(CPU)
 
-lds-y += $(BOARD)/u-boot.lds
+lds-y += $(BOARD)/barebox.lds
 
 ifdef CONFIG_BFIN_BOOT_FLASH16
 FLASHBITS :=-B 16
@@ -46,7 +46,7 @@ endif
 
 ifneq ($(cpu-y),)
 ifndef CONFIG_BFIN_BOOT_BYPASS
-uboot.ldr: uboot
+barebox.ldr: barebox
 	rm -f $@
 	$(CROSS_COMPILE)ldr -T $(cpu-y) -c $(FLASHBITS) -i $(CPU)/init_sdram.o $@ $<
 endif
diff --git a/arch/blackfin/configs/ipe337_defconfig b/arch/blackfin/configs/ipe337_defconfig
index 447270453b..16bf2c2852 100644
--- a/arch/blackfin/configs/ipe337_defconfig
+++ b/arch/blackfin/configs/ipe337_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-rc5-git
+# barebox version: 2.0.0-rc5-git
 # Thu Jul  3 10:25:25 2008
 #
 CONFIG_BLACKFIN=y
@@ -35,7 +35,7 @@ CONFIG_STACK_SIZE=0x8000
 CONFIG_MALLOC_SIZE=0x400000
 # CONFIG_BROKEN is not set
 # CONFIG_EXPERIMENTAL is not set
-CONFIG_PROMPT="uboot:"
+CONFIG_PROMPT="barebox:"
 CONFIG_BAUDRATE=115200
 CONFIG_CMDLINE_EDITING=y
 # CONFIG_AUTO_COMPLETE is not set
diff --git a/arch/blackfin/cpu-bf561/start.S b/arch/blackfin/cpu-bf561/start.S
index 81efff09b6..434536248c 100644
--- a/arch/blackfin/cpu-bf561/start.S
+++ b/arch/blackfin/cpu-bf561/start.S
@@ -1,5 +1,5 @@
 /*
- * U-boot - start.S Startup file of u-boot for BF533/BF561
+ * barebox - start.S Startup file of barebox for BF533/BF561
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
@@ -333,8 +333,8 @@ _clear_bss_skip:
         [p0] = r0;
 #endif
 
-	p0.l = _start_uboot;
-	p0.h = _start_uboot;
+	p0.l = _start_barebox;
+	p0.h = _start_barebox;
 	jump (p0);
 
 reset_start:
diff --git a/arch/blackfin/include/asm/u-boot.h b/arch/blackfin/include/asm/barebox.h
index ec39338039..2fcf31ce93 100644
--- a/arch/blackfin/include/asm/u-boot.h
+++ b/arch/blackfin/include/asm/barebox.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - u-boot.h Structure declarations for board specific data
+ * barebox - barebox.h Structure declarations for board specific data
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
@@ -25,8 +25,8 @@
  * MA 02111-1307 USA
  */
 
-#ifndef _U_BOOT_H_
-#define _U_BOOT_H_	1
+#ifndef _BAREBOX_H_
+#define _BAREBOX_H_	1
 
 typedef struct bd_info {
 	int bi_baudrate;		/* serial console baudrate */
@@ -44,4 +44,4 @@ typedef struct bd_info {
 #define bi_env_data bi_env->data
 #define bi_env_crc  bi_env->crc
 
-#endif	/* _U_BOOT_H_ */
+#endif	/* _BAREBOX_H_ */
diff --git a/arch/blackfin/include/asm/bitops.h b/arch/blackfin/include/asm/bitops.h
index 39410de4e6..cdcb2f8e5d 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
+ * barebox - bitops.h Routines for bit operations
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/include/asm/blackfin.h b/arch/blackfin/include/asm/blackfin.h
index f2d1e65be7..8349d207db 100644
--- a/arch/blackfin/include/asm/blackfin.h
+++ b/arch/blackfin/include/asm/blackfin.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - blackfin.h
+ * barebox - blackfin.h
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/include/asm/blackfin_defs.h b/arch/blackfin/include/asm/blackfin_defs.h
index 2190215971..5d0b5094b4 100644
--- a/arch/blackfin/include/asm/blackfin_defs.h
+++ b/arch/blackfin/include/asm/blackfin_defs.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - blackfin_defs.h
+ * barebox - blackfin_defs.h
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/include/asm/byteorder.h b/arch/blackfin/include/asm/byteorder.h
index 3b4df4e134..1ba7a51d19 100644
--- a/arch/blackfin/include/asm/byteorder.h
+++ b/arch/blackfin/include/asm/byteorder.h
@@ -1,5 +1,5 @@
 /*
- * U-boot -  byteorder.h
+ * barebox -  byteorder.h
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/include/asm/cpu.h b/arch/blackfin/include/asm/cpu.h
index 586e3cf181..a7c86642d8 100644
--- a/arch/blackfin/include/asm/cpu.h
+++ b/arch/blackfin/include/asm/cpu.h
@@ -1,6 +1,6 @@
 
 /*
- *  U-boot - cpu.h
+ *  barebox - cpu.h
  *
  *  Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/include/asm/current.h b/arch/blackfin/include/asm/current.h
index 108c2792a0..f8bb7bbe32 100644
--- a/arch/blackfin/include/asm/current.h
+++ b/arch/blackfin/include/asm/current.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - current.h
+ * barebox - current.h
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/include/asm/entry.h b/arch/blackfin/include/asm/entry.h
index f031c86d76..eadef45825 100644
--- a/arch/blackfin/include/asm/entry.h
+++ b/arch/blackfin/include/asm/entry.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - entry.h Routines for context saving and restoring
+ * barebox - entry.h Routines for context saving and restoring
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/include/asm/hw_irq.h b/arch/blackfin/include/asm/hw_irq.h
index 690b6f3030..cd20832883 100644
--- a/arch/blackfin/include/asm/hw_irq.h
+++ b/arch/blackfin/include/asm/hw_irq.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - hw_irq.h
+ * barebox - hw_irq.h
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/include/asm/io.h b/arch/blackfin/include/asm/io.h
index 0a8551218a..8a24dd642a 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
+ * barebox - io.h IO routines
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/include/asm/linkage.h b/arch/blackfin/include/asm/linkage.h
index 7a3166037c..5fb1db4000 100644
--- a/arch/blackfin/include/asm/linkage.h
+++ b/arch/blackfin/include/asm/linkage.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - linkage.h
+ * barebox - linkage.h
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/include/asm/mem_init.h b/arch/blackfin/include/asm/mem_init.h
index 1a13d908e0..8b0f30df5a 100644
--- a/arch/blackfin/include/asm/mem_init.h
+++ b/arch/blackfin/include/asm/mem_init.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - mem_init.h Header file for memory initialization
+ * barebox - mem_init.h Header file for memory initialization
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/include/asm/page.h b/arch/blackfin/include/asm/page.h
index bf90cd56c6..b51e6d1c46 100644
--- a/arch/blackfin/include/asm/page.h
+++ b/arch/blackfin/include/asm/page.h
@@ -1,5 +1,5 @@
 /*
- * U-boot -  page.h
+ * barebox -  page.h
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/include/asm/page_offset.h b/arch/blackfin/include/asm/page_offset.h
index 1b9ee01982..72fb6fa3d3 100644
--- a/arch/blackfin/include/asm/page_offset.h
+++ b/arch/blackfin/include/asm/page_offset.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - page_offset.h
+ * barebox - page_offset.h
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/include/asm/posix_types.h b/arch/blackfin/include/asm/posix_types.h
index f1f2b5ffc2..98397ca5f7 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
+ * barebox - posix_types.h
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/include/asm/processor.h b/arch/blackfin/include/asm/processor.h
index 7095e95626..a5acd08654 100644
--- a/arch/blackfin/include/asm/processor.h
+++ b/arch/blackfin/include/asm/processor.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - processor.h
+ * barebox - processor.h
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/include/asm/ptrace.h b/arch/blackfin/include/asm/ptrace.h
index afd57773ac..a2f53c9eb0 100644
--- a/arch/blackfin/include/asm/ptrace.h
+++ b/arch/blackfin/include/asm/ptrace.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - ptrace.h
+ * barebox - ptrace.h
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/include/asm/segment.h b/arch/blackfin/include/asm/segment.h
index 9e6d817fc7..fd47cf647a 100644
--- a/arch/blackfin/include/asm/segment.h
+++ b/arch/blackfin/include/asm/segment.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - segment.h
+ * barebox - segment.h
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/include/asm/setup.h b/arch/blackfin/include/asm/setup.h
index 440aaf9d9c..99e4850cc2 100644
--- a/arch/blackfin/include/asm/setup.h
+++ b/arch/blackfin/include/asm/setup.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - setup.h
+ * barebox - setup.h
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/include/asm/string.h b/arch/blackfin/include/asm/string.h
index 883009ae0d..5141a5c6f1 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
+ * barebox - string.h String functions
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/include/asm/system.h b/arch/blackfin/include/asm/system.h
index d84b6365bc..59a381e495 100644
--- a/arch/blackfin/include/asm/system.h
+++ b/arch/blackfin/include/asm/system.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - system.h
+ * barebox - system.h
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/include/asm/traps.h b/arch/blackfin/include/asm/traps.h
index b1dde4aba4..893233f2df 100644
--- a/arch/blackfin/include/asm/traps.h
+++ b/arch/blackfin/include/asm/traps.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - traps.h
+ * barebox - traps.h
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/include/asm/types.h b/arch/blackfin/include/asm/types.h
index 6058908e25..e548f63165 100644
--- a/arch/blackfin/include/asm/types.h
+++ b/arch/blackfin/include/asm/types.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - types.h
+ * barebox - types.h
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/lib/bf533_string.c b/arch/blackfin/lib/bf533_string.c
index c8b1a3a983..752055696d 100644
--- a/arch/blackfin/lib/bf533_string.c
+++ b/arch/blackfin/lib/bf533_string.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - bf533_string.c Contains library routines.
+ * barebox - bf533_string.c Contains library routines.
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/lib/blackfin_linux.c b/arch/blackfin/lib/blackfin_linux.c
index fdd0091e95..ce5f3a54c2 100644
--- a/arch/blackfin/lib/blackfin_linux.c
+++ b/arch/blackfin/lib/blackfin_linux.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - blackfin_linux.c
+ * barebox - blackfin_linux.c
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/lib/board.c b/arch/blackfin/lib/board.c
index f8451cdbf8..9853ed2ce1 100644
--- a/arch/blackfin/lib/board.c
+++ b/arch/blackfin/lib/board.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - board.c First C file to be called contains init routines
+ * barebox - board.c First C file to be called contains init routines
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/lib/cpu.c b/arch/blackfin/lib/cpu.c
index 41a6ad4334..e81fa9a6d0 100644
--- a/arch/blackfin/lib/cpu.c
+++ b/arch/blackfin/lib/cpu.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - cpu.c CPU specific functions
+ * barebox - cpu.c CPU specific functions
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
@@ -71,9 +71,9 @@ void icache_enable(void)
 	I0 = (unsigned int *)ICPLB_ADDR0;
 	I1 = (unsigned int *)ICPLB_DATA0;
 
-	/* We only setup instruction caching for U-Boot itself.
+	/* We only setup instruction caching for barebox itself.
 	 * This has the nice side effect that we trigger an
-	 * exception when U-Boot goes crazy.
+	 * exception when barebox goes crazy.
 	 */
 	*I0++ = TEXT_BASE & ~((1 << 20) - 1);
 	*I1++ = PAGE_SIZE_1MB | CPLB_L1_CHBL | CPLB_USER_RD | CPLB_VALID | CPLB_LOCK;
diff --git a/arch/blackfin/lib/interrupt.S b/arch/blackfin/lib/interrupt.S
index 820a33cc7d..82ea53d2dd 100644
--- a/arch/blackfin/lib/interrupt.S
+++ b/arch/blackfin/lib/interrupt.S
@@ -1,5 +1,5 @@
 /*
- * U-boot - interrupt.S Processing of interrupts and exception handling
+ * barebox - interrupt.S Processing of interrupts and exception handling
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/lib/muldi3.c b/arch/blackfin/lib/muldi3.c
index 3924fd9d23..594878c190 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
+ * barebox - muldi3.c contains routines for mult and div
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/lib/traps.c b/arch/blackfin/lib/traps.c
index fcda7861a3..ce479b9d1b 100644
--- a/arch/blackfin/lib/traps.c
+++ b/arch/blackfin/lib/traps.c
@@ -1,5 +1,5 @@
 /*
- * U-boot - traps.c Routines related to interrupts and exceptions
+ * barebox - traps.c Routines related to interrupts and exceptions
  *
  * Copyright (c) 2005 blackfin.uclinux.org
  *
diff --git a/arch/blackfin/mach-bf.dox b/arch/blackfin/mach-bf.dox
index d40595779f..4b3a3c12ea 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 U-Boot tree
+ * how to integrate a new CPU (MACH) into this part of the barebox tree
  */
 
 /** @page dev_bf_mach Blackfin based CPU (MACH) into the tree
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 313a8f14f9..c9608da5cb 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -1,18 +1,18 @@
 #
-# Default location of link U-Boot Image on M68k/Coldfire
+# Default location of link barebox Image on M68k/Coldfire
 #
 config ARCH_TEXT_BASE
 	hex
 	default 0x07f00000 if MACH_MCF54xx
 	default 0x07f00000 if MACH_MCF5445x
 	help
-		Vector table for M68k and U-Boot Link Address
+		Vector table for M68k and barebox Link Address
 
 		On M68k/Coldfire cores all exceptions and interrupts are routed through
 		a vector array. This vector is by default at address 0x0000_0000, but
 		can be moved to any other 1MB aligned address.
 
-		We take advantage of this to move U-Boot out of low memory. Some BDM
+		We take advantage of this to move barebox out of low memory. Some BDM
 		debuggers won't like a moved vector base and might need tweaking to
 		work.
 
@@ -171,7 +171,7 @@ config INITRD_TAG
 endmenu
 
 #
-# Common U-Boot options
+# Common barebox options
 #
 
 source common/Kconfig
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 0f2c4f324d..f377325add 100644
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -2,20 +2,20 @@
 # (C) Copyright 2007 Carsten Schlote <schlote@vahanus.net>
 # See file CREDITS for list of people who contributed to this project.
 #
-# This file is part of U-Boot V2.
+# This file is part of barebox.
 #
-# U-Boot V2 is free software: you can redistribute it and/or modify
+# barebox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# U-Boot V2 is distributed in the hope that it will be useful,
+# barebox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+# along with barebox.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 CPPFLAGS += -isystem $(gccincdir) -D __M68K__ \
@@ -42,8 +42,8 @@ AFLAGS += -gdwarf-2 -save-temps
 # FIXME - remove overide
 CFLAGS += -msoft-float -mcfv4e -gdwarf-2 -feliminate-unused-debug-types \
 	-fmerge-all-constants
-# Incompatible code in U-Boot for -std=c99
-LDFLAGS_uboot  :=-L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
+# Incompatible code in barebox for -std=c99
+LDFLAGS_barebox  :=-L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
 #  --verbose --stats
 
 machdirs := $(patsubst %,arch/m68k/mach-%/,$(machine-y))
@@ -77,7 +77,7 @@ endif
 common-y += $(BOARD) $(MACH)
 common-y += arch/m68k/lib/ arch/m68k/cpu/
 
-lds-$(CONFIG_GENERIC_LINKER_SCRIPT)   := arch/m68k/lib/u-boot.lds
-lds-$(CONFIG_BOARD_LINKER_SCRIPT)     := $(BOARD)/u-boot.lds
+lds-$(CONFIG_GENERIC_LINKER_SCRIPT)   := arch/m68k/lib/barebox.lds
+lds-$(CONFIG_BOARD_LINKER_SCRIPT)     := $(BOARD)/barebox.lds
 
-CLEAN_FILES    += arch/m68k/lib/u-boot.lds
+CLEAN_FILES    += arch/m68k/lib/barebox.lds
diff --git a/arch/m68k/configs/phycore_kpukdr1_5475num_defconfig b/arch/m68k/configs/phycore_kpukdr1_5475num_defconfig
index f867e511da..ba21a008d3 100644
--- a/arch/m68k/configs/phycore_kpukdr1_5475num_defconfig
+++ b/arch/m68k/configs/phycore_kpukdr1_5475num_defconfig
@@ -52,7 +52,7 @@ CONFIG_EARLY_INITDATA_RAM_SIZE=0x1f00
 CONFIG_EARLY_INITDATA_SIZE=0x100
 CONFIG_DEBUG_INITCALLS=y
 CONFIG_USE_IRQ=y
-CONFIG_PROMPT="uboot:"
+CONFIG_PROMPT="barebox:"
 CONFIG_BAUDRATE=115200
 CONFIG_CMDLINE_EDITING=y
 CONFIG_AUTO_COMPLETE=y
diff --git a/arch/m68k/configs/phycore_mcf54xx_defconfig b/arch/m68k/configs/phycore_mcf54xx_defconfig
index 7670c2095a..34ca73ffc7 100644
--- a/arch/m68k/configs/phycore_mcf54xx_defconfig
+++ b/arch/m68k/configs/phycore_mcf54xx_defconfig
@@ -52,7 +52,7 @@ CONFIG_EARLY_INITDATA_RAM_SIZE=0x1f00
 CONFIG_EARLY_INITDATA_SIZE=0x100
 CONFIG_DEBUG_INITCALLS=y
 CONFIG_USE_IRQ=y
-CONFIG_PROMPT="uboot:"
+CONFIG_PROMPT="barebox:"
 CONFIG_BAUDRATE=115200
 CONFIG_CMDLINE_EDITING=y
 CONFIG_AUTO_COMPLETE=y
diff --git a/arch/m68k/cpu/Makefile b/arch/m68k/cpu/Makefile
index 4653534e47..2e434af4e1 100644
--- a/arch/m68k/cpu/Makefile
+++ b/arch/m68k/cpu/Makefile
@@ -2,20 +2,20 @@
 # (C) Copyright 2007 Carsten Schlote <schlote@vahanus.net>
 # See file CREDITS for list of people who contributed to this project.
 #
-# This file is part of U-Boot V2.
+# This file is part of barebox.
 #
-# U-Boot V2 is free software: you can redistribute it and/or modify
+# barebox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# U-Boot V2 is distributed in the hope that it will be useful,
+# barebox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+# along with barebox.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 obj-y += cpu.o
diff --git a/arch/m68k/cpu/cpu.c b/arch/m68k/cpu/cpu.c
index c27d089018..9268785a4c 100644
--- a/arch/m68k/cpu/cpu.c
+++ b/arch/m68k/cpu/cpu.c
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
@@ -134,7 +134,7 @@ void cpu_cache_disable(void)
  * Prepare a "clean" CPU for Linux to run
  * @return 0 (always)
  *
- * This function is called by the generic U-Boot part just before we call
+ * This function is called by the generic barebox part just before we call
  * Linux. It prepares the processor for Linux.
  */
 int cleanup_before_linux (void)
@@ -157,7 +157,7 @@ int cleanup_before_linux (void)
  * For M68K we never enable data cache so we do not need to disable it again.
  *
  * Linux can be called with instruction cache enabled. As this is the
- * default setting we are running in U-Boot, there's no special preparation
+ * default setting we are running in barebox, there's no special preparation
  * required.
  */
 
diff --git a/arch/m68k/cpu/cw_console_io.c b/arch/m68k/cpu/cw_console_io.c
index b0575e4c8a..417a1b48b6 100644
--- a/arch/m68k/cpu/cw_console_io.c
+++ b/arch/m68k/cpu/cw_console_io.c
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
@@ -30,7 +30,7 @@
 #ifdef CONFIG_HAS_EARLY_INIT
 
 
-#if 0 // FIXME - make a CW debug port serial driver for u-boot
+#if 0 // FIXME - make a CW debug port serial driver for barebox
 
 /*
  * The result of an I/O command can be any one of the following.
diff --git a/arch/m68k/cpu/early_init_support.c b/arch/m68k/cpu/early_init_support.c
index 2f6be43539..be4a9e4cb6 100644
--- a/arch/m68k/cpu/early_init_support.c
+++ b/arch/m68k/cpu/early_init_support.c
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/cpu/interrupts.c b/arch/m68k/cpu/interrupts.c
index 9fc64a1248..4e1ff12733 100644
--- a/arch/m68k/cpu/interrupts.c
+++ b/arch/m68k/cpu/interrupts.c
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/cpu/start-mcfv4e.S b/arch/m68k/cpu/start-mcfv4e.S
index c8885d756c..df9ee4d4bb 100644
--- a/arch/m68k/cpu/start-mcfv4e.S
+++ b/arch/m68k/cpu/start-mcfv4e.S
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
@@ -55,13 +55,13 @@
 	.equ ___SP_INIT,__CORE_SRAM1+__CORE_SRAM1_SIZE-16
 
 /*
- * Vector table for M68k and U-Boot Link Address
+ * Vector table for M68k and barebox Link Address
  *
  * On M68k/Coldfire cores all exceptions and interrupts are routed through
  * a vector array. This vector is by default at address 0x0000_0000, but
  * can be moved to any other 1MB aligned address.
  *
- * We take advantage of this to move U-Boot out of low memory. Some BDM
+ * We take advantage of this to move barebox out of low memory. Some BDM
  * debuggers won't like a moved vector base and might need tweaking to
  * work.
  *
@@ -69,8 +69,8 @@
  *       1MB aligned.
  */
 
-	.globl _u_boot_start
-_u_boot_start:
+	.globl _barebox_start
+_barebox_start:
 
 VECTOR_TABLE:
 _VECTOR_TABLE:
@@ -357,7 +357,7 @@ vectorFF:   .long   _asm_isr_handler
  * * do important init, like SDRAM, only if we don't start from memory!
  * * setup Memory and board specific bits prior to relocation.
  * * Setup stack
- * * relocate U-Boot to ram
+ * * relocate barebox to ram
  *
  */
 	.globl _start
@@ -446,7 +446,7 @@ saveland:
 	 * because memory timing is board-dependend, you will
 	 * find a lowlevel_init.[c|S] in your board directory.
 	 *
-	 * Do not jump/call other u-boot code here!
+	 * Do not jump/call other barebox code here!
 	 */
 #ifdef CONFIG_MACH_DO_LOWLEVEL_INIT
 	bsr.l	board_init_lowlevel
@@ -454,7 +454,7 @@ saveland:
 #endif
 
 	/*
-	 * relocate U-Boot Code to RAM (including copy of vectors)
+	 * relocate barebox Code to RAM (including copy of vectors)
 	 */
 relocate:
 	lea.l  	%pc@(VECTOR_TABLE),%a0
@@ -516,16 +516,16 @@ skip_copy_vectors:
 	/*
 	 * Call other half of initcode in relocated code
 	 *
-	 * You allowed to call other U-Boot code from here
+	 * You allowed to call other barebox code from here
 	 */
 	jsr.l	board_init_highlevel
 	nop
 #endif
 	/*
-	 * Now jump to real link address and U-Boot entry point
+	 * Now jump to real link address and barebox entry point
 	 */
 	nop
-	jmp.l	start_uboot
+	jmp.l	start_barebox
 	nop
 	nop
 
diff --git a/arch/m68k/include/asm/atomic.h b/arch/m68k/include/asm/atomic.h
index be3fa3f195..efbe2b88bf 100644
--- a/arch/m68k/include/asm/atomic.h
+++ b/arch/m68k/include/asm/atomic.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/u-boot-m68k.h b/arch/m68k/include/asm/barebox-m68k.h
index 51cacae6e2..c1ee75ed33 100644
--- a/arch/m68k/include/asm/u-boot-m68k.h
+++ b/arch/m68k/include/asm/barebox-m68k.h
@@ -2,27 +2,27 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
- *  Arch dependant U-Boot defines
+ *  Arch dependant barebox defines
  */
-#ifndef _U_BOOT_M68K_H_
-#define _U_BOOT_M68K_H_	1
+#ifndef _BAREBOX_M68K_H_
+#define _BAREBOX_M68K_H_	1
 
 /* for the following variables, see start.S */
 //extern ulong _armboot_start;	/* code start */
@@ -37,4 +37,4 @@ int	cleanup_before_linux(void);
 //int	board_init(void);
 //int	dram_init (void);
 
-#endif	/* _U_BOOT_M68K_H_ */
+#endif	/* _BAREBOX_M68K_H_ */
diff --git a/arch/m68k/include/asm/u-boot.h b/arch/m68k/include/asm/barebox.h
index 34deaf10d0..568b2883b9 100644
--- a/arch/m68k/include/asm/u-boot.h
+++ b/arch/m68k/include/asm/barebox.h
@@ -2,32 +2,32 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
- *  @note This header file defines an interface to U-Boot. Including
+ *  @note This header file defines an interface to barebox. Including
  *  this (unmodified) header file in another file is considered normal
- *  use of U-Boot, and does *not* fall under the heading of "derived
+ *  use of barebox, and does *not* fall under the heading of "derived
  *  work".
  */
 
-#ifndef _U_BOOT_H_
-#define _U_BOOT_H_	1
+#ifndef _BAREBOX_H_
+#define _BAREBOX_H_	1
 
 //typedef struct bd_info {} bd_t;
 
-#endif	/* _U_BOOT_H_ */
+#endif	/* _BAREBOX_H_ */
diff --git a/arch/m68k/include/asm/bitops.h b/arch/m68k/include/asm/bitops.h
index bfc3054155..fee64a425c 100644
--- a/arch/m68k/include/asm/bitops.h
+++ b/arch/m68k/include/asm/bitops.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/bootinfo.h b/arch/m68k/include/asm/bootinfo.h
index 8b18fda350..a0bd27b317 100644
--- a/arch/m68k/include/asm/bootinfo.h
+++ b/arch/m68k/include/asm/bootinfo.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/byteorder.h b/arch/m68k/include/asm/byteorder.h
index 779fca00f0..7a5fb6188c 100644
--- a/arch/m68k/include/asm/byteorder.h
+++ b/arch/m68k/include/asm/byteorder.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/coldfire/mcf548x.h b/arch/m68k/include/asm/coldfire/mcf548x.h
index 6b3eff3826..4bde42a57d 100644
--- a/arch/m68k/include/asm/coldfire/mcf548x.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_can.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_can.h
index 1956f0d760..bb53eaa03a 100644
--- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_can.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_can.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_ctm.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_ctm.h
index c4982668c5..6c779ec739 100644
--- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_ctm.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_ctm.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dma.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dma.h
index 73abc07a43..4229c36758 100644
--- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dma.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dma.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dma_ereq.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dma_ereq.h
index 309689f464..8eac58bfe0 100644
--- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dma_ereq.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dma_ereq.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dspi.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dspi.h
index 4d8f33142e..889e75bc1d 100644
--- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dspi.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_dspi.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_eport.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_eport.h
index bb07f7c3b0..94f724fa28 100644
--- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_eport.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_eport.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_fbcs.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_fbcs.h
index e7e4712bc6..1e11944c46 100644
--- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_fbcs.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_fbcs.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_fec.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_fec.h
index 29ac249025..738abd80a7 100644
--- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_fec.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_fec.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_gpio.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_gpio.h
index 5d494a9d49..d2200714f1 100644
--- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_gpio.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_gpio.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_gpt.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_gpt.h
index b7fcfced99..4ec8fdffca 100644
--- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_gpt.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_gpt.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_i2c.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_i2c.h
index 3879c0dbb4..9f54aaeadb 100644
--- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_i2c.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_i2c.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_intc.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_intc.h
index 52bf7452fa..fa3a2c9dbe 100644
--- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_intc.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_intc.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_pci.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_pci.h
index 031e50945e..23c6743133 100644
--- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_pci.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_pci.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_pciarb.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_pciarb.h
index a15554384a..8c11647300 100644
--- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_pciarb.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_pciarb.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_psc.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_psc.h
index 44f920bcbe..c685af8240 100644
--- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_psc.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_psc.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sdramc.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sdramc.h
index 1f41f32310..452332d1d9 100644
--- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sdramc.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sdramc.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sec.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sec.h
index f4a65320c4..552527d381 100644
--- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sec.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sec.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_siu.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_siu.h
index e663ec726f..558530d34f 100644
--- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_siu.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_siu.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_slt.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_slt.h
index 6e472f2288..10d94a4117 100644
--- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_slt.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_slt.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sram.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sram.h
index d5eb4642c3..a706306f2b 100644
--- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sram.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_sram.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_uart.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_uart.h
index 8f46f1c3ec..2fa25ce3b4 100644
--- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_uart.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_uart.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_usb.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_usb.h
index 0c8e92cdad..0c256ef528 100644
--- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_usb.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_usb.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_xlbarb.h b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_xlbarb.h
index 08c83765f5..f4df976b37 100644
--- a/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_xlbarb.h
+++ b/arch/m68k/include/asm/coldfire/mcf548x/mcf548x_xlbarb.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/coldfire/mcf5xxx.h b/arch/m68k/include/asm/coldfire/mcf5xxx.h
index 4e239a31d3..5edde1e8b3 100644
--- a/arch/m68k/include/asm/coldfire/mcf5xxx.h
+++ b/arch/m68k/include/asm/coldfire/mcf5xxx.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/common.h b/arch/m68k/include/asm/common.h
index 4cd02ad752..202ccad0b3 100644
--- a/arch/m68k/include/asm/common.h
+++ b/arch/m68k/include/asm/common.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/elf.h b/arch/m68k/include/asm/elf.h
index 310179d71d..57fdcb2633 100644
--- a/arch/m68k/include/asm/elf.h
+++ b/arch/m68k/include/asm/elf.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/hardware.h b/arch/m68k/include/asm/hardware.h
index 616a4feeb5..eeca64eb95 100644
--- a/arch/m68k/include/asm/hardware.h
+++ b/arch/m68k/include/asm/hardware.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/io.h b/arch/m68k/include/asm/io.h
index 7bbd2fe0f9..b6b01cb184 100644
--- a/arch/m68k/include/asm/io.h
+++ b/arch/m68k/include/asm/io.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/memory.h b/arch/m68k/include/asm/memory.h
index cb60515a71..006ea3c68e 100644
--- a/arch/m68k/include/asm/memory.h
+++ b/arch/m68k/include/asm/memory.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/module.h b/arch/m68k/include/asm/module.h
index 7036a4e12e..f04d794572 100644
--- a/arch/m68k/include/asm/module.h
+++ b/arch/m68k/include/asm/module.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/posix_types.h b/arch/m68k/include/asm/posix_types.h
index 2e85033384..c40c41d041 100644
--- a/arch/m68k/include/asm/posix_types.h
+++ b/arch/m68k/include/asm/posix_types.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/processor.h b/arch/m68k/include/asm/processor.h
index 75086d5409..b0f82d084a 100644
--- a/arch/m68k/include/asm/processor.h
+++ b/arch/m68k/include/asm/processor.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/ptrace.h b/arch/m68k/include/asm/ptrace.h
index 96ea849385..8f3d39aea1 100644
--- a/arch/m68k/include/asm/ptrace.h
+++ b/arch/m68k/include/asm/ptrace.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/setup.h b/arch/m68k/include/asm/setup.h
index 8fad34434f..ee0bde8b79 100644
--- a/arch/m68k/include/asm/setup.h
+++ b/arch/m68k/include/asm/setup.h
@@ -2,24 +2,24 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
- *  Arch dependant U-Boot defines about linux mach types
+ *  Arch dependant barebox defines about linux mach types
  */
 #ifndef _M68K_SETUP_H
 #define _M68K_SETUP_H
diff --git a/arch/m68k/include/asm/string.h b/arch/m68k/include/asm/string.h
index 193ec54a1a..19e3de45b6 100644
--- a/arch/m68k/include/asm/string.h
+++ b/arch/m68k/include/asm/string.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/include/asm/types.h b/arch/m68k/include/asm/types.h
index 7ce94a176b..90e8bd7f75 100644
--- a/arch/m68k/include/asm/types.h
+++ b/arch/m68k/include/asm/types.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/lib/Makefile b/arch/m68k/lib/Makefile
index 52ea7e9542..09cfb29848 100644
--- a/arch/m68k/lib/Makefile
+++ b/arch/m68k/lib/Makefile
@@ -2,20 +2,20 @@
 # (C) Copyright 2007 Carsten Schlote <schlote@vahanus.net>
 # See file CREDITS for list of people who contributed to this project.
 #
-# This file is part of U-Boot V2.
+# This file is part of barebox.
 #
-# U-Boot V2 is free software: you can redistribute it and/or modify
+# barebox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# U-Boot V2 is distributed in the hope that it will be useful,
+# barebox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+# along with barebox.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 #
@@ -28,4 +28,4 @@ obj-$(CONFIG_CMD_BOOTM)	+= m68k-linuxboot.o
 
 obj-$(CONFIG_MODULES) += m68k-module.o
 
-extra-$(CONFIG_GENERIC_LINKER_SCRIPT) += u-boot.lds
+extra-$(CONFIG_GENERIC_LINKER_SCRIPT) += barebox.lds
diff --git a/arch/m68k/lib/u-boot.lds.S b/arch/m68k/lib/barebox.lds.S
index 823e17a9de..fb6673deec 100644
--- a/arch/m68k/lib/u-boot.lds.S
+++ b/arch/m68k/lib/barebox.lds.S
@@ -2,26 +2,26 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
  *  Generic Linker file for M68k targets
  */
-#include <asm-generic/u-boot.lds.h>
+#include <asm-generic/barebox.lds.h>
 
 OUTPUT_FORMAT("elf32-m68k", "elf32-m68k",
 	      "elf32-m68k")
@@ -54,16 +54,16 @@ SECTIONS
 	} =0xdeadbeef
 
 	. = ALIGN(4);
-	__u_boot_cmd_start = .;
-	.u_boot_cmd : { U_BOOT_CMDS }
-	__u_boot_cmd_end = .;
+	__barebox_cmd_start = .;
+	.barebox_cmd : { BAREBOX_CMDS }
+	__barebox_cmd_end = .;
 
-	__u_boot_initcalls_start = .;
-	.u_boot_initcalls : { INITCALLS }
-	__u_boot_initcalls_end = .;
+	__barebox_initcalls_start = .;
+	.barebox_initcalls : { INITCALLS }
+	__barebox_initcalls_end = .;
 
 	__usymtab_start = .;
-	__usymtab : { U_BOOT_SYMS }
+	__usymtab : { BAREBOX_SYMS }
 	__usymtab_end = .;
 
 	/* End of text and rodata section */
@@ -88,5 +88,5 @@ SECTIONS
 	_end = .;
 
 	. = ALIGN(4);
-	_u_boot_heap_start = .;
+	_barebox_heap_start = .;
 }
diff --git a/arch/m68k/lib/m68k-linuxboot.c b/arch/m68k/lib/m68k-linuxboot.c
index b29e2d5c13..417a8e0cd7 100644
--- a/arch/m68k/lib/m68k-linuxboot.c
+++ b/arch/m68k/lib/m68k-linuxboot.c
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
@@ -37,7 +37,7 @@
 #include <asm/setup.h>
 #include <environment.h>
 #include <boot.h>
-#include <asm/u-boot-m68k.h>
+#include <asm/barebox-m68k.h>
 #include <asm/bootinfo.h>
 
 
diff --git a/arch/m68k/lib/m68k-meminit.c b/arch/m68k/lib/m68k-meminit.c
index 8dfaa9c479..664ef509c5 100644
--- a/arch/m68k/lib/m68k-meminit.c
+++ b/arch/m68k/lib/m68k-meminit.c
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
@@ -24,7 +24,7 @@
 #include <common.h>
 #include <init.h>
 #include <mem_malloc.h>
-#include <asm/u-boot-m68k.h>
+#include <asm/barebox-m68k.h>
 #include <reloc.h>
 #include <asm-generic/memory_layout.h>
 
diff --git a/arch/m68k/lib/m68k-module.c b/arch/m68k/lib/m68k-module.c
index e1fe461a3a..6a4a2bc1c2 100644
--- a/arch/m68k/lib/m68k-module.c
+++ b/arch/m68k/lib/m68k-module.c
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/mach-mcfv4e.dox b/arch/m68k/mach-mcfv4e.dox
index 0ecfbc2c9d..c6dc8f6929 100644
--- a/arch/m68k/mach-mcfv4e.dox
+++ b/arch/m68k/mach-mcfv4e.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 U-Boot tree
+ * how to integrate a new CPU (MACH) into this part of the barebox tree
  */
 
 /** @page dev_m68k_mach M68k/Coldfire based CPU (MACH) into the tree
@@ -31,8 +31,8 @@ be C.
 When \<board_init_lowlevel\> returns it will be assumed that there is now
 working RAM that can be used for all further steps.
 
-Next step is relocation of U-Boot itself. It gets copied to the end of
-available RAM and the last assembly instruction is a jump to \<start_uboot\>.
+Next step is relocation of barebox itself. It gets copied to the end of
+available RAM and the last assembly instruction is a jump to \<start_barebox\>.
 
 At this point of time: "runtime address == link address".
 
diff --git a/arch/m68k/mach-mcfv4e/include/mach/clocks.h b/arch/m68k/mach-mcfv4e/include/mach/clocks.h
index 50124b1948..daedb7aebe 100644
--- a/arch/m68k/mach-mcfv4e/include/mach/clocks.h
+++ b/arch/m68k/mach-mcfv4e/include/mach/clocks.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/mach-mcfv4e/include/mach/debug_ll.h b/arch/m68k/mach-mcfv4e/include/mach/debug_ll.h
index 064961d925..c58be70334 100644
--- a/arch/m68k/mach-mcfv4e/include/mach/debug_ll.h
+++ b/arch/m68k/mach-mcfv4e/include/mach/debug_ll.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/mach-mcfv4e/include/mach/hardware.h b/arch/m68k/mach-mcfv4e/include/mach/hardware.h
index 46dc08897f..118afa63ab 100644
--- a/arch/m68k/mach-mcfv4e/include/mach/hardware.h
+++ b/arch/m68k/mach-mcfv4e/include/mach/hardware.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/mach-mcfv4e/include/mach/mcf54xx-regs.h b/arch/m68k/mach-mcfv4e/include/mach/mcf54xx-regs.h
index e1b17d55e4..8dd5ed2c15 100644
--- a/arch/m68k/mach-mcfv4e/include/mach/mcf54xx-regs.h
+++ b/arch/m68k/mach-mcfv4e/include/mach/mcf54xx-regs.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/mach-mcfv4e/include/proc/dma_utils.h b/arch/m68k/mach-mcfv4e/include/proc/dma_utils.h
index 4ebdd558c1..1cb27822ba 100644
--- a/arch/m68k/mach-mcfv4e/include/proc/dma_utils.h
+++ b/arch/m68k/mach-mcfv4e/include/proc/dma_utils.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/mach-mcfv4e/include/proc/fec.h b/arch/m68k/mach-mcfv4e/include/proc/fec.h
index 4c94774381..16bfaa6ded 100644
--- a/arch/m68k/mach-mcfv4e/include/proc/fec.h
+++ b/arch/m68k/mach-mcfv4e/include/proc/fec.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/mach-mcfv4e/include/proc/fecbd.h b/arch/m68k/mach-mcfv4e/include/proc/fecbd.h
index 92195490c8..d7551c6587 100644
--- a/arch/m68k/mach-mcfv4e/include/proc/fecbd.h
+++ b/arch/m68k/mach-mcfv4e/include/proc/fecbd.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_dma.h b/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_dma.h
index 09adf8272a..ad7f1393c1 100644
--- a/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_dma.h
+++ b/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_dma.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_progCheck.h b/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_progCheck.h
index f90600c7cd..a536f147c1 100644
--- a/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_progCheck.h
+++ b/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_progCheck.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_tasksInit.h b/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_tasksInit.h
index bc6ec91f98..6b19d0262b 100644
--- a/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_tasksInit.h
+++ b/arch/m68k/mach-mcfv4e/include/proc/mcdapi/MCD_tasksInit.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/mach-mcfv4e/include/proc/net/eth.h b/arch/m68k/mach-mcfv4e/include/proc/net/eth.h
index 5240c0c945..e86d0646c4 100644
--- a/arch/m68k/mach-mcfv4e/include/proc/net/eth.h
+++ b/arch/m68k/mach-mcfv4e/include/proc/net/eth.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/mach-mcfv4e/include/proc/net/nbuf.h b/arch/m68k/mach-mcfv4e/include/proc/net/nbuf.h
index bc3a7a6924..8b6a89c27d 100644
--- a/arch/m68k/mach-mcfv4e/include/proc/net/nbuf.h
+++ b/arch/m68k/mach-mcfv4e/include/proc/net/nbuf.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/mach-mcfv4e/include/proc/net/net.h b/arch/m68k/mach-mcfv4e/include/proc/net/net.h
index a2ccd76510..d6877596b6 100644
--- a/arch/m68k/mach-mcfv4e/include/proc/net/net.h
+++ b/arch/m68k/mach-mcfv4e/include/proc/net/net.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/mach-mcfv4e/include/proc/net/queue.h b/arch/m68k/mach-mcfv4e/include/proc/net/queue.h
index c9da1c83a5..d5c13f8a50 100644
--- a/arch/m68k/mach-mcfv4e/include/proc/net/queue.h
+++ b/arch/m68k/mach-mcfv4e/include/proc/net/queue.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/mach-mcfv4e/include/proc/processor.h b/arch/m68k/mach-mcfv4e/include/proc/processor.h
index f49b65d97b..4f196bda9b 100644
--- a/arch/m68k/mach-mcfv4e/include/proc/processor.h
+++ b/arch/m68k/mach-mcfv4e/include/proc/processor.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/mach-mcfv4e/include/proc/ptrace.h b/arch/m68k/mach-mcfv4e/include/proc/ptrace.h
index dd124291d6..5e120596d2 100644
--- a/arch/m68k/mach-mcfv4e/include/proc/ptrace.h
+++ b/arch/m68k/mach-mcfv4e/include/proc/ptrace.h
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/mach-mcfv4e/mcdapi/Makefile b/arch/m68k/mach-mcfv4e/mcdapi/Makefile
index 7e2d5ab466..52ddaf8581 100644
--- a/arch/m68k/mach-mcfv4e/mcdapi/Makefile
+++ b/arch/m68k/mach-mcfv4e/mcdapi/Makefile
@@ -2,20 +2,20 @@
 # (C) Copyright 2007 Carsten Schlote <schlote@vahanus.net>
 # See file CREDITS for list of people who contributed to this project.
 #
-# This file is part of U-Boot V2.
+# This file is part of barebox.
 #
-# U-Boot V2 is free software: you can redistribute it and/or modify
+# barebox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# U-Boot V2 is distributed in the hope that it will be useful,
+# barebox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+# along with barebox.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 #
diff --git a/arch/m68k/mach-mcfv4e/mcf_clocksource.c b/arch/m68k/mach-mcfv4e/mcf_clocksource.c
index 926a592158..8fb2fba2ec 100644
--- a/arch/m68k/mach-mcfv4e/mcf_clocksource.c
+++ b/arch/m68k/mach-mcfv4e/mcf_clocksource.c
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/mach-mcfv4e/mcf_reset_cpu.c b/arch/m68k/mach-mcfv4e/mcf_reset_cpu.c
index dc04a270d1..c7b77abcf5 100644
--- a/arch/m68k/mach-mcfv4e/mcf_reset_cpu.c
+++ b/arch/m68k/mach-mcfv4e/mcf_reset_cpu.c
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/mach-mcfv4e/multichannel_dma.c b/arch/m68k/mach-mcfv4e/multichannel_dma.c
index 494fc68bde..acc104e4af 100644
--- a/arch/m68k/mach-mcfv4e/multichannel_dma.c
+++ b/arch/m68k/mach-mcfv4e/multichannel_dma.c
@@ -1,5 +1,5 @@
 /*
- * U-Boot Header File
+ * barebox Header File
  *
  * Generic Clocksource for V4E
  *
diff --git a/arch/m68k/mach-mcfv4e/net/Makefile b/arch/m68k/mach-mcfv4e/net/Makefile
index 45badfaaac..78c528f259 100644
--- a/arch/m68k/mach-mcfv4e/net/Makefile
+++ b/arch/m68k/mach-mcfv4e/net/Makefile
@@ -2,20 +2,20 @@
 # (C) Copyright 2007 Carsten Schlote <schlote@vahanus.net>
 # See file CREDITS for list of people who contributed to this project.
 #
-# This file is part of U-Boot V2.
+# This file is part of barebox.
 #
-# U-Boot V2 is free software: you can redistribute it and/or modify
+# barebox is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# U-Boot V2 is distributed in the hope that it will be useful,
+# barebox is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+# along with barebox.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 #
diff --git a/arch/m68k/mach-mcfv4e/net/nbuf.c b/arch/m68k/mach-mcfv4e/net/nbuf.c
index 5dc6027e0e..234e75821a 100644
--- a/arch/m68k/mach-mcfv4e/net/nbuf.c
+++ b/arch/m68k/mach-mcfv4e/net/nbuf.c
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/mach-mcfv4e/net/net.c b/arch/m68k/mach-mcfv4e/net/net.c
index 1bc089bdd3..febabfeda0 100644
--- a/arch/m68k/mach-mcfv4e/net/net.c
+++ b/arch/m68k/mach-mcfv4e/net/net.c
@@ -2,20 +2,20 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
diff --git a/arch/m68k/mach-mcfv4e/net/queue.c b/arch/m68k/mach-mcfv4e/net/queue.c
index e573fcfd58..9f779474ea 100644
--- a/arch/m68k/mach-mcfv4e/net/queue.c
+++ b/arch/m68k/mach-mcfv4e/net/queue.c
@@ -2,27 +2,27 @@
  * Copyright (c) 2008 Carsten Schlote <c.schlote@konzeptpark.de>
  * See file CREDITS for list of people who contributed to this project.
  *
- * This file is part of U-Boot V2.
+ * This file is part of barebox.
  *
- * U-Boot V2 is free software: you can redistribute it and/or modify
+ * barebox is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * U-Boot V2 is distributed in the hope that it will be useful,
+ * barebox is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with U-Boot V2.  If not, see <http://www.gnu.org/licenses/>.
+ * along with barebox.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file
  *  Implements a first in, first out linked list
  *
  * @note Simple selfcontaining basic code
- * @todo Replace by u-boot standard list functions
+ * @todo Replace by barebox standard list functions
  */
 #include <linux/types.h>
 #include <proc/net/queue.h>
diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index 72eb36bad2..2c9c5359f0 100644
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -49,4 +49,4 @@ endif
 common-y += $(BOARD) $(CPU)
 common-y += arch/ppc/lib/
 
-lds-y += $(BOARD)/u-boot.lds
+lds-y += $(BOARD)/barebox.lds
diff --git a/arch/ppc/configs/pcm030_defconfig b/arch/ppc/configs/pcm030_defconfig
index 2a9b6bf8a5..a03e7aaf61 100644
--- a/arch/ppc/configs/pcm030_defconfig
+++ b/arch/ppc/configs/pcm030_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-rc5-git
+# barebox version: 2.0.0-rc5-git
 # Thu Jul  3 09:49:23 2008
 #
 CONFIG_BOARDINFO="Phytec Phycore mpc5200b tiny"
@@ -42,7 +42,7 @@ CONFIG_MALLOC_SIZE=0x400000
 # CONFIG_BROKEN is not set
 # CONFIG_EXPERIMENTAL is not set
 # CONFIG_RELOCATABLE is not set
-CONFIG_PROMPT="uboot:"
+CONFIG_PROMPT="barebox:"
 CONFIG_BAUDRATE=115200
 CONFIG_CMDLINE_EDITING=y
 CONFIG_AUTO_COMPLETE=y
diff --git a/arch/ppc/include/asm/u-boot.h b/arch/ppc/include/asm/barebox.h
index 30b44e3d22..ac81495cc9 100644
--- a/arch/ppc/include/asm/u-boot.h
+++ b/arch/ppc/include/asm/barebox.h
@@ -18,20 +18,20 @@
  * MA 02111-1307 USA
  *
  ********************************************************************
- * NOTE: This header file defines an interface to U-Boot. Including
+ * NOTE: This header file defines an interface to barebox. Including
  * this (unmodified) header file in another file is considered normal
- * use of U-Boot, and does *not* fall under the heading of "derived
+ * use of barebox, and does *not* fall under the heading of "derived
  * work".
  ********************************************************************
  */
 
-#ifndef __U_BOOT_H__
-#define __U_BOOT_H__
+#ifndef __BAREBOX_H__
+#define __BAREBOX_H__
 
 /*
- * Board information passed to Linux kernel from U-Boot
+ * Board information passed to Linux kernel from barebox
  *
- * include/asm-ppc/u-boot.h
+ * include/asm-ppc/barebox.h
  */
 
 #ifndef __ASSEMBLY__
@@ -131,4 +131,4 @@ typedef struct bd_info {
 } bd_t;
 
 #endif /* __ASSEMBLY__ */
-#endif	/* __U_BOOT_H__ */
+#endif	/* __BAREBOX_H__ */
diff --git a/arch/ppc/include/asm/common.h b/arch/ppc/include/asm/common.h
index 843bcf71ed..96de5c6568 100644
--- a/arch/ppc/include/asm/common.h
+++ b/arch/ppc/include/asm/common.h
@@ -1,7 +1,7 @@
 #ifndef __ASM_COMMON_H
 #define __ASM_COMMON_H
 
-#include <asm/u-boot.h>
+#include <asm/barebox.h>
 
 void	upmconfig     (unsigned int, unsigned int *, unsigned int);
 ulong	get_tbclk     (void);
diff --git a/arch/ppc/include/asm/global_data.h b/arch/ppc/include/asm/global_data.h
index 482c100d89..c36df9abbc 100644
--- a/arch/ppc/include/asm/global_data.h
+++ b/arch/ppc/include/asm/global_data.h
@@ -108,7 +108,7 @@ typedef	struct	global_data {
 	void *		console_addr;
 #endif
 #ifdef CONFIG_AMIGAONEG3SE
-	unsigned long	relocaddr;	/* Start address of U-Boot in RAM */
+	unsigned long	relocaddr;	/* Start address of barebox in RAM */
 #endif
 #if defined(CONFIG_LCD) || defined(CONFIG_VIDEO)
 	unsigned long	fb_base;	/* Base address of framebuffer memory	*/
diff --git a/arch/ppc/lib/board.c b/arch/ppc/lib/board.c
index bd701a8f1f..7f8118e16f 100644
--- a/arch/ppc/lib/board.c
+++ b/arch/ppc/lib/board.c
@@ -75,6 +75,6 @@ void board_init_r (ulong end_of_ram)
 
 	/* Initialization complete - start the monitor */
 
-	start_uboot();
+	start_barebox();
 }
 
diff --git a/arch/ppc/lib/board_data.c b/arch/ppc/lib/board_data.c
index 28644de10a..b28830f792 100644
--- a/arch/ppc/lib/board_data.c
+++ b/arch/ppc/lib/board_data.c
@@ -34,7 +34,7 @@ int init_board_data(bd_t *bd)
 
 #ifdef CFG_EXTBDINFO
 	strncpy ((char *)bd->bi_s_version, "1.2", sizeof (bd->bi_s_version));
-	strncpy ((char *)bd->bi_r_version, U_BOOT_VERSION, sizeof (bd->bi_r_version));
+	strncpy ((char *)bd->bi_r_version, BAREBOX_VERSION, sizeof (bd->bi_r_version));
 
 	bd->bi_procfreq = gd->cpu_clk;	/* Processor Speed, In Hz */
 	bd->bi_plb_busfreq = gd->bus_clk;
diff --git a/arch/ppc/lib/ppclinux.c b/arch/ppc/lib/ppclinux.c
index 6fe0141fb7..35a9d31a8e 100644
--- a/arch/ppc/lib/ppclinux.c
+++ b/arch/ppc/lib/ppclinux.c
@@ -81,7 +81,7 @@ static int do_bootm_linux(struct image_data *idata)
 				((unsigned long)initrd_data + ((initrd_len + 3) & ~3));
 		} else if (len1) {
 			/* We could check here if this is a multifile image
-			 * with only a kernel and an oftree. Original U-Boot
+			 * with only a kernel and an oftree. Original barebox
 			 * did not do this, so leave it out for now.
 			 */
 			initrd_data = (void *)((unsigned long)data + ((os_len + 3) & ~3));
@@ -97,7 +97,7 @@ static int do_bootm_linux(struct image_data *idata)
 
 #ifdef CONFIG_OF_FLAT_TREE
 	if (idata->oftree) {
-		/* The oftree can be given either as an uboot image or as a
+		/* The oftree can be given either as an barebox image or as a
 		 * binary blob. First try to read it as an image.
 		 */
 		oftree_handle = map_image(idata->oftree, 1);
diff --git a/arch/ppc/mach-mpc5xxx/start.S b/arch/ppc/mach-mpc5xxx/start.S
index 19556df16e..8fca31b7a6 100644
--- a/arch/ppc/mach-mpc5xxx/start.S
+++ b/arch/ppc/mach-mpc5xxx/start.S
@@ -23,7 +23,7 @@
  */
 
 /*
- *  U-Boot - Startup Code for MPC5xxx CPUs
+ *  barebox - Startup Code for MPC5xxx CPUs
  */
 #include <config.h>
 
@@ -317,7 +317,7 @@ _continue_init:
 	ori	r3, r3, (TEXT_BASE)@l
 #endif
 
-	mr	r1,  r3		/* Set new stack just below U-Boot code */
+	mr	r1,  r3		/* Set new stack just below barebox code */
 	subi    r1,  r1, 0x10
 
 	mr	r10, r3 	/* Save copy of Destination Address	*/
@@ -333,7 +333,7 @@ calc_source:
 
 before_relocate:
 	/*
-	 * We are now ready to copy U-Boot to RAM.
+	 * We are now ready to copy barebox to RAM.
 	 *
 	 * destination = r3
 	 * source      = r4
@@ -828,8 +828,8 @@ pc:
 _text_base:
 	.long TEXT_BASE
 
-.globl _u_boot_start
-_u_boot_start:
+.globl _barebox_start
+_barebox_start:
 	.long _start
 
 .globl _bss_start
diff --git a/arch/ppc/mach-ppc.dox b/arch/ppc/mach-ppc.dox
index 381909adbf..f7191b9988 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 U-Boot tree
+ * how to integrate a new CPU (MACH) into this part of the barebox tree
  */
 
 /** @page dev_ppc_mach PowerPC based CPU into the tree
diff --git a/arch/sandbox/Makefile b/arch/sandbox/Makefile
index 57fac202f6..6b8942eb16 100644
--- a/arch/sandbox/Makefile
+++ b/arch/sandbox/Makefile
@@ -4,23 +4,23 @@ CPPFLAGS += -fno-strict-aliasing
 machine-y := sandbox
 
 board-y := sandbox
-lds-y   := board/sandbox/u-boot.lds
+lds-y   := board/sandbox/barebox.lds
 
 TEXT_BASE = $(CONFIG_TEXT_BASE)
 
 CPPFLAGS += -P
-CFLAGS += -Dmalloc=u_boot_malloc \
-		-Dfree=u_boot_free -Drealloc=u_boot_realloc \
-		-Dread=u_boot_read -Dwrite=u_boot_write \
-		-Dopen=u_boot_open -Dclose=u_boot_close \
-		-Dlseek=u_boot_lseek -Dperror=u_boot_perror \
-		-Derrno=u_boot_errno -Dgetc=u_boot_getc \
-		-Dputc=u_boot_putc -Dfgetc=u_boot_fgetc \
-		-Dfputc=u_boot_fputc -Dfgets=u_boot_fgets \
-		-Dfputs=u_boot_fputs -Dsetenv=u_boot_setenv \
-		-Dgetenv=u_boot_getenv -Dprintf=u_boot_printf \
-		-Dglob=u_boot_glob -Dglobfree=u_boot_globfree \
-		-Dioctl=u_boot_ioctl
+CFLAGS += -Dmalloc=barebox_malloc \
+		-Dfree=barebox_free -Drealloc=barebox_realloc \
+		-Dread=barebox_read -Dwrite=barebox_write \
+		-Dopen=barebox_open -Dclose=barebox_close \
+		-Dlseek=barebox_lseek -Dperror=barebox_perror \
+		-Derrno=barebox_errno -Dgetc=barebox_getc \
+		-Dputc=barebox_putc -Dfgetc=barebox_fgetc \
+		-Dfputc=barebox_fputc -Dfgets=barebox_fgets \
+		-Dfputs=barebox_fputs -Dsetenv=barebox_setenv \
+		-Dgetenv=barebox_getenv -Dprintf=barebox_printf \
+		-Dglob=barebox_glob -Dglobfree=barebox_globfree \
+		-Dioctl=barebox_ioctl
 
 machdirs := $(patsubst %,arch/sandbox/mach-%/,$(machine-y))
 
@@ -58,10 +58,10 @@ archprepare: maketools
 
 PHONY += maketools
 
-cmd_uboot__ = $(CC) -o $@ -Wl,-T,$(uboot-lds) \
-	-Wl,--start-group $(uboot-common) -Wl,--end-group \
+cmd_barebox__ = $(CC) -o $@ -Wl,-T,$(barebox-lds) \
+	-Wl,--start-group $(barebox-common) -Wl,--end-group \
 	-lrt -lpthread
 
 common-y += board/sandbox/ arch/sandbox/os/
 
-CLEAN_FILES += board/sandbox/u-boot.lds
+CLEAN_FILES += board/sandbox/barebox.lds
diff --git a/arch/sandbox/configs/sandbox_defconfig b/arch/sandbox/configs/sandbox_defconfig
index 8ab4b6dddb..8757fd016d 100644
--- a/arch/sandbox/configs/sandbox_defconfig
+++ b/arch/sandbox/configs/sandbox_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# U-Boot version: 2.0.0-rc10
+# barebox version: 2.0.0-rc10
 # Mon Oct 12 14:15:55 2009
 #
 CONFIG_ARCH_TEXT_BASE=0x00000000
@@ -22,7 +22,7 @@ CONFIG_STACK_SIZE=0x8000
 CONFIG_MALLOC_SIZE=0x400000
 # CONFIG_BROKEN is not set
 # CONFIG_EXPERIMENTAL is not set
-CONFIG_PROMPT="uboot:"
+CONFIG_PROMPT="barebox:"
 CONFIG_BAUDRATE=115200
 # CONFIG_LONGHELP is not set
 CONFIG_CBSIZE=1024
diff --git a/arch/sandbox/include/asm/u-boot.h b/arch/sandbox/include/asm/barebox.h
index 2997587d82..2997587d82 100644
--- a/arch/sandbox/include/asm/u-boot.h
+++ b/arch/sandbox/include/asm/barebox.h
diff --git a/arch/sandbox/lib/Makefile b/arch/sandbox/lib/Makefile
index 436fd0d3e0..854aa4382f 100644
--- a/arch/sandbox/lib/Makefile
+++ b/arch/sandbox/lib/Makefile
@@ -1,4 +1,4 @@
-CPPFLAGS_u-boot.lds = -U$(SUBARCH) -DELF_ARCH=$(ELF_ARCH) \
+CPPFLAGS_barebox.lds = -U$(SUBARCH) -DELF_ARCH=$(ELF_ARCH) \
 	-DELF_FORMAT="$(ELF_FORMAT)"
 
-extra-y += u-boot.lds
+extra-y += barebox.lds
diff --git a/arch/sandbox/lib/u-boot.lds.S b/arch/sandbox/lib/barebox.lds.S
index 25d42b1e5e..53e9f6021a 100644
--- a/arch/sandbox/lib/u-boot.lds.S
+++ b/arch/sandbox/lib/barebox.lds.S
@@ -1,4 +1,4 @@
-#include <asm-generic/u-boot.lds.h>
+#include <asm-generic/barebox.lds.h>
 
 OUTPUT_FORMAT(ELF_FORMAT)
 OUTPUT_ARCH(ELF_ARCH)
@@ -71,13 +71,13 @@ SECTIONS
   } =0x90909090
 
   . = ALIGN(64);
-  __u_boot_initcalls_start = .;
-  __u_boot_initcalls : { INITCALLS }
-  __u_boot_initcalls_end = .;
+  __barebox_initcalls_start = .;
+  __barebox_initcalls : { INITCALLS }
+  __barebox_initcalls_end = .;
   . = ALIGN(64);
-  __u_boot_cmd_start = .;
-  __u_boot_cmd : { U_BOOT_CMDS }
-  __u_boot_cmd_end = .;
+  __barebox_cmd_start = .;
+  __barebox_cmd : { BAREBOX_CMDS }
+  __barebox_cmd_end = .;
 
   PROVIDE (__etext = .);
   PROVIDE (_etext = .);
diff --git a/arch/sandbox/mach-sandbox/include/mach/hostfile.h b/arch/sandbox/mach-sandbox/include/mach/hostfile.h
index 30f9499c03..f7aca7c0c9 100644
--- a/arch/sandbox/mach-sandbox/include/mach/hostfile.h
+++ b/arch/sandbox/mach-sandbox/include/mach/hostfile.h
@@ -9,7 +9,7 @@ struct hf_platform_data {
 	char *name;
 };
 
-int u_boot_register_filedev(struct hf_platform_data *hf);
+int barebox_register_filedev(struct hf_platform_data *hf);
 
 #endif /* __ASM_ARCH_HOSTFILE_H */
 
diff --git a/arch/sandbox/mach-sandbox/include/mach/linux.h b/arch/sandbox/mach-sandbox/include/mach/linux.h
index 09376413e9..b9053d85ae 100644
--- a/arch/sandbox/mach-sandbox/include/mach/linux.h
+++ b/arch/sandbox/mach-sandbox/include/mach/linux.h
@@ -12,7 +12,7 @@ int linux_getc (void);
 void linux_putc (const char c);
 int linux_tstc(int fd);
 
-int u_boot_register_console(char *name_template, int stdinfd, int stdoutfd);
+int barebox_register_console(char *name_template, int stdinfd, int stdoutfd);
 
 struct linux_console_data {
 	int stdinfd;
diff --git a/arch/sandbox/os/common.c b/arch/sandbox/os/common.c
index e89d8a6d36..90486f889f 100644
--- a/arch/sandbox/os/common.c
+++ b/arch/sandbox/os/common.c
@@ -1,5 +1,5 @@
 /*
- * common.c - common wrapper functions between U-Boot and the host
+ * common.c - common wrapper functions between barebox and the host
  *
  * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
  *
@@ -22,10 +22,10 @@
 
 /**
  * @file
- * @brief Common wrapper functions between U-Boot and the host
+ * @brief Common wrapper functions between barebox and the host
  */
 /*
- * These are host includes. Never include any U-Boot header
+ * These are host includes. Never include any barebox header
  * files here...
  */
 #include <stdio.h>
@@ -45,7 +45,7 @@
 #include <signal.h>
 #include <sys/select.h>
 /*
- * ...except the ones needed to connect with U-Boot
+ * ...except the ones needed to connect with barebox
  */
 #include <mach/linux.h>
 #include <mach/hostfile.h>
@@ -96,7 +96,7 @@ int linux_tstc(int fd)
 
 	/*
 	 * We set the timeout here to 100us, because otherwise
-	 * U-Boot would eat all cpu resources while waiting
+	 * barebox would eat all cpu resources while waiting
 	 * for input.
 	 */
 	ret = select(fd + 1, &rfds, NULL, NULL, &tv);
@@ -217,7 +217,7 @@ void  flush_cache(unsigned long dummy1, unsigned long dummy2)
 	/* why should we? */
 }
 
-extern void start_uboot(void);
+extern void start_barebox(void);
 extern void mem_malloc_init(void *start, void *end);
 
 static int add_image(char *str, char *name)
@@ -267,7 +267,7 @@ static int add_image(char *str, char *name)
 			printf("warning: mmapping %s failed\n", file);
 	}
 
-	ret = u_boot_register_filedev(hf);
+	ret = barebox_register_filedev(hf);
 	if (ret)
 		goto err_out;
 	return 0;
@@ -329,7 +329,7 @@ int main(int argc, char *argv[])
 				exit(1);
 			}
 
-			u_boot_register_console("cout", -1, fd);
+			barebox_register_console("cout", -1, fd);
 			break;
 		case 'I':
 			fd = open(optarg, O_RDWR);
@@ -338,17 +338,17 @@ int main(int argc, char *argv[])
 				exit(1);
 			}
 
-			u_boot_register_console("cin", fd, -1);
+			barebox_register_console("cin", fd, -1);
 			break;
 		default:
 			exit(1);
 		}
 	}
 
-	u_boot_register_console("console", fileno(stdin), fileno(stdout));
+	barebox_register_console("console", fileno(stdin), fileno(stdout));
 
 	rawmode();
-	start_uboot();
+	start_barebox();
 
 	/* never reached */
 	return 0;
@@ -363,12 +363,12 @@ static void print_usage(const char *prgname)
 {
 	printf(
 "Usage: %s [OPTIONS]\n"
-"Start U-Boot.\n"
+"Start barebox.\n"
 "Options:\n"
-"  -i <file>   Map a file to U-Boot. This option can be given multiple\n"
+"  -i <file>   Map a file to barebox. This option can be given multiple\n"
 "              times. The files will show up as /dev/fd0 ... /dev/fdx\n"
-"              under U-Boot.\n"
-"  -e <file>   Map a file to U-Boot. With this option files are mapped as\n"
+"              under barebox.\n"
+"  -e <file>   Map a file to barebox. With this option files are mapped as\n"
 "              /dev/env0 ... /dev/envx and thus are used as default\n"
 "              environment. An empty file generated with dd will do to get\n"
 "              started wth an empty environment\n"
@@ -381,27 +381,27 @@ static void print_usage(const char *prgname)
 }
 
 /**
- * @page uboot_simul U-Boot Simulator
+ * @page barebox_simul barebox Simulator
  *
- * U-Boot can be run as a simulator on your host to check and debug new non
+ * barebox can be run as a simulator on your host to check and debug new non
  * hardware related features.
  *
- * @section simu_build How to build U-Boot for simulation
+ * @section simu_build How to build barebox for simulation
  *
- * @section simu_run How to run U-Boot simulator
+ * @section simu_run How to run barebox simulator
  *
- * $ uboot [\<OPTIONS\>]
+ * $ barebox [\<OPTIONS\>]
  *
  * Options can be:
  *
  * -i \<file\>
  *
- * Map a \<file\> to U-Boot. This option can be given multiple times. The \<file\>s
- * will show up as /dev/fd0 ... /dev/fdx in the U-Boot simulator.
+ * Map a \<file\> to barebox. This option can be given multiple times. The \<file\>s
+ * will show up as /dev/fd0 ... /dev/fdx in the barebox simulator.
  *
  * -e \<file\>
  *
- * Map \<file\> to U-Boot. With this option \<file\>s are mapped as /dev/env0 ...
+ * Map \<file\> to barebox. With this option \<file\>s are mapped as /dev/env0 ...
  * /dev/envx and thus are used as default environment. A clean file generated
  * with dd will do to get started with an empty environment
  *
@@ -415,6 +415,6 @@ static void print_usage(const char *prgname)
  * Register \<file\> as a console capable of doing stdin. \<file\> can be a regular
  * file or a fifo.
  *
- * @section simu_dbg How to debug U-Boot simulator
+ * @section simu_dbg How to debug barebox simulator
  *
  */
author	Sascha Hauer <s.hauer@pengutronix.de>	2009-12-15 09:11:09 +0100
committer	Sascha Hauer <s.hauer@pengutronix.de>	2009-12-15 10:18:30 +0100
commit	a3ffa97f40dc81f2d6b07ee964f2340fe0c1ba97 (patch)
tree	7a9076c1a20df00baeadca9a07d4c1f5cd0611e2 /arch
parent	caa5cec7b1c93d660aa89d24eb160ab18e4eb628 (diff)
download	barebox-a3ffa97f40dc81f2d6b07ee964f2340fe0c1ba97.tar.gz barebox-a3ffa97f40dc81f2d6b07ee964f2340fe0c1ba97.tar.xz