diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2007-07-12 11:52:12 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2007-07-12 11:52:12 +0200 |
| commit | 3b4647f772de5a637c6700fa6938f6a0db45dbcb (patch) | |
| tree | e1bbc92b0a8c80ad04f0e5156f903717be1ba921 /arch | |
| parent | ce192d40db78c78b779772258cbc2354215fdd06 (diff) | |
| download | barebox-3b4647f772de5a637c6700fa6938f6a0db45dbcb.tar.gz barebox-3b4647f772de5a637c6700fa6938f6a0db45dbcb.tar.xz | |
_armboot_start -> _u_boot_start
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/cpu.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/start-arm920t.S | 6 | ||||
| -rw-r--r-- | arch/arm/lib/arm.c | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/cpu/cpu.c b/arch/arm/cpu/cpu.c index f3d01798f8..e2b31edec5 100644 --- a/arch/arm/cpu/cpu.c +++ b/arch/arm/cpu/cpu.c @@ -99,7 +99,7 @@ static int cpu_init (void) /* * setup up stacks if necessary */ - IRQ_STACK_START = _armboot_start - CFG_MALLOC_LEN - CFG_GBL_DATA_SIZE - 4; + IRQ_STACK_START = _u_boot_start - CFG_MALLOC_LEN - CFG_GBL_DATA_SIZE - 4; FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ; return 0; } diff --git a/arch/arm/cpu/start-arm920t.S b/arch/arm/cpu/start-arm920t.S index 1cf239113a..ecc505c5e1 100644 --- a/arch/arm/cpu/start-arm920t.S +++ b/arch/arm/cpu/start-arm920t.S @@ -74,8 +74,8 @@ _fiq: .word fiq _TEXT_BASE: .word TEXT_BASE -.globl _armboot_start -_armboot_start: +.globl _u_boot_start +_u_boot_start: .word _start _MALLOC_START: @@ -172,7 +172,7 @@ relocate: /* relocate U-Boot to RAM */ cmp r0, r1 /* don't reloc during debug */ beq stack_setup - ldr r2, _armboot_start + ldr r2, _u_boot_start ldr r3, _bss_start sub r2, r3, r2 /* r2 <- size of armboot */ add r2, r0, r2 /* r2 <- source end address */ diff --git a/arch/arm/lib/arm.c b/arch/arm/lib/arm.c index 0749600042..0df99d742c 100644 --- a/arch/arm/lib/arm.c +++ b/arch/arm/lib/arm.c @@ -2,11 +2,12 @@ #include <init.h> #include <mem_malloc.h> #include <asm/u-boot-arm.h> +#include <reloc.h> int arm_mem_malloc_init(void) { - mem_malloc_init((void *)(_armboot_start - CFG_MALLOC_LEN), - (void *)_armboot_start); + mem_malloc_init((void *)(_u_boot_start - CFG_MALLOC_LEN), + (void *)_u_boot_start); return 0; } |