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
/
at91sam9rl.h
diff --git
a/arch/arm/mach-at91/include/mach/at91sam9rl.h
b/arch/arm/mach-at91/include/mach/at91sam9rl.h
index 3a8e6d62ce51e351b51c9253109c70278fdc839d..8f9155c9ea68758c88c040cb19c8ce026ed06c77 100644
(file)
--- a/
arch/arm/mach-at91/include/mach/at91sam9rl.h
+++ b/
arch/arm/mach-at91/include/mach/at91sam9rl.h
@@
-14,11
+14,6
@@
#ifndef AT91SAM9RL_H
#define AT91SAM9RL_H
#ifndef AT91SAM9RL_H
#define AT91SAM9RL_H
-/*
- * defines to be used in other places
- */
-#define CONFIG_AT91FAMILY /* it's a member of AT91 */
-
/*
* Peripheral identifiers/interrupts.
*/
/*
* Peripheral identifiers/interrupts.
*/
@@
-116,6
+111,9
@@
#define ATMEL_BASE_CS4 0x50000000 /* Compact Flash Slot 0 */
#define ATMEL_BASE_CS5 0x60000000 /* Compact Flash Slot 1 */
#define ATMEL_BASE_CS4 0x50000000 /* Compact Flash Slot 0 */
#define ATMEL_BASE_CS5 0x60000000 /* Compact Flash Slot 1 */
+/* Timer */
+#define CONFIG_SYS_TIMER_COUNTER 0xfffffd3c
+
/*
* Other misc defines
*/
/*
* Other misc defines
*/