ARM: versatile: pass correct machine type for Versatile AB
authorLinus Walleij <linus.walleij@linaro.org>
Wed, 27 Nov 2013 09:33:32 +0000 (10:33 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 13 Jan 2014 08:46:08 +0000 (09:46 +0100)
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>
Acked-by: Marek Vasut <marex@denx.de>
Acked-by: Stefano Babic <sbabic@denx.de>
board/armltd/versatile/versatile.c

index 30a3b904db4cc6e975ffa64f069b61b42baa0671..4e2d3421d8b13640c2d26246a4fa654e07660a3a 100644 (file)
@@ -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;