Commit d0a51373 authored by Andreas Bießmann's avatar Andreas Bießmann
Browse files

at91sam9260ek: move board id setup to config header


Signed-off-by: default avatarAndreas Bießmann <andreas.devel@googlemail.com>
Acked-by: default avatarBo Shen <voice.shen@atmel.com>
parent 93e3236c
......@@ -167,18 +167,6 @@ 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 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;
......
......@@ -130,6 +130,24 @@
(ATMEL_BASE_SRAM1 + 0x1000 - GENERATED_GBL_DATA_SIZE)
#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 */
#ifndef CONFIG_AT91SAM9G20EK_2MMC
#define CONFIG_ATMEL_DATAFLASH_SPI
......
Markdown is supported
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