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

diff --git a/board/armltd/versatile/versatile.c b/board/armltd/versatile/versatile.c
index 30a3b904db4cc6e975ffa64f069b61b42baa0671..4e2d3421d8b13640c2d26246a4fa654e07660a3a 100644 (file)
--- 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;

diff --git a/include/configs/versatile.h b/include/configs/versatile.h
index 10738ac24be077a734c580c294a0b034b95b4e28..29c32fee5178060965cd87992c178ec7ccaad7b2 100644 (file)
--- a/include/configs/versatile.h
+++ b/include/configs/versatile.h
@@ -101,7 +101,8 @@
 
 #define CONFIG_BOOTDELAY       2
 #define CONFIG_BOOTARGS                "root=/dev/nfs mem=128M ip=dhcp "\
-                               "netdev=25,0,0xf1010000,0xf1010010,eth0"
+                               "netdev=25,0,0xf1010000,0xf1010010,eth0 "\
+                               "console=ttyAMA0,38400n1"
 
 /*
  * Static configuration when assigning fixed address