cpuat91: use atmel_usart

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Cc: Eric Bénard <eric@eukrea.com>

diff --git a/board/eukrea/cpuat91/cpuat91.c b/board/eukrea/cpuat91/cpuat91.c
index fa4b25ba23c2d732567949d29f05bcf2bec7a01d..5d0541484136bee3578e0b87e0c9e8811db6349c 100644 (file)
--- a/board/eukrea/cpuat91/cpuat91.c
+++ b/board/eukrea/cpuat91/cpuat91.c
@@ -32,6 +32,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_pio.h>
 #include <asm/arch/at91_pmc.h>
+#include <asm/arch/at91_common.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -52,6 +53,13 @@ int board_init(void)
        return 0;
 }
 
+int board_early_init_f(void)
+{
+       at91_seriald_hw_init();
+       return 0;
+}
+
+
 int dram_init(void)
 {
        /* dram_init must store complete ramsize in gd->ram_size */

diff --git a/include/configs/cpuat91.h b/include/configs/cpuat91.h
index 2bda72bec8466f80e99261a2a0a3018f81b5f4e2..75b881cf84429d597ce2acf104006b15d7b23c0e 100644 (file)
--- a/include/configs/cpuat91.h
+++ b/include/configs/cpuat91.h
@@ -54,6 +54,7 @@
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
+#define CONFIG_BOARD_EARLY_INIT_F
 
 #ifndef CONFIG_SKIP_LOWLEVEL_INIT
 #define CONFIG_SYS_USE_MAIN_OSCILLATOR
@@ -87,9 +88,9 @@
 #define CONFIG_SYS_SDRC_TR_VAL 0x000002E0 /* Write refresh rate */
 #endif /* CONFIG_SKIP_LOWLEVEL_INIT */
 
-/* define one of these to choose the DBGU, USART0 or USART1 as console */
-#define CONFIG_AT91RM9200_USART
-#define CONFIG_DBGU
+#define CONFIG_ATMEL_USART
+#define CONFIG_USART_BASE      ATMEL_BASE_DBGU
+#define CONFIG_USART_ID                0/* ignored in arm */
 
 #undef CONFIG_HARD_I2C
 #undef CONFIG_SOFT_I2C