[U-Boot] [PATCH v7 20/29] ARM: SPL: Convert davinci to CONFIG_SPL_FRAMEWORK

[Tom Rini]

On Mon, Sep 24, 2012 at 05:30:58PM -0700, Tom Rini wrote:

> - 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 at ti.com>
[snip]
> diff --git a/arch/arm/cpu/arm926ejs/start.S b/arch/arm/cpu/arm926ejs/start.S
> index 6f05f1a..7889d13 100644
> --- a/arch/arm/cpu/arm926ejs/start.S
> +++ b/arch/arm/cpu/arm926ejs/start.S
> @@ -215,6 +215,7 @@ call_board_init_f:
>  
>  /*------------------------------------------------------------------------------*/
>  
> +#ifndef CONFIG_SPL_BUILD
>  /*
>   * void relocate_code (addr_sp, gd, addr_moni)
>   *

In testing this for merge I found it breaks tx25 which uses the old
nand_spl framework.  I've change this to be:
#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_NAND_SPL)

and dropped the rest of the hunks from this file other than the final
endif for this function.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120927/0d21984d/attachment.pgp>