commit 95d50e5ce7bb50bf02dbba2359426de9e28cd9c1
author Eric Benard <eric@eukrea.com> Mon Jun 06 22:48:28 2011 +0000
committer Albert ARIBAUD <albert.u.boot@aribaud.net> Tue Jun 21 22:26:22 2011 +0200
tree 7874d4af1aeb221ff825dff4af2ada7f5ea5f2df
parent 96fd99067f0ab5c1d23d6130d882138ebea08d49

cpu9260/9G20: fix board support

Signed-off-by: Eric Bénard <eric@eukrea.com>

include/configs/cpu9260.h

diff --git a/include/configs/cpu9260.h b/include/configs/cpu9260.h
index a8ada2d..ba9f797 100644
--- a/include/configs/cpu9260.h
+++ b/include/configs/cpu9260.h
@@ -37,8 +37,7 @@
 
 #define CONFIG_SYS_AT91_MAIN_CLOCK	18432000
 #define CONFIG_SYS_HZ		1000
-
-#define CONFIG_ARM926EJS
+#define CONFIG_SYS_AT91_SLOW_CLOCK	32768
 
 #if defined(CONFIG_CPU9G20)
 #define CONFIG_AT91SAM9G20
@@ -48,6 +47,8 @@
 #error "Unknown board"
 #endif
 
+#include <asm/arch/hardware.h>
+
 #define CONFIG_AT91FAMILY
 #define CONFIG_ARCH_CPU_INIT
 #undef CONFIG_USE_IRQ
@@ -251,10 +252,8 @@
 #define CONFIG_AT91SAM9_WATCHDOG
 #define CONFIG_AT91_GPIO
 #define CONFIG_ATMEL_USART
-#undef CONFIG_USART0
-#undef CONFIG_USART1
-#undef CONFIG_USART2
-#define CONFIG_USART3
+#define CONFIG_USART_BASE	ATMEL_BASE_DBGU
+#define CONFIG_USART_ID		ATMEL_ID_SYS
 
 #define CONFIG_BOOTDELAY	3