[U-Boot] [PATCH 6/7] da850/omap-l138: Add support for NAND SPL

[Christian Riesch]

Hi,

On Fri, Jun 1, 2012 at 4:30 PM, Prabhakar Lad <prabhakar.lad at ti.com> wrote:
> From: Lad, Prabhakar <prabhakar.lad at ti.com>
>
> This patch adds support for NAND SPL on DA850/OMAP-L138.
>
> Signed-off-by: Lad, Prabhakar <prabhakar.lad at ti.com>
> Signed-off-by: Rajashekhara, Sudhakar <sudhakar.raj at ti.com>
> Signed-off-by: Hadli, Manjunath <manjunath.hadli at ti.com>
> ---
>  arch/arm/cpu/arm926ejs/davinci/spl.c |   13 ++++++-----
>  include/configs/da850evm.h           |   39 +++++++++++++++++++++++++++++----
>  2 files changed, 41 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm/cpu/arm926ejs/davinci/spl.c b/arch/arm/cpu/arm926ejs/davinci/spl.c
> index be397ce..53df581 100644
> --- a/arch/arm/cpu/arm926ejs/davinci/spl.c
> +++ b/arch/arm/cpu/arm926ejs/davinci/spl.c
> @@ -79,12 +79,6 @@ void board_init_f(ulong dummy)
>
>  void board_init_r(gd_t *id, ulong dummy)
>  {
> -#ifdef CONFIG_SPL_NAND_LOAD
> -       nand_init();
> -       puts("Nand boot...\n");
> -       nand_boot();
> -#endif
> -#ifdef CONFIG_SPL_SPI_LOAD
>        mem_malloc_init(CONFIG_SYS_TEXT_BASE - CONFIG_SYS_MALLOC_LEN,
>                        CONFIG_SYS_MALLOC_LEN);
>
> @@ -95,6 +89,13 @@ void board_init_r(gd_t *id, ulong dummy)
>        serial_init();          /* serial communications setup */
>        gd->have_console = 1;
>

This breaks the build for the cam_enc_4xx board and the hawkboard.

You may do this initializations only if CONFIG_SPL_LIBCOMMON_SUPPORT
is defined. Please test your patchset with ./MAKEALL -s davinci

Regards, Christian

> +#ifdef CONFIG_SPL_NAND_LOAD
> +       puts("Nand boot...\n");
> +       nand_init();
> +       puts("Nand Initalized...\n");
> +       nand_boot();
> +#endif
> +#ifdef CONFIG_SPL_SPI_LOAD
>        puts("SPI boot...\n");
>  #ifdef CONFIG_SPL_MMC_LOAD
>        spl_mmc_load();

[...]