[U-Boot] [PATCH v3 4/9] arm, davinci: perform check for initalizing global data and serial init

[Christian Riesch]

On Thu, Jun 21, 2012 at 9:51 AM, Prabhakar Lad <prabhakar.lad at ti.com> wrote:
> From: Lad, Prabhakar <prabhakar.lad at ti.com>
>
> initialize baudrate, flags, data and serial intialization,

initialization

> only when CONFIG_SPL_LIBCOMMON_SUPPORT is defined.
>
> 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>

Acked-by: Christian Riesch <christian.riesch at omicron.at>

Regards, Christian

> ---
>  Chnages for v3:
>  1: Creted new patch by splitting patch 6 of v2, to make
>    it more readable.
>
>  arch/arm/cpu/arm926ejs/davinci/spl.c |   15 +++++++++------
>  1 files changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/cpu/arm926ejs/davinci/spl.c b/arch/arm/cpu/arm926ejs/davinci/spl.c
> index 74632e5..7d9b289 100644
> --- a/arch/arm/cpu/arm926ejs/davinci/spl.c
> +++ b/arch/arm/cpu/arm926ejs/davinci/spl.c
> @@ -74,12 +74,7 @@ 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
> +#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
>        mem_malloc_init(CONFIG_SYS_TEXT_BASE - CONFIG_SYS_MALLOC_LEN,
>                        CONFIG_SYS_MALLOC_LEN);
>
> @@ -90,6 +85,14 @@ void board_init_r(gd_t *id, ulong dummy)
>        serial_init();          /* serial communications setup */
>        gd->have_console = 1;
>
> +#endif
> +
> +#ifdef CONFIG_SPL_NAND_LOAD
> +       nand_init();
> +       puts("Nand boot...\n");
> +       nand_boot();
> +#endif
> +#ifdef CONFIG_SPL_SPI_LOAD
>        puts("SPI boot...\n");
>        spi_boot();
>  #endif
> --
> 1.7.4.1
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot