diff options
| author | Tom Rini <trini@ti.com> | 2012-08-14 12:27:13 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-09-27 11:20:10 -0700 |
| commit | 3f7f2414efecc4e738961767a411bd0143835377 (patch) | |
| tree | 9fda836149a0db58f7cb6d5f1a8381c51bcd6e76 /arch/arm/cpu/arm926ejs/start.S | |
| parent | d97b4ce8056ff01ca8f1a63a7c69fa5316d33830 (diff) | |
ARM: SPL: Convert davinci to CONFIG_SPL_FRAMEWORK
- Convert the non-relocation part of board_init_f to spl_board_init, turn on CONFIG_SPL_BOARD_INIT in the configs.
- Remove duplicated code.
- Add spl_boot_device() that returns the statically chosen boot device.
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/arm/cpu/arm926ejs/start.S')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/start.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/cpu/arm926ejs/start.S b/arch/arm/cpu/arm926ejs/start.S index 6f05f1ac49..521d46290c 100644 --- a/arch/arm/cpu/arm926ejs/start.S +++ b/arch/arm/cpu/arm926ejs/start.S @@ -215,6 +215,7 @@ call_board_init_f: /*------------------------------------------------------------------------------*/ +#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_NAND_SPL) /* * void relocate_code (addr_sp, gd, addr_moni) * @@ -344,6 +345,7 @@ _rel_dyn_end_ofs: .word __rel_dyn_end - _start _dynsym_start_ofs: .word __dynsym_start - _start +#endif /* ************************************************************************* |