[U-Boot] [PATCH 1/2] ARM: versatile: pass correct machine type for Versatile AB

[Albert ARIBAUD <albert.u.boot@aribaud.net>]

Hi Linus,

On Wed, 27 Nov 2013 10:33:32 +0100, Linus Walleij
<linus.walleij@linaro.org> wrote:

> When U-Boot is configured for Versatile AB, it will still pass
> the machine ID of Versatile PB to the kernel. After this simple
> fix the system boots correctly.
> 
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Marek Vasut <marex@denx.de>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
>  board/armltd/versatile/versatile.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/board/armltd/versatile/versatile.c b/board/armltd/versatile/versatile.c
> index 30a3b904db4c..4e2d3421d8b1 100644
> --- a/board/armltd/versatile/versatile.c
> +++ b/board/armltd/versatile/versatile.c
> @@ -52,7 +52,11 @@ int board_early_init_f (void)
>  int board_init (void)
>  {
>  	/* arch number of Versatile Board */
> +#ifdef CONFIG_ARCH_VERSATILE_AB
> +	gd->bd->bi_arch_number = MACH_TYPE_VERSATILE_AB;
> +#else
>  	gd->bd->bi_arch_number = MACH_TYPE_VERSATILE_PB;
> +#endif
>  
>  	/* adress of boot parameters */
>  	gd->bd->bi_boot_params = 0x00000100;

Applied to u-boot-arm/next, thanks!

Amicalement,
-- 
Albert.