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>

10 files changed, 22 insertions, 22 deletions

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