From patchwork Tue Mar 3 14:07:45 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Christophe PLAGNIOL-VILLARD X-Patchwork-Id: 71656 X-Patchwork-Delegate: info@emk-elektronik.de Return-Path: X-Original-To: wd@gemini.denx.de Delivered-To: wd@gemini.denx.de Received: from diddl.denx.de (diddl.denx.de [10.0.0.6]) by gemini.denx.de (Postfix) with ESMTP id 80957832C2FF for ; Thu, 5 Mar 2009 23:42:05 +0100 (CET) Received: from diddl.denx.de (localhost.localdomain [127.0.0.1]) by diddl.denx.de (Postfix) with ESMTP id 4BE0AC913180 for ; Thu, 5 Mar 2009 23:41:52 +0100 (CET) Received: from pop.mnet-online.de by diddl.denx.de with POP3 (fetchmail-6.3.8) for (single-drop); Thu, 05 Mar 2009 23:41:52 +0100 (CET) Received: from murder (svr19.m-online.net [192.168.3.147]) by backend2 (Cyrus v2.2.12) with LMTPA; Tue, 03 Mar 2009 15:21:22 +0100 X-Sieve: CMU Sieve 2.2 Received: from mail.m-online.net (localhost [127.0.0.1]) by frontend3.pop.m-online.net (Cyrus v2.2.13) with LMTPA; Tue, 03 Mar 2009 15:21:22 +0100 Received: from scanner-1.m-online.net (scanner-1.m-online.net [192.168.2.221]) by mail.m-online.net (Postfix) with ESMTP id 0898C20019E; Tue, 3 Mar 2009 15:21:22 +0100 (CET) Received: from mxin-1.m-online.net ([192.168.1.21]) by scanner-1.m-online.net (scanner-1.m-online.net [192.168.2.221]) (amavisd-new, port 10026) with ESMTP id 19170-01-6; Tue, 3 Mar 2009 15:22:09 +0100 (CET) Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by mxin-2.m-online.net (Postfix) with ESMTP id 66ADD46C0C8; Tue, 3 Mar 2009 15:21:21 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AA51528126; Tue, 3 Mar 2009 15:19:32 +0100 (CET) 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 8ImEDT8MLvPQ; Tue, 3 Mar 2009 15:19:32 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A452D28154; Tue, 3 Mar 2009 15:18:52 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 295B928147 for ; Tue, 3 Mar 2009 15:18:50 +0100 (CET) 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 HonxYgpe3cUX for ; Tue, 3 Mar 2009 15:18:49 +0100 (CET) Received: from 30.mail-out.ovh.net (30.mail-out.ovh.net [213.186.62.213]) by theia.denx.de (Postfix) with SMTP id 2193B28100 for ; Tue, 3 Mar 2009 15:18:37 +0100 (CET) Received: (qmail 20634 invoked by uid 503); 3 Mar 2009 14:18:56 -0000 Received: from b7.ovh.net (HELO mail153.ha.ovh.net) (213.186.33.57) by 30.mail-out.ovh.net with SMTP; 3 Mar 2009 14:18:56 -0000 Received: from b0.ovh.net (HELO queue-out) (213.186.33.50) by b0.ovh.net with SMTP; 3 Mar 2009 14:18:53 -0000 Received: from ns32433.ovh.net (HELO localhost) (plagnioj%jcrosoft.com@213.251.161.87) by ns0.ovh.net with SMTP; 3 Mar 2009 14:18:47 -0000 From: Jean-Christophe PLAGNIOL-VILLARD To: u-boot@lists.denx.de Date: Tue, 3 Mar 2009 15:07:45 +0100 Message-Id: <1236089265-24598-9-git-send-email-plagnioj@jcrosoft.com> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1236089265-24598-8-git-send-email-plagnioj@jcrosoft.com> References: <1236089265-24598-1-git-send-email-plagnioj@jcrosoft.com> <1236089265-24598-2-git-send-email-plagnioj@jcrosoft.com> <1236089265-24598-3-git-send-email-plagnioj@jcrosoft.com> <1236089265-24598-4-git-send-email-plagnioj@jcrosoft.com> <1236089265-24598-5-git-send-email-plagnioj@jcrosoft.com> <1236089265-24598-6-git-send-email-plagnioj@jcrosoft.com> <1236089265-24598-7-git-send-email-plagnioj@jcrosoft.com> <1236089265-24598-8-git-send-email-plagnioj@jcrosoft.com> X-Ovh-Tracer-Id: 4343440366689102618 X-Ovh-Remote: 213.251.161.87 (ns32433.ovh.net) X-Ovh-Local: 213.186.33.20 (ns0.ovh.net) X-Spam-Check: DONE|H 0.5/N Subject: [U-Boot] [PATCH 9/9] at91rm9200ek: add dcc support with at91rm9200ek_dcc_config 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: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de X-Virus-Scanned: by amavisd-new at m-online.net Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- Makefile | 14 +++++++++++++- include/configs/at91rm9200ek.h | 4 +++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 50ce78e..c24115d 100644 --- a/Makefile +++ b/Makefile @@ -2605,8 +2605,20 @@ shannon_config : unconfig at91rm9200dk_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200 +at91rm9200ek_dcc_multi_config \ +at91rm9200ek_dcc_config \ at91rm9200ek_config : unconfig - @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200ek atmel at91rm9200 + @mkdir -p $(obj)include + @if [ "$(findstring _dcc_mutli, $@)" ] ; then \ + echo "#define CONFIG_ARM_DCC" >> $(obj)include/config.h ; \ + echo "#define CONFIG_ARM_DCC_MUTLI" >> $(obj)include/config.h ; \ + echo "#define CONFIG_CONSOLE_MUX" >> $(obj)include/config.h ; \ + $(XECHO) "... configured with dcc as multi serial"; \ + elif [ "$(findstring _dcc_, $@)" ] ; then \ + echo "#define CONFIG_ARM_DCC" >>$(obj)include/config.h ; \ + $(XECHO) "... with dcc as serial" ; \ + fi; + @$(MKCONFIG) -a at91rm9200ek arm arm920t at91rm9200ek atmel at91rm9200 cmc_pu2_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200 diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h index 2fc4faf..1face05 100644 --- a/include/configs/at91rm9200ek.h +++ b/include/configs/at91rm9200ek.h @@ -112,6 +112,7 @@ * define one of these to choose the DBGU, * USART0 or USART1 as console */ +#if !defined(CONFIG_ARM_DCC) || defined(CONFIG_ARM_DCC_MULTI) #define CONFIG_AT91RM9200_USART #define CONFIG_DBGU #undef CONFIG_USART0 @@ -121,8 +122,9 @@ /* disable modem initialization stuff */ #undef CONFIG_MODEM_SUPPORT -#define CONFIG_SYS_BAUDRATE_TABLE {115200 , 19200, 38400, 57600, 9600 } #define CONFIG_BAUDRATE 115200 +#endif +#define CONFIG_SYS_BAUDRATE_TABLE {115200 , 19200, 38400, 57600, 9600 } /* * Command line configuration.