From 5a05cb73566d5bacbd7e6379c265cc160895c0c8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20Bie=C3=9Fmann?= Date: Sun, 12 Jun 2011 01:49:15 +0000 Subject: [PATCH] eb_cpux9k2: use atmel_usart MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Bießmann CC: Jens Scharsig Acked-by: Jens Scharsig Tested-by: Jens Scharsig (for eb_cpux9k2 board) --- board/BuS/eb_cpux9k2/cpux9k2.c | 7 +++++++ include/configs/eb_cpux9k2.h | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/board/BuS/eb_cpux9k2/cpux9k2.c b/board/BuS/eb_cpux9k2/cpux9k2.c index e9a1cb276c..a918b04ddd 100644 --- a/board/BuS/eb_cpux9k2/cpux9k2.c +++ b/board/BuS/eb_cpux9k2/cpux9k2.c @@ -33,6 +33,7 @@ #include #include #include +#include #ifdef CONFIG_STATUS_LED #include @@ -77,6 +78,12 @@ int board_init(void) return 0; } +int board_early_init_f(void) +{ + at91_seriald_hw_init(); + return 0; +} + #ifdef CONFIG_MISC_INIT_R int misc_init_r(void) diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h index 25b28f5109..c4b1e654c7 100644 --- a/include/configs/eb_cpux9k2.h +++ b/include/configs/eb_cpux9k2.h @@ -39,6 +39,7 @@ #include /* needed for port definitions */ #define CONFIG_MISC_INIT_R +#define CONFIG_BOARD_EARLY_INIT_F /*--------------------------------------------------------------------------*/ #define CONFIG_SYS_TEXT_BASE 0x00000000 @@ -174,8 +175,9 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 115200, 19200, 38400, 57600, 9600 } #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 -- 2.30.2