GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-20 22:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Albert ARIBAUD 2014-01-28 11:25:28 +01:00
commit c0cae2e245
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
board/armltd/versatile/versatile.c
View file

@ -52,7 +52,11 @@ int board_early_init_f (void)
int board_init (void) int board_init (void)
{ {
/* arch number of Versatile Board */ /* 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; gd->bd->bi_arch_number = MACH_TYPE_VERSATILE_PB;
#endif
/* adress of boot parameters */ /* adress of boot parameters */
gd->bd->bi_boot_params = 0x00000100; gd->bd->bi_boot_params = 0x00000100;

3
include/configs/versatile.h
View file

@ -101,7 +101,8 @@
#define CONFIG_BOOTDELAY 2 #define CONFIG_BOOTDELAY 2
#define CONFIG_BOOTARGS "root=/dev/nfs mem=128M ip=dhcp "\ #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 * Static configuration when assigning fixed address