From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marek Vasut <marex@denx.de>
Date: Wed, 27 Nov 2013 10:55:39 +0100
Subject: [U-Boot] [PATCH 1/2] ARM: versatile: pass correct machine type
	for Versatile AB
In-Reply-To: <1385544812-22558-1-git-send-email-linus.walleij@linaro.org>
References: <1385544812-22558-1-git-send-email-linus.walleij@linaro.org>
Message-ID: <201311271055.40073.marex@denx.de>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Dear Linus Walleij,

> 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;

We should just switch to DT, but I do understand the motivation here. Can you 
not detect which board it is dynamically to avoid the ifdef?

Otherwise:

Acked-by: Marek Vasut <marex@denx.de>

Best regards,
Marek Vasut