LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

at91sam9260ek: move board id setup to config header 

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Acked-by: Bo Shen <voice.shen@atmel.com>
This commit is contained in:
Andreas Bießmann 2013-05-10 05:05:30 +00:00
parent 93e3236ccb
commit d0a5137313
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
board/atmel/at91sam9260ek/at91sam9260ek.c
View File

@ -167,18 +167,6 @@ int board_early_init_f(void)
int board_init(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 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 */ /* adress of boot parameters */
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;

18
include/configs/at91sam9260ek.h
View File

@ -130,6 +130,24 @@
(ATMEL_BASE_SRAM1 + 0x1000 - GENERATED_GBL_DATA_SIZE) (ATMEL_BASE_SRAM1 + 0x1000 - GENERATED_GBL_DATA_SIZE)
#endif #endif
/*
* The (arm)linux board id set by generic code depending on configured board
* (see boards.cfg for different boards)
*/
#ifdef CONFIG_AT91SAM9G20
/* the sam9g20 variants have two different board ids */
# ifdef CONFIG_AT91SAM9G20EK_2MMC
/* we may be setup for the 2MMC variant of at91sam9g20ek */
# define CONFIG_MACH_TYPE MACH_TYPE_AT91SAM9G20EK_2MMC
# else
/* or the normal at91sam9g20ek */
# define CONFIG_MACH_TYPE MACH_TYPE_AT91SAM9G20EK
# endif
#else
/* otherwise default to good old at91sam9260ek */
# define CONFIG_MACH_TYPE MACH_TYPE_AT91SAM9260EK
#endif
/* DataFlash */ /* DataFlash */
#ifndef CONFIG_AT91SAM9G20EK_2MMC #ifndef CONFIG_AT91SAM9G20EK_2MMC
#define CONFIG_ATMEL_DATAFLASH_SPI #define CONFIG_ATMEL_DATAFLASH_SPI