summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-11-27 10:33:32 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-01-13 09:46:08 +0100
commita25feb7a6d2ac3351ee00c59a58a0dcfb9a13c9d (patch)
tree2191bfb123679b39484c58d5ce224f787093f0e9 /board
parent7f673c99c2d8d1aa21996c5b914f06d784b080ca (diff)
downloadtalos-obmc-uboot-a25feb7a6d2ac3351ee00c59a58a0dcfb9a13c9d.tar.gz
talos-obmc-uboot-a25feb7a6d2ac3351ee00c59a58a0dcfb9a13c9d.zip
ARM: versatile: pass correct machine type for Versatile AB
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>
Diffstat (limited to 'board')
-rw-r--r--board/armltd/versatile/versatile.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/board/armltd/versatile/versatile.c b/board/armltd/versatile/versatile.c
index 30a3b904db..4e2d3421d8 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;
OpenPOWER on IntegriCloud