summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu
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/cpu
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/cpu')
-rw-r--r--arch/arm/cpu/cpu.c12
-rw-r--r--arch/arm/cpu/cpuinfo.c4
-rw-r--r--arch/arm/cpu/start-arm.S10
3 files changed, 13 insertions, 13 deletions
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