diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-09-08 00:42:00 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-09-08 00:42:00 +0200 |
| commit | cf64fda38e3d71e9077e11c673bd9be449c680da (patch) | |
| tree | a847fb6cd48330482642ff92e34a7329b339acd2 /arch/arm/include/asm/arch-at91/at91sam9260.h | |
| parent | 09b4a9cf4003599f2cd609587dfa5f0b754640ed (diff) | |
| parent | 5c3dab97c751e43103813472283305cbfe70d3f0 (diff) | |
Merge branch 'at91' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'arch/arm/include/asm/arch-at91/at91sam9260.h')
| -rw-r--r-- | arch/arm/include/asm/arch-at91/at91sam9260.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/arch/arm/include/asm/arch-at91/at91sam9260.h b/arch/arm/include/asm/arch-at91/at91sam9260.h index ec04318036..cb34a94a3b 100644 --- a/arch/arm/include/asm/arch-at91/at91sam9260.h +++ b/arch/arm/include/asm/arch-at91/at91sam9260.h @@ -59,7 +59,15 @@ #define AT91_RTT_BASE 0xfffffd20 #define AT91_PIT_BASE 0xfffffd30 #define AT91_WDT_BASE 0xfffffd40 -#define AT91_GPR_BASE 0xfffffd50 +/* + * The AT91SAM9XE has the GPBRs at a different address than + * the AT91SAM9260/9G20. + */ +#ifdef CONFIG_AT91SAM9XE +# define AT91_GPR_BASE 0xfffffd60 +#else +# define AT91_GPR_BASE 0xfffffd50 +#endif #ifdef CONFIG_AT91_LEGACY @@ -140,10 +148,12 @@ /* * Cpu Name */ -#if defined(CONFIG_AT91SAM9260) -#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9260" +#if defined(CONFIG_AT91SAM9XE) +# define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9XE" +#elif defined(CONFIG_AT91SAM9260) +# define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9260" #elif defined(CONFIG_AT91SAM9G20) -#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9G20" +# define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9G20" #endif #endif |