summaryrefslogtreecommitdiffstats
path: root/arch/arm/lib
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2009-12-15 09:11:09 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2009-12-15 10:18:30 +0100
commita3ffa97f40dc81f2d6b07ee964f2340fe0c1ba97 (patch)
tree7a9076c1a20df00baeadca9a07d4c1f5cd0611e2 /arch/arm/lib
parentcaa5cec7b1c93d660aa89d24eb160ab18e4eb628 (diff)
downloadbarebox-a3ffa97f40dc81f2d6b07ee964f2340fe0c1ba97.tar.gz
barebox-a3ffa97f40dc81f2d6b07ee964f2340fe0c1ba97.tar.xz
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>
Diffstat (limited to 'arch/arm/lib')
-rw-r--r--arch/arm/lib/.gitignore2
-rw-r--r--arch/arm/lib/Makefile2
-rw-r--r--arch/arm/lib/arm.c2
-rw-r--r--arch/arm/lib/armlinux.c18
-rw-r--r--arch/arm/lib/barebox.lds.S (renamed from arch/arm/lib/u-boot.lds.S)16
5 files changed, 20 insertions, 20 deletions
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);