mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-26 07:17:10 +00:00
replace CONFIG_PRELOADER with CONFIG_SPL_BUILD
replace all occurences of CONFIG_PRELOADER with CONFIG_SPL_BUILD Signed-off-by: Aneesh V <aneesh@ti.com>
This commit is contained in:
parent
05bad4aa56
commit
401bb30b6d
22 changed files with 70 additions and 70 deletions
2
README
2
README
|
@ -3075,7 +3075,7 @@ Low Level (hardware related) configuration options:
|
||||||
other boot loader or by a debugger which performs
|
other boot loader or by a debugger which performs
|
||||||
these initializations itself.
|
these initializations itself.
|
||||||
|
|
||||||
- CONFIG_PRELOADER
|
- CONFIG_SPL_BUILD
|
||||||
Modifies the behaviour of start.S when compiling a loader
|
Modifies the behaviour of start.S when compiling a loader
|
||||||
that is executed before the actual U-Boot. E.g. when
|
that is executed before the actual U-Boot. E.g. when
|
||||||
compiling a NAND SPL.
|
compiling a NAND SPL.
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
#include <version.h>
|
#include <version.h>
|
||||||
.globl _start
|
.globl _start
|
||||||
_start: b reset
|
_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
|
_irq: .word irq
|
||||||
_fiq: .word fiq
|
_fiq: .word fiq
|
||||||
_pad: .word 0x12345678 /* now 16*4=64 */
|
_pad: .word 0x12345678 /* now 16*4=64 */
|
||||||
#endif /* CONFIG_PRELOADER */
|
#endif /* CONFIG_SPL_BUILD */
|
||||||
.global _end_vect
|
.global _end_vect
|
||||||
_end_vect:
|
_end_vect:
|
||||||
|
|
||||||
|
@ -201,7 +201,7 @@ copy_loop:
|
||||||
cmp r0, r2 /* until source end address [r2] */
|
cmp r0, r2 /* until source end address [r2] */
|
||||||
blo copy_loop
|
blo copy_loop
|
||||||
|
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
/*
|
/*
|
||||||
* fix .rel.dyn relocations
|
* fix .rel.dyn relocations
|
||||||
*/
|
*/
|
||||||
|
@ -243,7 +243,7 @@ fixnext:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
clear_bss:
|
clear_bss:
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
ldr r0, _bss_start_ofs
|
ldr r0, _bss_start_ofs
|
||||||
ldr r1, _bss_end_ofs
|
ldr r1, _bss_end_ofs
|
||||||
mov r4, r6 /* reloc addr */
|
mov r4, r6 /* reloc addr */
|
||||||
|
@ -255,7 +255,7 @@ clbss_l:str r2, [r0] /* clear loop... */
|
||||||
add r0, r0, #4
|
add r0, r0, #4
|
||||||
cmp r0, r1
|
cmp r0, r1
|
||||||
bne clbss_l
|
bne clbss_l
|
||||||
#endif /* #ifndef CONFIG_PRELOADER */
|
#endif /* #ifndef CONFIG_SPL_BUILD */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* 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
|
||||||
|
@ -329,7 +329,7 @@ cpu_init_crit:
|
||||||
mov pc, lr /* back to my caller */
|
mov pc, lr /* back to my caller */
|
||||||
#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
|
#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
|
||||||
|
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
/*
|
/*
|
||||||
*************************************************************************
|
*************************************************************************
|
||||||
*
|
*
|
||||||
|
@ -436,17 +436,17 @@ cpu_init_crit:
|
||||||
.macro get_fiq_stack @ setup FIQ stack
|
.macro get_fiq_stack @ setup FIQ stack
|
||||||
ldr sp, FIQ_STACK_START
|
ldr sp, FIQ_STACK_START
|
||||||
.endm
|
.endm
|
||||||
#endif /* CONFIG_PRELOADER */
|
#endif /* CONFIG_SPL_BUILD */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* exception handlers
|
* exception handlers
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_PRELOADER
|
#ifdef CONFIG_SPL_BUILD
|
||||||
.align 5
|
.align 5
|
||||||
do_hang:
|
do_hang:
|
||||||
ldr sp, _TEXT_BASE /* use 32 words about stack */
|
ldr sp, _TEXT_BASE /* use 32 words about stack */
|
||||||
bl hang /* hang and never return */
|
bl hang /* hang and never return */
|
||||||
#else /* !CONFIG_PRELOADER */
|
#else /* !CONFIG_SPL_BUILD */
|
||||||
.align 5
|
.align 5
|
||||||
undefined_instruction:
|
undefined_instruction:
|
||||||
get_bad_stack
|
get_bad_stack
|
||||||
|
@ -519,4 +519,4 @@ arm1136_cache_flush:
|
||||||
mcr p15, 0, r1, c7, c14, 0 @ invalidate D cache
|
mcr p15, 0, r1, c7, c14, 0 @ invalidate D cache
|
||||||
#endif
|
#endif
|
||||||
mov pc, lr @ back to caller
|
mov pc, lr @ back to caller
|
||||||
#endif /* CONFIG_PRELOADER */
|
#endif /* CONFIG_SPL_BUILD */
|
||||||
|
|
|
@ -263,7 +263,7 @@ copy_loop:
|
||||||
cmp r0, r2 /* until source end address [r2] */
|
cmp r0, r2 /* until source end address [r2] */
|
||||||
blo copy_loop
|
blo copy_loop
|
||||||
|
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
/*
|
/*
|
||||||
* fix .rel.dyn relocations
|
* fix .rel.dyn relocations
|
||||||
*/
|
*/
|
||||||
|
@ -343,7 +343,7 @@ skip_hw_init:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
clear_bss:
|
clear_bss:
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
ldr r0, _bss_start_ofs
|
ldr r0, _bss_start_ofs
|
||||||
ldr r1, _bss_end_ofs
|
ldr r1, _bss_end_ofs
|
||||||
mov r4, r6 /* reloc addr */
|
mov r4, r6 /* reloc addr */
|
||||||
|
|
|
@ -178,7 +178,7 @@ copy_loop:
|
||||||
cmp r0, r2 /* until source end address [r2] */
|
cmp r0, r2 /* until source end address [r2] */
|
||||||
blo copy_loop
|
blo copy_loop
|
||||||
|
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
/*
|
/*
|
||||||
* fix .rel.dyn relocations
|
* fix .rel.dyn relocations
|
||||||
*/
|
*/
|
||||||
|
@ -220,7 +220,7 @@ fixnext:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
clear_bss:
|
clear_bss:
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
ldr r0, _bss_start_ofs
|
ldr r0, _bss_start_ofs
|
||||||
ldr r1, _bss_end_ofs
|
ldr r1, _bss_end_ofs
|
||||||
mov r4, r6 /* reloc addr */
|
mov r4, r6 /* reloc addr */
|
||||||
|
|
|
@ -221,7 +221,7 @@ copy_loop:
|
||||||
cmp r0, r2 /* until source end address [r2] */
|
cmp r0, r2 /* until source end address [r2] */
|
||||||
blo copy_loop
|
blo copy_loop
|
||||||
|
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
/*
|
/*
|
||||||
* fix .rel.dyn relocations
|
* fix .rel.dyn relocations
|
||||||
*/
|
*/
|
||||||
|
@ -263,7 +263,7 @@ fixnext:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
clear_bss:
|
clear_bss:
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
ldr r0, _bss_start_ofs
|
ldr r0, _bss_start_ofs
|
||||||
ldr r1, _bss_end_ofs
|
ldr r1, _bss_end_ofs
|
||||||
mov r4, r6 /* reloc addr */
|
mov r4, r6 /* reloc addr */
|
||||||
|
|
|
@ -215,7 +215,7 @@ copy_loop:
|
||||||
cmp r0, r2 /* until source end address [r2] */
|
cmp r0, r2 /* until source end address [r2] */
|
||||||
blo copy_loop
|
blo copy_loop
|
||||||
|
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
/*
|
/*
|
||||||
* fix .rel.dyn relocations
|
* fix .rel.dyn relocations
|
||||||
*/
|
*/
|
||||||
|
@ -257,7 +257,7 @@ fixnext:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
clear_bss:
|
clear_bss:
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
ldr r0, _bss_start_ofs
|
ldr r0, _bss_start_ofs
|
||||||
ldr r1, _bss_end_ofs
|
ldr r1, _bss_end_ofs
|
||||||
mov r4, r6 /* reloc addr */
|
mov r4, r6 /* reloc addr */
|
||||||
|
|
|
@ -54,7 +54,7 @@
|
||||||
.globl _start
|
.globl _start
|
||||||
_start:
|
_start:
|
||||||
b reset
|
b reset
|
||||||
#ifdef CONFIG_PRELOADER
|
#ifdef CONFIG_SPL_BUILD
|
||||||
/* No exception handlers in preloader */
|
/* No exception handlers in preloader */
|
||||||
ldr pc, _hang
|
ldr pc, _hang
|
||||||
ldr pc, _hang
|
ldr pc, _hang
|
||||||
|
@ -98,7 +98,7 @@ _irq:
|
||||||
_fiq:
|
_fiq:
|
||||||
.word fiq
|
.word fiq
|
||||||
|
|
||||||
#endif /* CONFIG_PRELOADER */
|
#endif /* CONFIG_SPL_BUILD */
|
||||||
.balignl 16,0xdeadbeef
|
.balignl 16,0xdeadbeef
|
||||||
|
|
||||||
|
|
||||||
|
@ -214,7 +214,7 @@ copy_loop:
|
||||||
cmp r0, r2 /* until source end address [r2] */
|
cmp r0, r2 /* until source end address [r2] */
|
||||||
blo copy_loop
|
blo copy_loop
|
||||||
|
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
/*
|
/*
|
||||||
* fix .rel.dyn relocations
|
* fix .rel.dyn relocations
|
||||||
*/
|
*/
|
||||||
|
@ -256,7 +256,7 @@ fixnext:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
clear_bss:
|
clear_bss:
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
ldr r0, _bss_start_ofs
|
ldr r0, _bss_start_ofs
|
||||||
ldr r1, _bss_end_ofs
|
ldr r1, _bss_end_ofs
|
||||||
mov r4, r6 /* reloc addr */
|
mov r4, r6 /* reloc addr */
|
||||||
|
@ -343,7 +343,7 @@ cpu_init_crit:
|
||||||
mov pc, lr /* back to my caller */
|
mov pc, lr /* back to my caller */
|
||||||
#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
|
#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
|
||||||
|
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
/*
|
/*
|
||||||
*************************************************************************
|
*************************************************************************
|
||||||
*
|
*
|
||||||
|
@ -440,18 +440,18 @@ cpu_init_crit:
|
||||||
.macro get_fiq_stack @ setup FIQ stack
|
.macro get_fiq_stack @ setup FIQ stack
|
||||||
ldr sp, FIQ_STACK_START
|
ldr sp, FIQ_STACK_START
|
||||||
.endm
|
.endm
|
||||||
#endif /* CONFIG_PRELOADER */
|
#endif /* CONFIG_SPL_BUILD */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* exception handlers
|
* exception handlers
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_PRELOADER
|
#ifdef CONFIG_SPL_BUILD
|
||||||
.align 5
|
.align 5
|
||||||
do_hang:
|
do_hang:
|
||||||
ldr sp, _TEXT_BASE /* switch to abort stack */
|
ldr sp, _TEXT_BASE /* switch to abort stack */
|
||||||
1:
|
1:
|
||||||
bl 1b /* hang and never return */
|
bl 1b /* hang and never return */
|
||||||
#else /* !CONFIG_PRELOADER */
|
#else /* !CONFIG_SPL_BUILD */
|
||||||
.align 5
|
.align 5
|
||||||
undefined_instruction:
|
undefined_instruction:
|
||||||
get_bad_stack
|
get_bad_stack
|
||||||
|
@ -514,4 +514,4 @@ fiq:
|
||||||
bl do_fiq
|
bl do_fiq
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
#endif /* CONFIG_PRELOADER */
|
#endif /* CONFIG_SPL_BUILD */
|
||||||
|
|
|
@ -186,7 +186,7 @@ copy_loop:
|
||||||
cmp r0, r2 /* until source end address [r2] */
|
cmp r0, r2 /* until source end address [r2] */
|
||||||
blo copy_loop
|
blo copy_loop
|
||||||
|
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
/*
|
/*
|
||||||
* fix .rel.dyn relocations
|
* fix .rel.dyn relocations
|
||||||
*/
|
*/
|
||||||
|
@ -228,7 +228,7 @@ fixnext:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
clear_bss:
|
clear_bss:
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
ldr r0, _bss_start_ofs
|
ldr r0, _bss_start_ofs
|
||||||
ldr r1, _bss_end_ofs
|
ldr r1, _bss_end_ofs
|
||||||
mov r4, r6 /* reloc addr */
|
mov r4, r6 /* reloc addr */
|
||||||
|
|
|
@ -182,7 +182,7 @@ copy_loop:
|
||||||
cmp r0, r2 /* until source end address [r2] */
|
cmp r0, r2 /* until source end address [r2] */
|
||||||
blo copy_loop
|
blo copy_loop
|
||||||
|
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
/*
|
/*
|
||||||
* fix .rel.dyn relocations
|
* fix .rel.dyn relocations
|
||||||
*/
|
*/
|
||||||
|
@ -224,7 +224,7 @@ fixnext:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
clear_bss:
|
clear_bss:
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
ldr r0, _bss_start_ofs
|
ldr r0, _bss_start_ofs
|
||||||
ldr r1, _bss_end_ofs
|
ldr r1, _bss_end_ofs
|
||||||
mov r4, r6 /* reloc addr */
|
mov r4, r6 /* reloc addr */
|
||||||
|
|
|
@ -182,7 +182,7 @@ stack_setup:
|
||||||
mov sp, r4
|
mov sp, r4
|
||||||
|
|
||||||
adr r0, _start
|
adr r0, _start
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
cmp r0, r6
|
cmp r0, r6
|
||||||
beq clear_bss /* skip relocation */
|
beq clear_bss /* skip relocation */
|
||||||
#endif
|
#endif
|
||||||
|
@ -196,7 +196,7 @@ copy_loop:
|
||||||
cmp r0, r2 /* until source end address [r2] */
|
cmp r0, r2 /* until source end address [r2] */
|
||||||
blo copy_loop
|
blo copy_loop
|
||||||
|
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
/*
|
/*
|
||||||
* fix .rel.dyn relocations
|
* fix .rel.dyn relocations
|
||||||
*/
|
*/
|
||||||
|
@ -248,7 +248,7 @@ clbss_l:str r2, [r0] /* clear loop... */
|
||||||
add r0, r0, #4
|
add r0, r0, #4
|
||||||
cmp r0, r1
|
cmp r0, r1
|
||||||
bne clbss_l
|
bne clbss_l
|
||||||
#endif /* #ifndef CONFIG_PRELOADER */
|
#endif /* #ifndef CONFIG_SPL_BUILD */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* 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,7 +284,7 @@ copy_loop:
|
||||||
cmp r0, r2 /* until source end address [r2] */
|
cmp r0, r2 /* until source end address [r2] */
|
||||||
blo copy_loop
|
blo copy_loop
|
||||||
|
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
/*
|
/*
|
||||||
* fix .rel.dyn relocations
|
* fix .rel.dyn relocations
|
||||||
*/
|
*/
|
||||||
|
@ -326,7 +326,7 @@ fixnext:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
clear_bss:
|
clear_bss:
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
ldr r0, _bss_start_ofs
|
ldr r0, _bss_start_ofs
|
||||||
ldr r1, _bss_end_ofs
|
ldr r1, _bss_end_ofs
|
||||||
mov r4, r6 /* reloc addr */
|
mov r4, r6 /* reloc addr */
|
||||||
|
|
|
@ -195,7 +195,7 @@ copy_loop:
|
||||||
cmp r0, r2 /* until source end address [r2] */
|
cmp r0, r2 /* until source end address [r2] */
|
||||||
blo copy_loop
|
blo copy_loop
|
||||||
|
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
/*
|
/*
|
||||||
* fix .rel.dyn relocations
|
* fix .rel.dyn relocations
|
||||||
*/
|
*/
|
||||||
|
@ -237,7 +237,7 @@ fixnext:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
clear_bss:
|
clear_bss:
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
ldr r0, _bss_start_ofs
|
ldr r0, _bss_start_ofs
|
||||||
ldr r1, _bss_end_ofs
|
ldr r1, _bss_end_ofs
|
||||||
mov r4, r6 /* reloc addr */
|
mov r4, r6 /* reloc addr */
|
||||||
|
|
|
@ -43,7 +43,7 @@ sub pc,pc,#4
|
||||||
|
|
||||||
.globl _start
|
.globl _start
|
||||||
_start: b reset
|
_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
|
||||||
|
@ -77,7 +77,7 @@ _data_abort: .word data_abort
|
||||||
_not_used: .word not_used
|
_not_used: .word not_used
|
||||||
_irq: .word irq
|
_irq: .word irq
|
||||||
_fiq: .word fiq
|
_fiq: .word fiq
|
||||||
#endif /* CONFIG_PRELOADER */
|
#endif /* CONFIG_SPL_BUILD */
|
||||||
|
|
||||||
.balignl 16,0xdeadbeef
|
.balignl 16,0xdeadbeef
|
||||||
|
|
||||||
|
@ -122,7 +122,7 @@ FIQ_STACK_START:
|
||||||
.word 0x0badc0de
|
.word 0x0badc0de
|
||||||
#endif /* CONFIG_USE_IRQ */
|
#endif /* CONFIG_USE_IRQ */
|
||||||
|
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
/* IRQ stack memory (calculated at run-time) + 8 bytes */
|
/* IRQ stack memory (calculated at run-time) + 8 bytes */
|
||||||
.globl IRQ_STACK_START_IN
|
.globl IRQ_STACK_START_IN
|
||||||
IRQ_STACK_START_IN:
|
IRQ_STACK_START_IN:
|
||||||
|
@ -262,7 +262,7 @@ copy_loop:
|
||||||
blo copy_loop
|
blo copy_loop
|
||||||
ldmfd sp!, {r0-r12}
|
ldmfd sp!, {r0-r12}
|
||||||
|
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
/*
|
/*
|
||||||
* fix .rel.dyn relocations
|
* fix .rel.dyn relocations
|
||||||
*/
|
*/
|
||||||
|
@ -301,10 +301,10 @@ fixnext:
|
||||||
add r2, r2, #8 /* each rel.dyn entry is 8 bytes */
|
add r2, r2, #8 /* each rel.dyn entry is 8 bytes */
|
||||||
cmp r2, r3
|
cmp r2, r3
|
||||||
blo fixloop
|
blo fixloop
|
||||||
#endif /* #ifndef CONFIG_PRELOADER */
|
#endif /* #ifndef CONFIG_SPL_BUILD */
|
||||||
|
|
||||||
clear_bss:
|
clear_bss:
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
ldr r0, _bss_start_ofs
|
ldr r0, _bss_start_ofs
|
||||||
ldr r1, _bss_end_ofs
|
ldr r1, _bss_end_ofs
|
||||||
mov r4, r6 /* reloc addr */
|
mov r4, r6 /* reloc addr */
|
||||||
|
@ -316,7 +316,7 @@ clbss_l:str r2, [r0] /* clear loop... */
|
||||||
add r0, r0, #4
|
add r0, r0, #4
|
||||||
cmp r0, r1
|
cmp r0, r1
|
||||||
bne clbss_l
|
bne clbss_l
|
||||||
#endif /* #ifndef CONFIG_PRELOADER */
|
#endif /* #ifndef CONFIG_SPL_BUILD */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* 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
|
||||||
|
@ -350,7 +350,7 @@ _rel_dyn_end_ofs:
|
||||||
_dynsym_start_ofs:
|
_dynsym_start_ofs:
|
||||||
.word __dynsym_start - _start
|
.word __dynsym_start - _start
|
||||||
|
|
||||||
#else /* CONFIG_PRELOADER */
|
#else /* CONFIG_SPL_BUILD */
|
||||||
|
|
||||||
/****************************************************************************/
|
/****************************************************************************/
|
||||||
/* */
|
/* */
|
||||||
|
@ -375,9 +375,9 @@ reset:
|
||||||
/* Start OneNAND IPL */
|
/* Start OneNAND IPL */
|
||||||
ldr pc, =start_oneboot
|
ldr pc, =start_oneboot
|
||||||
|
|
||||||
#endif /* CONFIG_PRELOADER */
|
#endif /* CONFIG_SPL_BUILD */
|
||||||
|
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
/****************************************************************************/
|
/****************************************************************************/
|
||||||
/* */
|
/* */
|
||||||
/* Interrupt handling */
|
/* Interrupt handling */
|
||||||
|
@ -471,7 +471,7 @@ reset:
|
||||||
.macro get_fiq_stack @ setup FIQ stack
|
.macro get_fiq_stack @ setup FIQ stack
|
||||||
ldr sp, FIQ_STACK_START
|
ldr sp, FIQ_STACK_START
|
||||||
.endm
|
.endm
|
||||||
#endif /* CONFIG_PRELOADER
|
#endif /* CONFIG_SPL_BUILD
|
||||||
|
|
||||||
|
|
||||||
/****************************************************************************/
|
/****************************************************************************/
|
||||||
|
@ -480,7 +480,7 @@ reset:
|
||||||
/* */
|
/* */
|
||||||
/****************************************************************************/
|
/****************************************************************************/
|
||||||
|
|
||||||
#ifdef CONFIG_PRELOADER
|
#ifdef CONFIG_SPL_BUILD
|
||||||
.align 5
|
.align 5
|
||||||
do_hang:
|
do_hang:
|
||||||
ldr sp, _TEXT_BASE /* use 32 words abort stack */
|
ldr sp, _TEXT_BASE /* use 32 words abort stack */
|
||||||
|
@ -545,7 +545,7 @@ fiq:
|
||||||
get_bad_stack
|
get_bad_stack
|
||||||
bad_save_user_regs
|
bad_save_user_regs
|
||||||
bl do_fiq
|
bl do_fiq
|
||||||
#endif /* CONFIG_PRELOADER */
|
#endif /* CONFIG_SPL_BUILD */
|
||||||
#endif /* CONFIG_USE_IRQ */
|
#endif /* CONFIG_USE_IRQ */
|
||||||
|
|
||||||
/****************************************************************************/
|
/****************************************************************************/
|
||||||
|
@ -584,7 +584,7 @@ reset_endless:
|
||||||
|
|
||||||
b reset_endless
|
b reset_endless
|
||||||
|
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
.section .mmudata, "a"
|
.section .mmudata, "a"
|
||||||
.align 14
|
.align 14
|
||||||
.globl mmu_table
|
.globl mmu_table
|
||||||
|
@ -604,4 +604,4 @@ mmu_table:
|
||||||
.word (__base << 20) | 0xc12
|
.word (__base << 20) | 0xc12
|
||||||
.set __base, __base + 1
|
.set __base, __base + 1
|
||||||
.endr
|
.endr
|
||||||
#endif /* CONFIG_PRELOADER */
|
#endif /* CONFIG_SPL_BUILD */
|
||||||
|
|
|
@ -167,7 +167,7 @@ copy_loop:
|
||||||
cmp r0, r2 /* until source end address [r2] */
|
cmp r0, r2 /* until source end address [r2] */
|
||||||
blo copy_loop
|
blo copy_loop
|
||||||
|
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
/*
|
/*
|
||||||
* fix .rel.dyn relocations
|
* fix .rel.dyn relocations
|
||||||
*/
|
*/
|
||||||
|
@ -209,7 +209,7 @@ fixnext:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
clear_bss:
|
clear_bss:
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
ldr r0, _bss_start_ofs
|
ldr r0, _bss_start_ofs
|
||||||
ldr r1, _bss_end_ofs
|
ldr r1, _bss_end_ofs
|
||||||
mov r4, r6 /* reloc addr */
|
mov r4, r6 /* reloc addr */
|
||||||
|
|
|
@ -171,7 +171,7 @@ copy_loop:
|
||||||
cmp r0, r2 /* until source end address [r2] */
|
cmp r0, r2 /* until source end address [r2] */
|
||||||
blo copy_loop
|
blo copy_loop
|
||||||
|
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
/*
|
/*
|
||||||
* fix .rel.dyn relocations
|
* fix .rel.dyn relocations
|
||||||
*/
|
*/
|
||||||
|
@ -213,7 +213,7 @@ fixnext:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
clear_bss:
|
clear_bss:
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
ldr r0, _bss_start_ofs
|
ldr r0, _bss_start_ofs
|
||||||
ldr r1, _bss_end_ofs
|
ldr r1, _bss_end_ofs
|
||||||
mov r4, r6 /* reloc addr */
|
mov r4, r6 /* reloc addr */
|
||||||
|
|
|
@ -364,7 +364,7 @@ void board_init_f (ulong bootflag)
|
||||||
|
|
||||||
debug ("Reserving %ldk for U-Boot at: %08lx\n", gd->mon_len >> 10, addr);
|
debug ("Reserving %ldk for U-Boot at: %08lx\n", gd->mon_len >> 10, addr);
|
||||||
|
|
||||||
#ifndef CONFIG_PRELOADER
|
#ifndef CONFIG_SPL_BUILD
|
||||||
/*
|
/*
|
||||||
* reserve memory for malloc() arena
|
* reserve memory for malloc() arena
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -35,7 +35,7 @@ LDSCRIPT= $(TOPDIR)/mmc_spl/board/$(BOARDDIR)/u-boot.lds
|
||||||
LDFLAGS = -Bstatic -T $(mmcobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)
|
LDFLAGS = -Bstatic -T $(mmcobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)
|
||||||
AFLAGS += -DCONFIG_MMC_SPL
|
AFLAGS += -DCONFIG_MMC_SPL
|
||||||
CFLAGS += -DCONFIG_MMC_SPL
|
CFLAGS += -DCONFIG_MMC_SPL
|
||||||
CFLAGS += -DCONFIG_PRELOADER
|
CFLAGS += -DCONFIG_SPL_BUILD
|
||||||
|
|
||||||
SOBJS = start.o mem_setup.o lowlevel_init.o
|
SOBJS = start.o mem_setup.o lowlevel_init.o
|
||||||
COBJS = mmc_boot.o
|
COBJS = mmc_boot.o
|
||||||
|
|
|
@ -33,8 +33,8 @@ nandobj := $(OBJTREE)/nand_spl/
|
||||||
LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
|
LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
|
||||||
LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
|
LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
|
||||||
$(LDFLAGS_FINAL)
|
$(LDFLAGS_FINAL)
|
||||||
AFLAGS += -DCONFIG_PRELOADER -DCONFIG_NAND_SPL
|
AFLAGS += -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL
|
||||||
CFLAGS += -DCONFIG_PRELOADER -DCONFIG_NAND_SPL
|
CFLAGS += -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL
|
||||||
|
|
||||||
SOBJS = start.o _udivsi3.o _divsi3.o
|
SOBJS = start.o _udivsi3.o _divsi3.o
|
||||||
COBJS = cpu.o davinci_nand.o ns16550.o div0.o davinci_pinmux.o psc.o \
|
COBJS = cpu.o davinci_nand.o ns16550.o div0.o davinci_pinmux.o psc.o \
|
||||||
|
|
|
@ -8,8 +8,8 @@ nandobj := $(OBJTREE)/nand_spl/
|
||||||
LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
|
LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
|
||||||
LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
|
LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
|
||||||
$(LDFLAGS_FINAL)
|
$(LDFLAGS_FINAL)
|
||||||
AFLAGS += -DCONFIG_PRELOADER -DCONFIG_NAND_SPL
|
AFLAGS += -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL
|
||||||
CFLAGS += -DCONFIG_PRELOADER -DCONFIG_NAND_SPL
|
CFLAGS += -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL
|
||||||
|
|
||||||
SOBJS = start.o lowlevel_init.o
|
SOBJS = start.o lowlevel_init.o
|
||||||
COBJS = nand_boot_fsl_nfc.o
|
COBJS = nand_boot_fsl_nfc.o
|
||||||
|
|
|
@ -29,8 +29,8 @@ nandobj := $(OBJTREE)/nand_spl/
|
||||||
LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
|
LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
|
||||||
LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
|
LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
|
||||||
$(LDFLAGS_FINAL)
|
$(LDFLAGS_FINAL)
|
||||||
AFLAGS += -DCONFIG_PRELOADER -DCONFIG_NAND_SPL
|
AFLAGS += -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL
|
||||||
CFLAGS += -DCONFIG_PRELOADER -DCONFIG_NAND_SPL
|
CFLAGS += -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL
|
||||||
|
|
||||||
SOBJS = start.o lowlevel_init.o
|
SOBJS = start.o lowlevel_init.o
|
||||||
COBJS = nand_boot_fsl_nfc.o
|
COBJS = nand_boot_fsl_nfc.o
|
||||||
|
|
|
@ -4,8 +4,8 @@ include $(TOPDIR)/onenand_ipl/board/$(BOARDDIR)/config.mk
|
||||||
|
|
||||||
LDSCRIPT= $(TOPDIR)/onenand_ipl/board/$(BOARDDIR)/u-boot.onenand.lds
|
LDSCRIPT= $(TOPDIR)/onenand_ipl/board/$(BOARDDIR)/u-boot.onenand.lds
|
||||||
LDFLAGS = -Bstatic -T $(onenandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)
|
LDFLAGS = -Bstatic -T $(onenandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)
|
||||||
AFLAGS += -DCONFIG_PRELOADER -DCONFIG_ONENAND_IPL
|
AFLAGS += -DCONFIG_SPL_BUILD -DCONFIG_ONENAND_IPL
|
||||||
CFLAGS += -DCONFIG_PRELOADER -DCONFIG_ONENAND_IPL
|
CFLAGS += -DCONFIG_SPL_BUILD -DCONFIG_ONENAND_IPL
|
||||||
OBJCFLAGS += --gap-fill=0x00
|
OBJCFLAGS += --gap-fill=0x00
|
||||||
|
|
||||||
SOBJS := low_levelinit.o
|
SOBJS := low_levelinit.o
|
||||||
|
|
|
@ -4,8 +4,8 @@ include $(TOPDIR)/board/$(BOARDDIR)/config.mk
|
||||||
|
|
||||||
LDSCRIPT= $(TOPDIR)/onenand_ipl/board/$(BOARDDIR)/u-boot.onenand.lds
|
LDSCRIPT= $(TOPDIR)/onenand_ipl/board/$(BOARDDIR)/u-boot.onenand.lds
|
||||||
LDFLAGS = -Bstatic -T $(onenandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)
|
LDFLAGS = -Bstatic -T $(onenandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS)
|
||||||
AFLAGS += -DCONFIG_PRELOADER -DCONFIG_ONENAND_IPL
|
AFLAGS += -DCONFIG_SPL_BUILD -DCONFIG_ONENAND_IPL
|
||||||
CFLAGS += -DCONFIG_PRELOADER -DCONFIG_ONENAND_IPL
|
CFLAGS += -DCONFIG_SPL_BUILD -DCONFIG_ONENAND_IPL
|
||||||
OBJCFLAGS += --gap-fill=0x00
|
OBJCFLAGS += --gap-fill=0x00
|
||||||
|
|
||||||
SOBJS += start.o
|
SOBJS += start.o
|
||||||
|
|
Loading…
Add table
Reference in a new issue