From patchwork Tue Mar 3 14:07:44 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: 71655 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 BF1C4832C2FF 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 8A61CC913180 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:22:08 +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:22:08 +0100 Received: from scanner-2.m-online.net (unknown [192.168.8.166]) by mail.m-online.net (Postfix) with ESMTP id 3D5E020019E; Tue, 3 Mar 2009 15:22:08 +0100 (CET) Received: from mxin-3.m-online.net ([192.168.1.19]) by scanner-2.m-online.net (scanner-2.m-online.net [192.168.8.166]) (amavisd-new, port 10026) with ESMTP id 01490-02-2; Tue, 3 Mar 2009 15:21:36 +0100 (CET) Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by mxin-3.m-online.net (Postfix) with ESMTP id 0CD2446AF20; Tue, 3 Mar 2009 15:22:39 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8B8A028141; Tue, 3 Mar 2009 15:19:37 +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 zEAT7xuMNkX0; Tue, 3 Mar 2009 15:19:37 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6F63F28112; Tue, 3 Mar 2009 15:18:55 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A12EB28153 for ; Tue, 3 Mar 2009 15:18:52 +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 R0VCraPBtYjc for ; Tue, 3 Mar 2009 15:18:52 +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 4F0D328103 for ; Tue, 3 Mar 2009 15:18:37 +0100 (CET) Received: (qmail 5828 invoked by uid 503); 3 Mar 2009 14:18:55 -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:55 -0000 Received: from b0.ovh.net (HELO queue-out) (213.186.33.50) by b0.ovh.net with SMTP; 3 Mar 2009 14:18:52 -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:44 +0100 Message-Id: <1236089265-24598-8-git-send-email-plagnioj@jcrosoft.com> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1236089265-24598-7-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> X-Ovh-Tracer-Id: 4343440366688381722 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 8/9] at91sam9263ek add dcc support with at91sam9263ek_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 X-Spam-Status: No, score=0.912 tagged_above=0 required=5 tests=[BAYES_00=-2.599, RCVD_IN_BL_SPAMCOP_NET=1.96, RCVD_IN_SBL=1.551] X-Spam-Score: 0.912 X-Spam-Level: Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- Makefile | 11 +++++++++++ include/configs/at91sam9263ek.h | 2 ++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 784af52..50ce78e 100644 --- a/Makefile +++ b/Makefile @@ -2687,6 +2687,8 @@ at91sam9261ek_config : unconfig at91sam9263ek_nandflash_config \ at91sam9263ek_dataflash_config \ at91sam9263ek_dataflash_cs0_config \ +at91sam9263ek_dcc_multi_config \ +at91sam9263ek_dcc_config \ at91sam9263ek_wdt_config \ at91sam9263ek_config : unconfig @mkdir -p $(obj)include @@ -2701,6 +2703,15 @@ at91sam9263ek_config : unconfig echo "#define CONFIG_AT91SAM9_WATCHDOG" >> $(obj)include/config.h ; \ $(XECHO) "... configured with watchdog active"; \ fi + @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) "... configured with dcc as serial"; \ + fi @$(MKCONFIG) -a at91sam9263ek arm arm926ejs at91sam9263ek atmel at91 at91sam9rlek_nandflash_config \ diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 9087fc3..b193497 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -52,11 +52,13 @@ /* * Hardware drivers */ +#if !defined(CONFIG_ARM_DCC) || defined(CONFIG_ARM_DCC_MULTI) #define CONFIG_ATMEL_USART 1 #undef CONFIG_USART0 #undef CONFIG_USART1 #undef CONFIG_USART2 #define CONFIG_USART3 1 /* USART 3 is DBGU */ +#endif /* LCD */ #define CONFIG_LCD 1