Browse Source

eb_cpux9k2: use atmel_usart

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
CC: Jens Scharsig <js_at_ng@scharsoft.de>
Acked-by: Jens Scharsig<js_at_ng@scharsoft.de>
Tested-by: Jens Scharsig<js_at_ng@scharsoft.de> (for eb_cpux9k2 board)
Andreas Bießmann 14 years ago
parent
commit
5a05cb7356
2 changed files with 11 additions and 2 deletions
  1. 7 0
      board/BuS/eb_cpux9k2/cpux9k2.c
  2. 4 2
      include/configs/eb_cpux9k2.h

+ 7 - 0
board/BuS/eb_cpux9k2/cpux9k2.c

@@ -33,6 +33,7 @@
 #include <asm/arch/at91_pio.h>
 #include <asm/arch/at91_pio.h>
 #include <asm/arch/at91_pmc.h>
 #include <asm/arch/at91_pmc.h>
 #include <asm/arch/at91_mc.h>
 #include <asm/arch/at91_mc.h>
+#include <asm/arch/at91_common.h>
 
 
 #ifdef CONFIG_STATUS_LED
 #ifdef CONFIG_STATUS_LED
 #include <status_led.h>
 #include <status_led.h>
@@ -77,6 +78,12 @@ int board_init(void)
 	return 0;
 	return 0;
 }
 }
 
 
+int board_early_init_f(void)
+{
+	at91_seriald_hw_init();
+	return 0;
+}
+
 #ifdef CONFIG_MISC_INIT_R
 #ifdef CONFIG_MISC_INIT_R
 
 
 int misc_init_r(void)
 int misc_init_r(void)

+ 4 - 2
include/configs/eb_cpux9k2.h

@@ -39,6 +39,7 @@
 #include <asm/hardware.h>	/* needed for port definitions */
 #include <asm/hardware.h>	/* needed for port definitions */
 
 
 #define CONFIG_MISC_INIT_R
 #define CONFIG_MISC_INIT_R
+#define CONFIG_BOARD_EARLY_INIT_F
 
 
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
 #define CONFIG_SYS_TEXT_BASE 		0x00000000
 #define CONFIG_SYS_TEXT_BASE 		0x00000000
@@ -174,8 +175,9 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200, 19200, 38400, 57600, 9600 }
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200, 19200, 38400, 57600, 9600 }
 
 
 #define CONFIG_BAUDRATE 115200
 #define CONFIG_BAUDRATE 115200
-#define CONFIG_AT91RM9200_USART
-#define CONFIG_DBGU			/* define DBGU as console */
+#define CONFIG_ATMEL_USART
+#define CONFIG_USART_BASE	ATMEL_BASE_DBGU
+#define CONFIG_USART_ID		0/* ignored in arm */
 
 
 /*
 /*
  * network
  * network