diff mbox

[U-Boot,atmel/next,5/7] eb_cpux9k2: use atmel_usart

Message ID 1307879357-97986-6-git-send-email-andreas.devel@googlemail.com
State Accepted
Commit 5a05cb73566d5bacbd7e6379c265cc160895c0c8
Delegated to: Reinhard Meyer
Headers show

Commit Message

Andreas Bießmann June 12, 2011, 11:49 a.m. UTC 
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
CC: Jens Scharsig <js_at_ng@scharsoft.de>
---
 board/BuS/eb_cpux9k2/cpux9k2.c |    7 +++++++
 include/configs/eb_cpux9k2.h   |    6 ++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

Comments

Jens Scharsig June 26, 2011, 6:10 p.m. UTC | #1 
Am 12.06.2011 13:49, schrieb Andreas Bießmann:
> Signed-off-by: Andreas Bießmann<andreas.devel@googlemail.com>
> CC: Jens Scharsig<js_at_ng@scharsoft.de>
> ---
>   board/BuS/eb_cpux9k2/cpux9k2.c |    7 +++++++
>   include/configs/eb_cpux9k2.h   |    6 ++++--
>   2 files changed, 11 insertions(+), 2 deletions(-)
>

Acked-by: Jens Scharsig<js_at_ng@scharsoft.de>
Tested-by: Jens Scharsig<js_at_ng@scharsoft.de> (for eb_cpux9k2 board)
diff mbox

Patch

diff --git a/board/BuS/eb_cpux9k2/cpux9k2.c b/board/BuS/eb_cpux9k2/cpux9k2.c
index e9a1cb2..a918b04 100644
--- a/board/BuS/eb_cpux9k2/cpux9k2.c
+++ b/board/BuS/eb_cpux9k2/cpux9k2.c
@@ -33,6 +33,7 @@ 
 #include <asm/arch/at91_pio.h>
 #include <asm/arch/at91_pmc.h>
 #include <asm/arch/at91_mc.h>
+#include <asm/arch/at91_common.h>
 
 #ifdef CONFIG_STATUS_LED
 #include <status_led.h>
@@ -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 25b28f5..c4b1e65 100644
--- a/include/configs/eb_cpux9k2.h
+++ b/include/configs/eb_cpux9k2.h
@@ -39,6 +39,7 @@ 
 #include <asm/hardware.h>	/* 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