summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-01-28 11:25:28 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-01-28 11:25:28 +0100
commitc0cae2e24552d57f3e2f841ec235453413cd7389 (patch)
tree1d8b5f9741727489fc2ed905ba87dfc65cadbeb4 /board
parent0876703cf2ee107372b56037d4eeeb7604c56796 (diff)
parent7d7c497d592de6b7f8a0478d1f28011f24c13598 (diff)
downloadu-boot-imx-c0cae2e24552d57f3e2f841ec235453413cd7389.zip
u-boot-imx-c0cae2e24552d57f3e2f841ec235453413cd7389.tar.gz
u-boot-imx-c0cae2e24552d57f3e2f841ec235453413cd7389.tar.bz2
Merge branch 'u-boot-arm/next' into 'u-boot-arm/master'
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 30a3b90..4e2d342 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;