diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-12 17:27:44 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-12 17:27:44 +0100 |
| commit | 1acba3345c6f707195d8f1cbac834436445279b3 (patch) | |
| tree | 87bfb4c157d998f88fee99e196a6f36a6b483903 /board | |
| parent | 76b40ab41eff1f402ee52ba768b09daad293b9bb (diff) | |
| parent | 08f0533a147ca37546a6539b43fce3916e82811a (diff) | |
| download | talos-obmc-uboot-1acba3345c6f707195d8f1cbac834436445279b3.tar.gz talos-obmc-uboot-1acba3345c6f707195d8f1cbac834436445279b3.zip | |
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
Diffstat (limited to 'board')
| -rw-r--r-- | board/atmel/at91sam9260ek/at91sam9260ek.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c index 2555672524..3aa394a4bb 100644 --- a/board/atmel/at91sam9260ek/at91sam9260ek.c +++ b/board/atmel/at91sam9260ek/at91sam9260ek.c @@ -157,13 +157,18 @@ int board_early_init_f(void) int board_init(void) { +#ifdef CONFIG_AT91SAM9G20EK_2MMC + /* arch number of AT91SAM9G20EK_2MMC-Board */ + gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9G20EK_2MMC; +#else #ifdef CONFIG_AT91SAM9G20EK - /* arch number of AT91SAM9260EK-Board */ + /* arch number of AT91SAM9G20EK-Board */ gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9G20EK; #else /* arch number of AT91SAM9260EK-Board */ gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9260EK; #endif +#endif /* adress of boot parameters */ gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; |
