mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-19 05:31:32 +00:00
Merge branch 'u-boot-arm/next' into 'u-boot-arm/master'
This commit is contained in:
commit
c0cae2e245
2 changed files with 6 additions and 1 deletions
|
@ -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;
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Add table
Reference in a new issue