Skip to content
Snippets Groups Projects
Commit c0cae2e2 authored by Albert ARIBAUD's avatar Albert ARIBAUD
Browse files

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

parents 0876703c 7d7c497d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
board/armltd/versatile/versatile.c
+ 4
− 0
View file @ c0cae2e2
...@@ -52,7 +52,11 @@ int board_early_init_f (void) ...@@ -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;
......
include/configs/versatile.h
+ 2
− 1
View file @ c0cae2e2
...@@ -101,7 +101,8 @@ ...@@ -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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment