GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-28 18:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

arm: Remove deprecated and now unused NAND SPL

Browse source 
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
This commit is contained in:
Benoît Thébaudeau 2013-04-11 09:36:01 +00:00 • committed by Albert ARIBAUD
parent e53232250b
commit 66f30bf983
3 changed files with 6 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/config.mk
View file

@ -87,9 +87,7 @@ endif
endif endif
# needed for relocation # needed for relocation
ifndef CONFIG_NAND_SPL
LDFLAGS_u-boot += -pie LDFLAGS_u-boot += -pie
endif
# #
# FIXME: binutils versions < 2.22 have a bug in the assembler where # FIXME: binutils versions < 2.22 have a bug in the assembler where

12
arch/arm/cpu/arm1176/start.S
View file

@ -51,7 +51,7 @@
.globl _start .globl _start
_start: b reset _start: b reset
#ifndef CONFIG_NAND_SPL #ifndef CONFIG_SPL_BUILD
ldr pc, _undefined_instruction ldr pc, _undefined_instruction
ldr pc, _software_interrupt ldr pc, _software_interrupt
ldr pc, _prefetch_abort ldr pc, _prefetch_abort
@ -98,15 +98,11 @@ _end_vect:
.globl _TEXT_BASE .globl _TEXT_BASE
_TEXT_BASE: _TEXT_BASE:
#ifdef CONFIG_NAND_SPL /* deprecated, use instead CONFIG_SPL_BUILD */
.word CONFIG_SYS_TEXT_BASE
#else
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE) #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE)
.word CONFIG_SPL_TEXT_BASE .word CONFIG_SPL_TEXT_BASE
#else #else
.word CONFIG_SYS_TEXT_BASE .word CONFIG_SYS_TEXT_BASE
#endif #endif
#endif
/* /*
* Below variable is very important because we use MMU in U-Boot. * Below variable is very important because we use MMU in U-Boot.
@ -176,7 +172,7 @@ cpu_init_crit:
* When booting from NAND - it has definitely been a reset, so, no need * When booting from NAND - it has definitely been a reset, so, no need
* to flush caches and disable the MMU * to flush caches and disable the MMU
*/ */
#ifndef CONFIG_NAND_SPL #ifndef CONFIG_SPL_BUILD
/* /*
* flush v4 I/D caches * flush v4 I/D caches
*/ */
@ -361,7 +357,7 @@ c_runtime_cpu_setup:
mov pc, lr mov pc, lr
#ifndef CONFIG_NAND_SPL #ifndef CONFIG_SPL_BUILD
/* /*
* we assume that cache operation is done before. (eg. cleanup_before_linux()) * we assume that cache operation is done before. (eg. cleanup_before_linux())
* actually, we don't need to do anything about cache if not use d-cache in * actually, we don't need to do anything about cache if not use d-cache in
@ -539,4 +535,4 @@ fiq:
get_bad_stack get_bad_stack
bad_save_user_regs bad_save_user_regs
bl do_fiq bl do_fiq
#endif /* CONFIG_NAND_SPL */ #endif /* CONFIG_SPL_BUILD */

16
arch/arm/lib/crt0.S
View file

@ -64,7 +64,7 @@
* have some work left to do at this point regarding memory, so * have some work left to do at this point regarding memory, so
* call c_runtime_cpu_setup. * call c_runtime_cpu_setup.
* *
* 6. Branch to either nand_boot() or board_init_r(). * 6. Branch to board_init_r().
*/ */
/* /*
@ -77,10 +77,7 @@ ENTRY(_main)
* Set up initial C runtime environment and call board_init_f(0). * Set up initial C runtime environment and call board_init_f(0).
*/ */
#if defined(CONFIG_NAND_SPL) #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_STACK)
/* deprecated, use instead CONFIG_SPL_BUILD */
ldr sp, =(CONFIG_SYS_INIT_SP_ADDR)
#elif defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_STACK)
ldr sp, =(CONFIG_SPL_STACK) ldr sp, =(CONFIG_SPL_STACK)
#else #else
ldr sp, =(CONFIG_SYS_INIT_SP_ADDR) ldr sp, =(CONFIG_SYS_INIT_SP_ADDR)
@ -129,21 +126,12 @@ clbss_l:cmp r0, r1 /* while not at end of BSS */
bl coloured_LED_init bl coloured_LED_init
bl red_led_on bl red_led_on
#if defined(CONFIG_NAND_SPL)
/* call _nand_boot() */
ldr pc, =nand_boot
#else
/* call board_init_r(gd_t *id, ulong dest_addr) */ /* call board_init_r(gd_t *id, ulong dest_addr) */
mov r0, r8 /* gd_t */ mov r0, r8 /* gd_t */
ldr r1, [r8, #GD_RELOCADDR] /* dest_addr */ ldr r1, [r8, #GD_RELOCADDR] /* dest_addr */
/* call board_init_r */ /* call board_init_r */
ldr pc, =board_init_r /* this is auto-relocated! */ ldr pc, =board_init_r /* this is auto-relocated! */
#endif
/* we should not return here. */ /* we should not return here. */
#endif #endif