Your ROOT_URL in app.ini is https://src.whiteboxsystems.nl/ but you are visiting http://src.whiteboxsystems.nl/Whitebox/u-boot/commit/5c6db120fc184bae7a344a4e5da83b21164b59a6
You should set ROOT_URL correctly, otherwise the web may not work correctly.
18 changed files with
36 additions and
65 deletions
arch/arm/cpu/arm1136/start.S
arch/arm/cpu/arm1176/start.S
arch/arm/cpu/arm720t/start.S
arch/arm/cpu/arm920t/start.S
arch/arm/cpu/arm925t/start.S
arch/arm/cpu/arm926ejs/start.S
arch/arm/cpu/arm946es/start.S
arch/arm/cpu/arm_intcm/start.S
arch/arm/cpu/armv7/start.S
arch/arm/cpu/ixp/start.S
arch/arm/cpu/pxa/start.S
arch/arm/cpu/s3c44b0/start.S
arch/arm/cpu/sa1100/start.S
arch/arm/lib/crt0.S
board/freescale/mx31pdk/mx31pdk.c
board/karo/tx25/tx25.c
board/samsung/smdk6400/smdk6400_nand_spl.c
include/common.h
@ -174,15 +174,13 @@ next:
/*------------------------------------------------------------------------------*/
/ *
* void r e l o c a t e _ c o d e ( a d d r _ s p , g d , a d d r _ m o n i )
* void r e l o c a t e _ c o d e ( a d d r _ m o n i )
*
* This f u n c t i o n r e l o c a t e s t h e m o n i t o r c o d e .
* /
.globl relocate_code
relocate_code :
mov r4 , r0 / * s a v e a d d r _ s p * /
mov r5 , r1 / * s a v e a d d r o f g d * /
mov r6 , r2 / * s a v e a d d r o f d e s t i n a t i o n * /
mov r6 , r0 / * s a v e a d d r o f d e s t i n a t i o n * /
adr r0 , _ s t a r t
subs r9 , r6 , r0 / * r9 < - r e l o c a t i o n o f f s e t * /
@ -241,15 +241,13 @@ skip_tcmdisable:
/*------------------------------------------------------------------------------*/
/ *
* void r e l o c a t e _ c o d e ( a d d r _ s p , g d , a d d r _ m o n i )
* void r e l o c a t e _ c o d e ( a d d r _ m o n i )
*
* This f u n c t i o n r e l o c a t e s t h e m o n i t o r c o d e .
* /
.globl relocate_code
relocate_code :
mov r4 , r0 / * s a v e a d d r _ s p * /
mov r5 , r1 / * s a v e a d d r o f g d * /
mov r6 , r2 / * s a v e a d d r o f d e s t i n a t i o n * /
mov r6 , r0 / * s a v e a d d r o f d e s t i n a t i o n * /
adr r0 , _ s t a r t
subs r9 , r6 , r0 / * r9 < - r e l o c a t i o n o f f s e t * /
@ -156,15 +156,13 @@ reset:
/*------------------------------------------------------------------------------*/
/ *
* void r e l o c a t e _ c o d e ( a d d r _ s p , g d , a d d r _ m o n i )
* void r e l o c a t e _ c o d e ( a d d r _ m o n i )
*
* This f u n c t i o n r e l o c a t e s t h e m o n i t o r c o d e .
* /
.globl relocate_code
relocate_code :
mov r4 , r0 / * s a v e a d d r _ s p * /
mov r5 , r1 / * s a v e a d d r o f g d * /
mov r6 , r2 / * s a v e a d d r o f d e s t i n a t i o n * /
mov r6 , r0 / * s a v e a d d r o f d e s t i n a t i o n * /
adr r0 , _ s t a r t
subs r9 , r6 , r0 / * r9 < - r e l o c a t i o n o f f s e t * /
@ -195,15 +195,13 @@ copyex:
/*------------------------------------------------------------------------------*/
/ *
* void r e l o c a t e _ c o d e ( a d d r _ s p , g d , a d d r _ m o n i )
* void r e l o c a t e _ c o d e ( a d d r _ m o n i )
*
* This f u n c t i o n r e l o c a t e s t h e m o n i t o r c o d e .
* /
.globl relocate_code
relocate_code :
mov r4 , r0 / * s a v e a d d r _ s p * /
mov r5 , r1 / * s a v e a d d r o f g d * /
mov r6 , r2 / * s a v e a d d r o f d e s t i n a t i o n * /
mov r6 , r0 / * s a v e a d d r o f d e s t i n a t i o n * /
adr r0 , _ s t a r t
subs r9 , r6 , r0 / * r9 < - r e l o c a t i o n o f f s e t * /
@ -185,15 +185,13 @@ poll1:
/*------------------------------------------------------------------------------*/
/ *
* void r e l o c a t e _ c o d e ( a d d r _ s p , g d , a d d r _ m o n i )
* void r e l o c a t e _ c o d e ( a d d r _ m o n i )
*
* This f u n c t i o n r e l o c a t e s t h e m o n i t o r c o d e .
* /
.globl relocate_code
relocate_code :
mov r4 , r0 / * s a v e a d d r _ s p * /
mov r5 , r1 / * s a v e a d d r o f g d * /
mov r6 , r2 / * s a v e a d d r o f d e s t i n a t i o n * /
mov r6 , r0 / * s a v e a d d r o f d e s t i n a t i o n * /
adr r0 , _ s t a r t
subs r9 , r6 , r0 / * r9 < - r e l o c a t i o n o f f s e t * /
@ -191,15 +191,13 @@ reset:
/*------------------------------------------------------------------------------*/
/ *
* void r e l o c a t e _ c o d e ( a d d r _ s p , g d , a d d r _ m o n i )
* void r e l o c a t e _ c o d e ( a d d r _ m o n i )
*
* This f u n c t i o n r e l o c a t e s t h e m o n i t o r c o d e .
* /
.globl relocate_code
relocate_code :
mov r4 , r0 / * s a v e a d d r _ s p * /
mov r5 , r1 / * s a v e a d d r o f g d * /
mov r6 , r2 / * s a v e a d d r o f d e s t i n a t i o n * /
mov r6 , r0 / * s a v e a d d r o f d e s t i n a t i o n * /
adr r0 , _ s t a r t
subs r9 , r6 , r0 / * r9 < - r e l o c a t i o n o f f s e t * /
@ -160,15 +160,13 @@ reset:
/*------------------------------------------------------------------------------*/
/ *
* void r e l o c a t e _ c o d e ( a d d r _ s p , g d , a d d r _ m o n i )
* void r e l o c a t e _ c o d e ( a d d r _ m o n i )
*
* This f u n c t i o n r e l o c a t e s t h e m o n i t o r c o d e .
* /
.globl relocate_code
relocate_code :
mov r4 , r0 / * s a v e a d d r _ s p * /
mov r5 , r1 / * s a v e a d d r o f g d * /
mov r6 , r2 / * s a v e a d d r o f d e s t i n a t i o n * /
mov r6 , r0 / * s a v e a d d r o f d e s t i n a t i o n * /
adr r0 , _ s t a r t
subs r9 , r6 , r0 / * r9 < - r e l o c a t i o n o f f s e t * /
@ -156,15 +156,13 @@ reset:
/*------------------------------------------------------------------------------*/
/ *
* void r e l o c a t e _ c o d e ( a d d r _ s p , g d , a d d r _ m o n i )
* void r e l o c a t e _ c o d e ( a d d r _ m o n i )
*
* This f u n c t i o n r e l o c a t e s t h e m o n i t o r c o d e .
* /
.globl relocate_code
relocate_code :
mov r4 , r0 / * s a v e a d d r _ s p * /
mov r5 , r1 / * s a v e a d d r o f g d * /
mov r6 , r2 / * s a v e a d d r o f d e s t i n a t i o n * /
mov r6 , r0 / * s a v e a d d r o f d e s t i n a t i o n * /
adr r0 , _ s t a r t
subs r9 , r6 , r0 / * r9 < - r e l o c a t i o n o f f s e t * /
@ -165,14 +165,12 @@ reset:
# ifndef C O N F I G _ S P L _ B U I L D
/ *
* void r e l o c a t e _ c o d e ( a d d r _ s p , g d , a d d r _ m o n i )
* void r e l o c a t e _ c o d e ( a d d r _ m o n i )
*
* This f u n c t i o n r e l o c a t e s t h e m o n i t o r c o d e .
* /
ENTRY( r e l o c a t e _ c o d e )
mov r4 , r0 / * s a v e a d d r _ s p * /
mov r5 , r1 / * s a v e a d d r o f g d * /
mov r6 , r2 / * s a v e a d d r o f d e s t i n a t i o n * /
mov r6 , r0 / * s a v e a d d r o f d e s t i n a t i o n * /
adr r0 , _ s t a r t
subs r9 , r6 , r0 / * r9 < - r e l o c a t i o n o f f s e t * /
@ -258,15 +258,13 @@ reset:
/*------------------------------------------------------------------------------*/
/ *
* void r e l o c a t e _ c o d e ( a d d r _ s p , g d , a d d r _ m o n i )
* void r e l o c a t e _ c o d e ( a d d r _ m o n i )
*
* This f u n c t i o n r e l o c a t e s t h e m o n i t o r c o d e .
* /
.globl relocate_code
relocate_code :
mov r4 , r0 / * s a v e a d d r _ s p * /
mov r5 , r1 / * s a v e a d d r o f g d * /
mov r6 , r2 / * s a v e a d d r o f d e s t i n a t i o n * /
mov r6 , r0 / * s a v e a d d r o f d e s t i n a t i o n * /
adr r0 , _ s t a r t
subs r9 , r6 , r0 / * r9 < - r e l o c a t i o n o f f s e t * /
@ -173,15 +173,13 @@ reset:
/*------------------------------------------------------------------------------*/
# ifndef C O N F I G _ S P L _ B U I L D
/ *
* void r e l o c a t e _ c o d e ( a d d r _ s p , g d , a d d r _ m o n i )
* void r e l o c a t e _ c o d e ( a d d r _ m o n i )
*
* This f u n c t i o n r e l o c a t e s t h e m o n i t o r c o d e .
* /
.globl relocate_code
relocate_code :
mov r4 , r0 / * s a v e a d d r _ s p * /
mov r5 , r1 / * s a v e a d d r o f g d * /
mov r6 , r2 / * s a v e a d d r o f d e s t i n a t i o n * /
mov r6 , r0 / * s a v e a d d r o f d e s t i n a t i o n * /
/* Disable the Dcache RAM lock for stack now */
# ifdef C O N F I G _ C P U _ P X A 2 5 X
@ -141,15 +141,13 @@ reset:
/*------------------------------------------------------------------------------*/
/ *
* void r e l o c a t e _ c o d e ( a d d r _ s p , g d , a d d r _ m o n i )
* void r e l o c a t e _ c o d e ( a d d r _ m o n i )
*
* This f u n c t i o n r e l o c a t e s t h e m o n i t o r c o d e .
* /
.globl relocate_code
relocate_code :
mov r4 , r0 / * s a v e a d d r _ s p * /
mov r5 , r1 / * s a v e a d d r o f g d * /
mov r6 , r2 / * s a v e a d d r o f d e s t i n a t i o n * /
mov r6 , r0 / * s a v e a d d r o f d e s t i n a t i o n * /
adr r0 , _ s t a r t
subs r9 , r6 , r0 / * r9 < - r e l o c a t i o n o f f s e t * /
@ -145,15 +145,13 @@ reset:
/*------------------------------------------------------------------------------*/
/ *
* void r e l o c a t e _ c o d e ( a d d r _ s p , g d , a d d r _ m o n i )
* void r e l o c a t e _ c o d e ( a d d r _ m o n i )
*
* This f u n c t i o n r e l o c a t e s t h e m o n i t o r c o d e .
* /
.globl relocate_code
relocate_code :
mov r4 , r0 / * s a v e a d d r _ s p * /
mov r5 , r1 / * s a v e a d d r o f g d * /
mov r6 , r2 / * s a v e a d d r o f d e s t i n a t i o n * /
mov r6 , r0 / * s a v e a d d r o f d e s t i n a t i o n * /
adr r0 , _ s t a r t
subs r9 , r6 , r0 / * r9 < - r e l o c a t i o n o f f s e t * /
@ -96,8 +96,8 @@ ENTRY(_main)
/ *
* Set u p i n t e r m e d i a t e e n v i r o n m e n t ( n e w s p a n d g d ) a n d c a l l
* relocate_ c o d e ( a d d r _ s p , g d , a d d r _ m o n i ) . T r i c k h e r e i s t h a t
* we ' l l r e t u r n ' h e r e ' b u t r e l o c a t e d .
* relocate_ c o d e ( a d d r _ m o n i ) . T r i c k h e r e i s t h a t w e ' l l r e t u r n
* ' her e' b u t r e l o c a t e d .
* /
ldr s p , [ r8 , #G D _ S T A R T _ A D D R _ S P ] / * r 8 = g d - > s t a r t _ a d d r _ s p * /
@ -108,9 +108,7 @@ ENTRY(_main)
adr l r , h e r e
ldr r0 , [ r8 , #G D _ R E L O C _ O F F ] / * l r = g d - > s t a r t _ a d d r _ s p * /
add l r , l r , r0
ldr r0 , [ r8 , #G D _ S T A R T _ A D D R _ S P ] / * r 0 = g d - > s t a r t _ a d d r _ s p * /
mov r1 , r8 / * r1 = g d * /
ldr r2 , [ r8 , #G D _ R E L O C A D D R ] / * r 2 = g d - > r e l o c a d d r * /
ldr r0 , [ r8 , #G D _ R E L O C A D D R ] / * r 0 = g d - > r e l o c a d d r * /
b r e l o c a t e _ c o d e
here :
@ -39,7 +39,7 @@ DECLARE_GLOBAL_DATA_PTR;
# ifdef CONFIG_SPL_BUILD
void board_init_f ( ulong bootflag )
{
relocate_code ( 0 , NULL , CONFIG_SPL_TEXT_BASE ) ;
relocate_code ( CONFIG_SPL_TEXT_BASE ) ;
asm volatile ( " ldr pc, =nand_boot " ) ;
}
# endif
@ -36,7 +36,7 @@ DECLARE_GLOBAL_DATA_PTR;
# ifdef CONFIG_SPL_BUILD
void board_init_f ( ulong bootflag )
{
relocate_code ( 0 , NULL , CONFIG_SPL_TEXT_BASE ) ;
relocate_code ( CONFIG_SPL_TEXT_BASE ) ;
asm volatile ( " ldr pc, =nand_boot " ) ;
}
# endif
@ -32,6 +32,5 @@
void board_init_f ( unsigned long bootflag )
{
relocate_code ( CONFIG_SYS_TEXT_BASE - TOTAL_MALLOC_LEN , NULL ,
CONFIG_SYS_TEXT_BASE ) ;
relocate_code ( CONFIG_SYS_TEXT_BASE ) ;
}
@ -530,11 +530,11 @@ int dcache_status (void);
void dcache_enable ( void ) ;
void dcache_disable ( void ) ;
void mmu_disable ( void ) ;
void relocate_code ( ulong , gd_t * , ulong )
# if !defined(CONFIG_ARM)
__attribute__ ( ( noreturn ) )
# if defined(CONFIG_ARM)
void relocate_code ( ulong ) ;
# else
void relocate_code ( ulong , gd_t * , ulong ) __attribute__ ( ( noreturn ) ) ;
# endif
;
ulong get_endaddr ( void ) ;
void trap_init ( ulong ) ;
# if defined (CONFIG_4xx) || \
Benoît Thébaudeau
12 years ago
committed by
Albert ARIBAUD