From patchwork Sun Jun 12 11:49:16 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: 100081 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 838D4B70A3 for ; Sun, 12 Jun 2011 21:50:46 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 599FF281DE; Sun, 12 Jun 2011 13:50:20 +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 aekDLYRtzh-W; Sun, 12 Jun 2011 13:50:20 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 33EB1281E6; Sun, 12 Jun 2011 13:50:02 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 161DB281C5 for ; Sun, 12 Jun 2011 13:50:00 +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 LFdGpSYze6BI for ; Sun, 12 Jun 2011 13:49:59 +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 2E205281E3 for ; Sun, 12 Jun 2011 13:49:44 +0200 (CEST) Received: by mail-bw0-f44.google.com with SMTP id 13so3149547bwz.3 for ; Sun, 12 Jun 2011 04:49:44 -0700 (PDT) Received: by 10.204.126.73 with SMTP id b9mr3606116bks.193.1307879384025; Sun, 12 Jun 2011 04:49:44 -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.42 (version=SSLv3 cipher=OTHER); Sun, 12 Jun 2011 04:49:43 -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:16 +0200 Message-Id: <1307879357-97986-7-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 Cc: =?UTF-8?q?Eric=20B=C3=A9nard?= Subject: [U-Boot] [PATCH atmel/next 6/7] cpuat91: 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 Cc: Eric Bénard --- board/eukrea/cpuat91/cpuat91.c | 8 ++++++++ include/configs/cpuat91.h | 7 ++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/board/eukrea/cpuat91/cpuat91.c b/board/eukrea/cpuat91/cpuat91.c index fa4b25b..5d05414 100644 --- a/board/eukrea/cpuat91/cpuat91.c +++ b/board/eukrea/cpuat91/cpuat91.c @@ -32,6 +32,7 @@ #include #include #include +#include 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 2bda72b..75b881c 100644 --- 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