projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: Fix start.S when used with SPL in arm1136
[platform/kernel/u-boot.git]
/
arch
/
arm
/
cpu
/
arm1136
/
start.S
diff --git
a/arch/arm/cpu/arm1136/start.S
b/arch/arm/cpu/arm1136/start.S
index
aecc943
..
5d3b4c2
100644
(file)
--- a/
arch/arm/cpu/arm1136/start.S
+++ b/
arch/arm/cpu/arm1136/start.S
@@
-3,8
+3,8
@@
*
* Copyright (c) 2004 Texas Instruments <r-woodruff2@ti.com>
*
*
* Copyright (c) 2004 Texas Instruments <r-woodruff2@ti.com>
*
- * Copyright (c) 2001 Marius Gr
ö
ger <mag@sysgo.de>
- * Copyright (c) 2002 Alex Z
ü
pke <azu@sysgo.de>
+ * Copyright (c) 2001 Marius Gr
ö
ger <mag@sysgo.de>
+ * Copyright (c) 2002 Alex Z
ü
pke <azu@sysgo.de>
* Copyright (c) 2002 Gary Jennejohn <garyj@denx.de>
* Copyright (c) 2003 Richard Woodruff <r-woodruff2@ti.com>
* Copyright (c) 2003 Kshitij <kshitij@ti.com>
* Copyright (c) 2002 Gary Jennejohn <garyj@denx.de>
* Copyright (c) 2003 Richard Woodruff <r-woodruff2@ti.com>
* Copyright (c) 2003 Kshitij <kshitij@ti.com>
@@
-33,7
+33,7
@@
#include <version.h>
.globl _start
_start: b reset
#include <version.h>
.globl _start
_start: b reset
-#ifdef CONFIG_
PRELOADER
+#ifdef CONFIG_
SPL_BUILD
ldr pc, _hang
ldr pc, _hang
ldr pc, _hang
ldr pc, _hang
ldr pc, _hang
ldr pc, _hang
@@
-68,7
+68,7
@@
_not_used: .word not_used
_irq: .word irq
_fiq: .word fiq
_pad: .word 0x12345678 /* now 16*4=64 */
_irq: .word irq
_fiq: .word fiq
_pad: .word 0x12345678 /* now 16*4=64 */
-#endif /* CONFIG_
PRELOADER
*/
+#endif /* CONFIG_
SPL_BUILD
*/
.global _end_vect
_end_vect:
.global _end_vect
_end_vect:
@@
-100,25
+100,17
@@
_TEXT_BASE:
_bss_start_ofs:
.word __bss_start - _start
_bss_start_ofs:
.word __bss_start - _start
+.global _image_copy_end_ofs
+_image_copy_end_ofs:
+ .word __image_copy_end - _start
+
.globl _bss_end_ofs
_bss_end_ofs:
.globl _bss_end_ofs
_bss_end_ofs:
- .word _end - _start
-
-.globl _datarel_start_ofs
-_datarel_start_ofs:
- .word __datarel_start - _start
-
-.globl _datarelrolocal_start_ofs
-_datarelrolocal_start_ofs:
- .word __datarelrolocal_start - _start
+ .word __bss_end__ - _start
-.globl _datarellocal_start_ofs
-_datarellocal_start_ofs:
- .word __datarellocal_start - _start
-
-.globl _datarelro_start_ofs
-_datarelro_start_ofs:
- .word __datarelro_start - _start
+.globl _end_ofs
+_end_ofs:
+ .word _end - _start
#ifdef CONFIG_USE_IRQ
/* IRQ stack memory (calculated at run-time) */
#ifdef CONFIG_USE_IRQ
/* IRQ stack memory (calculated at run-time) */
@@
-176,17
+168,10
@@
next:
/* Set stackpointer in internal RAM to call board_init_f */
call_board_init_f:
ldr sp, =(CONFIG_SYS_INIT_SP_ADDR)
/* Set stackpointer in internal RAM to call board_init_f */
call_board_init_f:
ldr sp, =(CONFIG_SYS_INIT_SP_ADDR)
+ bic sp, sp, #7 /* 8-byte alignment for ABI compliance */
ldr r0,=0x00000000
ldr r0,=0x00000000
-#ifdef CONFIG_NAND_SPL
- bl nand_boot
-#else
-#ifdef CONFIG_ONENAND_IPL
- bl start_oneboot
-#else
bl board_init_f
bl board_init_f
-#endif /* CONFIG_ONENAND_IPL */
-#endif /* CONFIG_NAND_SPL */
/*------------------------------------------------------------------------------*/
/*------------------------------------------------------------------------------*/
@@
-202,31
+187,31
@@
relocate_code:
mov r4, r0 /* save addr_sp */
mov r5, r1 /* save addr of gd */
mov r6, r2 /* save addr of destination */
mov r4, r0 /* save addr_sp */
mov r5, r1 /* save addr of gd */
mov r6, r2 /* save addr of destination */
- mov r7, r2 /* save addr of destination */
/* Set up the stack */
stack_setup:
mov sp, r4
adr r0, _start
/* Set up the stack */
stack_setup:
mov sp, r4
adr r0, _start
- ldr r2, _TEXT_BASE
- ldr r3, _bss_start_ofs
- add r2, r0, r3 /* r2 <- source end address */
cmp r0, r6
cmp r0, r6
- beq clear_bss
+ moveq r9, #0 /* no relocation. relocation offset(r9) = 0 */
+ beq clear_bss /* skip relocation */
+ mov r1, r6 /* r1 <- scratch for copy_loop */
+ ldr r3, _image_copy_end_ofs
+ add r2, r0, r3 /* r2 <- source end address */
copy_loop:
ldmia r0!, {r9-r10} /* copy from source address [r0] */
copy_loop:
ldmia r0!, {r9-r10} /* copy from source address [r0] */
- stmia r
6
!, {r9-r10} /* copy to target address [r1] */
+ stmia r
1
!, {r9-r10} /* copy to target address [r1] */
cmp r0, r2 /* until source end address [r2] */
blo copy_loop
cmp r0, r2 /* until source end address [r2] */
blo copy_loop
-#ifndef CONFIG_
PRELOADER
+#ifndef CONFIG_
SPL_BUILD
/*
* fix .rel.dyn relocations
*/
ldr r0, _TEXT_BASE /* r0 <- Text base */
/*
* fix .rel.dyn relocations
*/
ldr r0, _TEXT_BASE /* r0 <- Text base */
- sub r9, r
7
, r0 /* r9 <- relocation offset */
+ sub r9, r
6
, r0 /* r9 <- relocation offset */
ldr r10, _dynsym_start_ofs /* r10 <- sym table ofs */
add r10, r10, r0 /* r10 <- sym table in FLASH */
ldr r2, _rel_dyn_start_ofs /* r2 <- rel dyn start ofs */
ldr r10, _dynsym_start_ofs /* r10 <- sym table ofs */
add r10, r10, r0 /* r10 <- sym table in FLASH */
ldr r2, _rel_dyn_start_ofs /* r2 <- rel dyn start ofs */
@@
-237,10
+222,10
@@
fixloop:
ldr r0, [r2] /* r0 <- location to fix up, IN FLASH! */
add r0, r0, r9 /* r0 <- location to fix up in RAM */
ldr r1, [r2, #4]
ldr r0, [r2] /* r0 <- location to fix up, IN FLASH! */
add r0, r0, r9 /* r0 <- location to fix up in RAM */
ldr r1, [r2, #4]
- and r
8
, r1, #0xff
- cmp r
8
, #23 /* relative fixup? */
+ and r
7
, r1, #0xff
+ cmp r
7
, #23 /* relative fixup? */
beq fixrel
beq fixrel
- cmp r
8
, #2 /* absolute fixup? */
+ cmp r
7
, #2 /* absolute fixup? */
beq fixabs
/* ignore unknown type of fixup */
b fixnext
beq fixabs
/* ignore unknown type of fixup */
b fixnext
@@
-249,7
+234,7
@@
fixabs:
mov r1, r1, LSR #4 /* r1 <- symbol index in .dynsym */
add r1, r10, r1 /* r1 <- address of symbol in table */
ldr r1, [r1, #4] /* r1 <- symbol value */
mov r1, r1, LSR #4 /* r1 <- symbol index in .dynsym */
add r1, r10, r1 /* r1 <- address of symbol in table */
ldr r1, [r1, #4] /* r1 <- symbol value */
- add r1, r
9
/* r1 <- relocated sym addr */
+ add r1, r
1, r9
/* r1 <- relocated sym addr */
b fixnext
fixrel:
/* relative fix: increase location by offset */
b fixnext
fixrel:
/* relative fix: increase location by offset */
@@
-260,23
+245,36
@@
fixnext:
add r2, r2, #8 /* each rel.dyn entry is 8 bytes */
cmp r2, r3
blo fixloop
add r2, r2, #8 /* each rel.dyn entry is 8 bytes */
cmp r2, r3
blo fixloop
+ b clear_bss
+
+_rel_dyn_start_ofs:
+ .word __rel_dyn_start - _start
+_rel_dyn_end_ofs:
+ .word __rel_dyn_end - _start
+_dynsym_start_ofs:
+ .word __dynsym_start - _start
#endif
clear_bss:
#endif
clear_bss:
-#ifndef CONFIG_PRELOADER
+#ifdef CONFIG_SPL_BUILD
+ /* No relocation for SPL */
+ ldr r0, =__bss_start
+ ldr r1, =__bss_end__
+#else
ldr r0, _bss_start_ofs
ldr r1, _bss_end_ofs
ldr r0, _bss_start_ofs
ldr r1, _bss_end_ofs
- ldr r3, _TEXT_BASE /* Text base */
- mov r4, r7 /* reloc addr */
+ mov r4, r6 /* reloc addr */
add r0, r0, r4
add r1, r1, r4
add r0, r0, r4
add r1, r1, r4
+#endif
mov r2, #0x00000000 /* clear */
mov r2, #0x00000000 /* clear */
-clbss_l:str r2, [r0] /* clear loop... */
+clbss_l:cmp r0, r1 /* clear loop... */
+ bhs clbss_e /* if reached end of bss, exit */
+ str r2, [r0]
add r0, r0, #4
add r0, r0, #4
- cmp r0, r1
- bne clbss_l
-#endif /* #ifndef CONFIG_PRELOADER */
+ b clbss_l
+clbss_e:
/*
* We are done. Do not return, instead branch to second part of board
/*
* We are done. Do not return, instead branch to second part of board
@@
-284,10
+282,10
@@
clbss_l:str r2, [r0] /* clear loop... */
*/
#ifdef CONFIG_NAND_SPL
ldr r0, _nand_boot_ofs
*/
#ifdef CONFIG_NAND_SPL
ldr r0, _nand_boot_ofs
- adr r1, _start
- add pc, r0, r1
-_nand_boot_ofs
-
: .word nand_boot - _star
t
+ mov pc, r0
+
+_nand_boot_ofs
:
+
.word nand_boo
t
#else
jump_2_ram:
ldr r0, _board_init_r_ofs
#else
jump_2_ram:
ldr r0, _board_init_r_ofs
@@
-296,7
+294,7
@@
jump_2_ram:
add lr, lr, r9
/* setup parameters for board_init_r */
mov r0, r5 /* gd_t */
add lr, lr, r9
/* setup parameters for board_init_r */
mov r0, r5 /* gd_t */
- mov r1, r
7
/* dest_addr */
+ mov r1, r
6
/* dest_addr */
/* jump to it ... */
mov pc, lr
/* jump to it ... */
mov pc, lr
@@
-304,13
+302,6
@@
_board_init_r_ofs:
.word board_init_r - _start
#endif
.word board_init_r - _start
#endif
-_rel_dyn_start_ofs:
- .word __rel_dyn_start - _start
-_rel_dyn_end_ofs:
- .word __rel_dyn_end - _start
-_dynsym_start_ofs:
- .word __dynsym_start - _start
-
/*
*************************************************************************
*
/*
*************************************************************************
*
@@
-350,7
+341,7
@@
cpu_init_crit:
mov pc, lr /* back to my caller */
#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
mov pc, lr /* back to my caller */
#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
-#ifndef CONFIG_
PRELOADER
+#ifndef CONFIG_
SPL_BUILD
/*
*************************************************************************
*
/*
*************************************************************************
*
@@
-457,17
+448,17
@@
cpu_init_crit:
.macro get_fiq_stack @ setup FIQ stack
ldr sp, FIQ_STACK_START
.endm
.macro get_fiq_stack @ setup FIQ stack
ldr sp, FIQ_STACK_START
.endm
-#endif /* CONFIG_
PRELOADER
*/
+#endif /* CONFIG_
SPL_BUILD
*/
/*
* exception handlers
*/
/*
* exception handlers
*/
-#ifdef CONFIG_
PRELOADER
+#ifdef CONFIG_
SPL_BUILD
.align 5
do_hang:
ldr sp, _TEXT_BASE /* use 32 words about stack */
bl hang /* hang and never return */
.align 5
do_hang:
ldr sp, _TEXT_BASE /* use 32 words about stack */
bl hang /* hang and never return */
-#else /* !CONFIG_
PRELOADER
*/
+#else /* !CONFIG_
SPL_BUILD
*/
.align 5
undefined_instruction:
get_bad_stack
.align 5
undefined_instruction:
get_bad_stack
@@
-533,11
+524,11
@@
fiq:
.align 5
.global arm1136_cache_flush
arm1136_cache_flush:
.align 5
.global arm1136_cache_flush
arm1136_cache_flush:
-#if !defined(CONFIG_SYS_
NO_ICACHE
)
+#if !defined(CONFIG_SYS_
ICACHE_OFF
)
mcr p15, 0, r1, c7, c5, 0 @ invalidate I cache
#endif
mcr p15, 0, r1, c7, c5, 0 @ invalidate I cache
#endif
-#if !defined(CONFIG_SYS_
NO_DCACHE
)
+#if !defined(CONFIG_SYS_
DCACHE_OFF
)
mcr p15, 0, r1, c7, c14, 0 @ invalidate D cache
#endif
mov pc, lr @ back to caller
mcr p15, 0, r1, c7, c14, 0 @ invalidate D cache
#endif
mov pc, lr @ back to caller
-#endif /* CONFIG_
PRELOADER
*/
+#endif /* CONFIG_
SPL_BUILD
*/