diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-01-28 11:25:28 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-01-28 11:25:28 +0100 |
| commit | c0cae2e24552d57f3e2f841ec235453413cd7389 (patch) | |
| tree | 1d8b5f9741727489fc2ed905ba87dfc65cadbeb4 | |
| parent | 0876703cf2ee107372b56037d4eeeb7604c56796 (diff) | |
| parent | 7d7c497d592de6b7f8a0478d1f28011f24c13598 (diff) | |
| download | u-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'
| -rw-r--r-- | board/armltd/versatile/versatile.c | 4 | ||||
| -rw-r--r-- | include/configs/versatile.h | 3 |
2 files changed, 6 insertions, 1 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; diff --git a/include/configs/versatile.h b/include/configs/versatile.h index 10738ac..29c32fe 100644 --- 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 |