From patchwork Sun Jun 12 11:49:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_Bie=C3=9Fmann?= X-Patchwork-Id: 100079 X-Patchwork-Delegate: info@emk-elektronik.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 28F8CB70A0 for ; Sun, 12 Jun 2011 21:50:27 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A74F728216; Sun, 12 Jun 2011 13:50:08 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7SjB3C0cCWHx; Sun, 12 Jun 2011 13:50:08 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 23C40281F4; Sun, 12 Jun 2011 13:49:50 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 290E9281E4 for ; Sun, 12 Jun 2011 13:49:46 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 16YThz9R-SuG for ; Sun, 12 Jun 2011 13:49:45 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-bw0-f44.google.com (mail-bw0-f44.google.com [209.85.214.44]) by theia.denx.de (Postfix) with ESMTPS id AD8F3281C9 for ; Sun, 12 Jun 2011 13:49:36 +0200 (CEST) Received: by mail-bw0-f44.google.com with SMTP id 13so3149547bwz.3 for ; Sun, 12 Jun 2011 04:49:36 -0700 (PDT) Received: by 10.204.7.211 with SMTP id e19mr1380071bke.139.1307879376335; Sun, 12 Jun 2011 04:49:36 -0700 (PDT) Received: from andreas-mbp.erlangen.biessmann.tld (dslb-188-105-233-069.pools.arcor-ip.net [188.105.233.69]) by mx.google.com with ESMTPS id l24sm4336971bkw.3.2011.06.12.04.49.35 (version=SSLv3 cipher=OTHER); Sun, 12 Jun 2011 04:49:35 -0700 (PDT) From: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= To: u-boot@lists.denx.de, Reinhard Meyer Date: Sun, 12 Jun 2011 13:49:14 +0200 Message-Id: <1307879357-97986-5-git-send-email-andreas.devel@googlemail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1307879357-97986-1-git-send-email-andreas.devel@googlemail.com> References: <1307879357-97986-1-git-send-email-andreas.devel@googlemail.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH atmel/next 4/7] at91rm9200ek: use atmel_usart X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Signed-off-by: Andreas Bießmann --- 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 #include #include +#include #include 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