sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

_armboot_start -> _u_boot_start

This commit is contained in:
Sascha Hauer 2007-07-12 11:52:12 +02:00
parent ce192d40db
commit 3b4647f772
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/cpu.c
View File

@ -99,7 +99,7 @@ static int cpu_init (void)
/* /*
* setup up stacks if necessary * 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; FIQ_STACK_START = IRQ_STACK_START - CONFIG_STACKSIZE_IRQ;
return 0; return 0;
} }

6
arch/arm/cpu/start-arm920t.S
View File

@ -74,8 +74,8 @@ _fiq: .word fiq
_TEXT_BASE: _TEXT_BASE:
.word TEXT_BASE .word TEXT_BASE
.globl _armboot_start .globl _u_boot_start
_armboot_start: _u_boot_start:
.word _start .word _start
_MALLOC_START: _MALLOC_START:
@ -172,7 +172,7 @@ relocate: /* relocate U-Boot to RAM */
cmp r0, r1 /* don't reloc during debug */ cmp r0, r1 /* don't reloc during debug */
beq stack_setup beq stack_setup
ldr r2, _armboot_start ldr r2, _u_boot_start
ldr r3, _bss_start ldr r3, _bss_start
sub r2, r3, r2 /* r2 <- size of armboot */ sub r2, r3, r2 /* r2 <- size of armboot */
add r2, r0, r2 /* r2 <- source end address */ add r2, r0, r2 /* r2 <- source end address */

5
arch/arm/lib/arm.c
View File

@ -2,11 +2,12 @@
#include <init.h> #include <init.h>
#include <mem_malloc.h> #include <mem_malloc.h>
#include <asm/u-boot-arm.h> #include <asm/u-boot-arm.h>
#include <reloc.h>
int arm_mem_malloc_init(void) int arm_mem_malloc_init(void)
{ {
mem_malloc_init((void *)(_armboot_start - CFG_MALLOC_LEN), mem_malloc_init((void *)(_u_boot_start - CFG_MALLOC_LEN),
(void *)_armboot_start); (void *)_u_boot_start);
return 0; return 0;
} }