Skip to content
Snippets Groups Projects
Commit 24a6bc01 authored by Simon Glass's avatar Simon Glass Committed by Tom Rini
Browse files

arm: Reduce the scope of lowlevel_init()


This function has grown into something of a monster. Some boards are setting
up a console and DRAM here in SPL. This requires global_data which should be
set up in one place (crt0.S).

There is no need for SPL to use s_init() for anything since board_init_f()
is called immediately afterwards.

Signed-off-by: default avatarSimon Glass <sjg@chromium.org>
parent 41060bc5
No related branches found
No related tags found
No related merge requests found
...@@ -17,16 +17,24 @@ ...@@ -17,16 +17,24 @@
ENTRY(lowlevel_init) ENTRY(lowlevel_init)
/* /*
* Setup a temporary stack * Setup a temporary stack. Global data is not available yet.
*/ */
ldr sp, =CONFIG_SYS_INIT_SP_ADDR ldr sp, =CONFIG_SYS_INIT_SP_ADDR
bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ bic sp, sp, #7 /* 8-byte alignment for ABI compliance */
#ifdef CONFIG_DM
mov r9, #0
#else
/*
* Set up global data for boards that still need it. This will be
* removed soon.
*/
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
ldr r9, =gdata ldr r9, =gdata
#else #else
sub sp, sp, #GD_SIZE sub sp, sp, #GD_SIZE
bic sp, sp, #7 bic sp, sp, #7
mov r9, sp mov r9, sp
#endif
#endif #endif
/* /*
* Save the old lr(passed in ip) and the current lr to stack * Save the old lr(passed in ip) and the current lr to stack
...@@ -34,7 +42,17 @@ ENTRY(lowlevel_init) ...@@ -34,7 +42,17 @@ ENTRY(lowlevel_init)
push {ip, lr} push {ip, lr}
/* /*
* go setup pll, mux, memory * Call the very early init function. This should do only the
* absolute bare minimum to get started. It should not:
*
* - set up DRAM
* - use global_data
* - clear BSS
* - try to start a console
*
* For boards with SPL this should be empty since SPL can do all of
* this init in the SPL board_init_f() function which is called
* immediately after this.
*/ */
bl s_init bl s_init
pop {ip, pc} pop {ip, pc}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment