summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorReinhard Meyer <u-boot@emk-elektronik.de>2010-08-24 11:18:09 +0200
committerReinhard Meyer <u-boot@emk-elektronik.de>2010-09-03 11:21:02 +0200
commit93dfcbe3c89f985ccf7e951506208f5ade21cb78 (patch)
tree1c7c7d8e853a3633b8786943fefdd65ee536b079 /arch/arm
parentd88bebe16d8141e85adcc894a10165a6dfd44805 (diff)
downloadu-boot-imx-93dfcbe3c89f985ccf7e951506208f5ade21cb78.zip
u-boot-imx-93dfcbe3c89f985ccf7e951506208f5ade21cb78.tar.gz
u-boot-imx-93dfcbe3c89f985ccf7e951506208f5ade21cb78.tar.bz2
AT91: fix at91sam9260.h for AT91SAM9XE
Define the different location of the GPBRs for the 9XE Define the proper CPU Name Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/include/asm/arch-at91/at91sam9260.h18
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 ec04318..cb34a94 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