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>

8 files changed, 53 insertions, 53 deletions

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
  *
  */