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 'next' of git://git.denx.de/u-boot-nios
[oweals/u-boot.git]
/
include
/
configs
/
cpu9260.h
diff --git
a/include/configs/cpu9260.h
b/include/configs/cpu9260.h
index 4ef8566ea215a081795ba48c4fd8976102dc92dc..fb6f79a42300260b24320211f075e4d67ab3841d 100644
(file)
--- a/
include/configs/cpu9260.h
+++ b/
include/configs/cpu9260.h
@@
-31,9
+31,11
@@
#ifndef __CONFIG_H
#define __CONFIG_H
#ifndef __CONFIG_H
#define __CONFIG_H
+#define CONFIG_AT91_LEGACY
+
#define CONFIG_DISPLAY_CPUINFO 1
#define CONFIG_DISPLAY_CPUINFO 1
-#define
AT91_MAIN_CLOCK
18432000
+#define
CONFIG_SYS_AT91_MAIN_CLOCK
18432000
#define CONFIG_SYS_HZ 1000
#define CONFIG_ARM926EJS 1
#define CONFIG_SYS_HZ 1000
#define CONFIG_ARM926EJS 1
@@
-242,6
+244,7
@@
/*
* Hardware drivers
*/
/*
* Hardware drivers
*/
+#define CONFIG_AT91_GPIO 1
#define CONFIG_ATMEL_USART 1
#undef CONFIG_USART0
#undef CONFIG_USART1
#define CONFIG_ATMEL_USART 1
#undef CONFIG_USART0
#undef CONFIG_USART1