Merge branch 'u-boot-arm/next' into 'u-boot-arm/master'

2014-01-28 11:25:28 +01:00
parent 0876703cf2 7d7c497d59
commit c0cae2e245
2 changed files with 6 additions and 1 deletions
--- 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;