projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'rmobile-mx' of git://git.denx.de/u-boot-sh
[oweals/u-boot.git]
/
arch
/
arm
/
mach-at91
/
include
/
mach
/
sama5d2.h
diff --git
a/arch/arm/mach-at91/include/mach/sama5d2.h
b/arch/arm/mach-at91/include/mach/sama5d2.h
index 25c85411e5a1e3c7ce3ee9dc6def14d3b1358f9e..a4ec0aac619cb6d8a98a3750f7f332791d6b5a56 100644
(file)
--- a/
arch/arm/mach-at91/include/mach/sama5d2.h
+++ b/
arch/arm/mach-at91/include/mach/sama5d2.h
@@
-10,11
+10,6
@@
#ifndef __SAMA5D2_H
#define __SAMA5D2_H
#ifndef __SAMA5D2_H
#define __SAMA5D2_H
-/*
- * definitions to be used in other places
- */
-#define CONFIG_AT91FAMILY /* It's a member of AT91 */
-
/*
* Peripheral identifiers/interrupts.
*/
/*
* Peripheral identifiers/interrupts.
*/
@@
-222,7
+217,11
@@
#define ARCH_EXID_SAMA5D28CU 0x00000010
#define ARCH_EXID_SAMA5D28CN 0x00000020
#define ARCH_EXID_SAMA5D28CU 0x00000010
#define ARCH_EXID_SAMA5D28CN 0x00000020
-#define cpu_is_sama5d2() (get_chip_id() == ARCH_ID_SAMA5D2)
+#define ARCH_ID_SAMA5D2_SIP 0x8a5c08c2
+#define ARCH_EXID_SAMA5D225C_D1M 0x00000053
+#define ARCH_EXID_SAMA5D27C_D5M 0x00000032
+#define ARCH_EXID_SAMA5D27C_D1G 0x00000033
+#define ARCH_EXID_SAMA5D28C_D1G 0x00000013
/* PIT Timer(PIT_PIIR) */
#define CONFIG_SYS_TIMER_COUNTER 0xf804803c
/* PIT Timer(PIT_PIIR) */
#define CONFIG_SYS_TIMER_COUNTER 0xf804803c
@@
-233,6
+232,7
@@
#ifndef __ASSEMBLY__
unsigned int get_chip_id(void);
unsigned int get_extension_chip_id(void);
#ifndef __ASSEMBLY__
unsigned int get_chip_id(void);
unsigned int get_extension_chip_id(void);
+int cpu_is_sama5d2(void);
unsigned int has_lcdc(void);
char *get_cpu_name(void);
#endif
unsigned int has_lcdc(void);
char *get_cpu_name(void);
#endif