Signed-off-by: Andreas Bießmann andreas.devel@googlemail.com --- board/atmel/at91rm9200ek/at91rm9200ek.c | 7 +++++++ include/configs/at91rm9200ek.h | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/board/atmel/at91rm9200ek/at91rm9200ek.c b/board/atmel/at91rm9200ek/at91rm9200ek.c index 5ebc24d..ec0daba 100644 --- a/board/atmel/at91rm9200ek/at91rm9200ek.c +++ b/board/atmel/at91rm9200ek/at91rm9200ek.c @@ -31,6 +31,7 @@ #include <asm/arch/hardware.h> #include <asm/arch/at91_pio.h> #include <asm/arch/at91_pmc.h> +#include <asm/arch/at91_common.h> #include <asm/io.h>
DECLARE_GLOBAL_DATA_PTR; @@ -54,6 +55,12 @@ 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/at91rm9200ek.h b/include/configs/at91rm9200ek.h index ee199ab..b847798 100644 --- a/include/configs/at91rm9200ek.h +++ b/include/configs/at91rm9200ek.h @@ -73,6 +73,8 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG
+#define CONFIG_BOARD_EARLY_INIT_F + /* * Memory Configuration */ @@ -123,8 +125,9 @@ * CONFIG_DBGU is DBGU unit on J10 * CONFIG_USART1 is USART1 on J14 */ -#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 */
#define CONFIG_SYS_BAUDRATE_TABLE {115200 , 19200, 38400, 57600, 9600 } #define CONFIG_BAUDRATE 115200