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
/
at91sam9g45.h
diff --git
a/arch/arm/mach-at91/include/mach/at91sam9g45.h
b/arch/arm/mach-at91/include/mach/at91sam9g45.h
index cf1c73f3d986219e3aa3fb3a212299fc0928a750..96922c4e6bc7782d8d1782fe91b91a253262e6ee 100644
(file)
--- a/
arch/arm/mach-at91/include/mach/at91sam9g45.h
+++ b/
arch/arm/mach-at91/include/mach/at91sam9g45.h
@@
-12,11
+12,6
@@
#ifndef AT91SAM9G45_H
#define AT91SAM9G45_H
#ifndef AT91SAM9G45_H
#define AT91SAM9G45_H
-/*
- * defines to be used in other places
- */
-#define CONFIG_AT91FAMILY /* it's a member of AT91 */
-
/*
* Peripheral identifiers/interrupts.
*/
/*
* Peripheral identifiers/interrupts.
*/
@@
-109,6
+104,7
@@
#define ATMEL_BASE_RTT 0xfffffd20
#define ATMEL_BASE_PIT 0xfffffd30
#define ATMEL_BASE_WDT 0xfffffd40
#define ATMEL_BASE_RTT 0xfffffd20
#define ATMEL_BASE_PIT 0xfffffd30
#define ATMEL_BASE_WDT 0xfffffd40
+#define ATMEL_BASE_SCKCR 0xfffffd50
#define ATMEL_BASE_GPBR 0xfffffd60
#define ATMEL_BASE_RTC 0xfffffdb0
/* Reserved: 0xfffffdc0 - 0xffffffff */
#define ATMEL_BASE_GPBR 0xfffffd60
#define ATMEL_BASE_RTC 0xfffffdb0
/* Reserved: 0xfffffdc0 - 0xffffffff */