From patchwork Tue Mar 3 14:07:40 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: 71651 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 CCB44832C2FF for ; Thu, 5 Mar 2009 23:42:04 +0100 (CET) Received: from diddl.denx.de (localhost.localdomain [127.0.0.1]) by diddl.denx.de (Postfix) with ESMTP id 983FDC913180 for ; Thu, 5 Mar 2009 23:41:51 +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:51 +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:19:59 +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:19:59 +0100 Received: from scanner-2.m-online.net (unknown [192.168.8.166]) by mail.m-online.net (Postfix) with ESMTP id 3523520019E; Tue, 3 Mar 2009 15:19:59 +0100 (CET) Received: from mxin-1.m-online.net ([192.168.2.222]) by scanner-2.m-online.net (scanner-2.m-online.net [192.168.8.166]) (amavisd-new, port 10026) with ESMTP id 01038-05-2; Tue, 3 Mar 2009 15:19:28 +0100 (CET) Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by mxin-1.m-online.net (Postfix) with ESMTP id B2D9446C0B8; Tue, 3 Mar 2009 15:20:15 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 03AD428109; Tue, 3 Mar 2009 15:18:58 +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 t7PGufh2-mi5; Tue, 3 Mar 2009 15:18:57 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8C71A2810C; Tue, 3 Mar 2009 15:18:39 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0A110280E4 for ; Tue, 3 Mar 2009 15:18:33 +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 kzOA6ksD13zf for ; Tue, 3 Mar 2009 15:18:32 +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 3D8E2280D4 for ; Tue, 3 Mar 2009 15:18:32 +0100 (CET) Received: (qmail 19687 invoked by uid 503); 3 Mar 2009 14:18:51 -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:51 -0000 Received: from b0.ovh.net (HELO queue-out) (213.186.33.50) by b0.ovh.net with SMTP; 3 Mar 2009 14:18:49 -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:45 -0000 From: Jean-Christophe PLAGNIOL-VILLARD To: u-boot@lists.denx.de Date: Tue, 3 Mar 2009 15:07:40 +0100 Message-Id: <1236089265-24598-4-git-send-email-plagnioj@jcrosoft.com> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1236089265-24598-3-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> X-Ovh-Tracer-Id: 4342877416731880218 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 4/9] at91rm9200dk: Move conditional compilation to Makefile 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 --- board/atmel/at91rm9200dk/Makefile | 14 ++++++++++---- board/atmel/at91rm9200dk/mux.c | 16 ++++++---------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/board/atmel/at91rm9200dk/Makefile b/board/atmel/at91rm9200dk/Makefile index 2d806d0..79d41d6 100644 --- a/board/atmel/at91rm9200dk/Makefile +++ b/board/atmel/at91rm9200dk/Makefile @@ -25,10 +25,16 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -COBJS := at91rm9200dk.o flash.o led.o mux.o partition.o - -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) +COBJS-y += $(BOARD).o +COBJS-y += flash.o +COBJS-y += led.o +ifdef CONFIG_HAS_DATAFLASH +COBJS-$(CONFIG_DATAFLASH_MMC_SELECT) += mux.o +COBJS-y += partition.o +endif + +SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) SOBJS := $(addprefix $(obj),$(SOBJS)) $(LIB): $(obj).depend $(OBJS) $(SOBJS) diff --git a/board/atmel/at91rm9200dk/mux.c b/board/atmel/at91rm9200dk/mux.c index 8319142..030411c 100644 --- a/board/atmel/at91rm9200dk/mux.c +++ b/board/atmel/at91rm9200dk/mux.c @@ -3,35 +3,31 @@ #include #include -int AT91F_GetMuxStatus(void) { -#ifdef CONFIG_DATAFLASH_MMC_SELECT +int AT91F_GetMuxStatus(void) +{ AT91C_BASE_PIOB->PIO_PER = CONFIG_SYS_DATAFLASH_MMC_PIO; /* Set in PIO mode */ AT91C_BASE_PIOB->PIO_OER = CONFIG_SYS_DATAFLASH_MMC_PIO; /* Configure in output */ - if(AT91C_BASE_PIOB->PIO_ODSR & CONFIG_SYS_DATAFLASH_MMC_PIO) { return 1; } else { return 0; } -#endif return 0; } -void AT91F_SelectMMC(void) { -#ifdef CONFIG_DATAFLASH_MMC_SELECT +void AT91F_SelectMMC(void) +{ AT91C_BASE_PIOB->PIO_PER = CONFIG_SYS_DATAFLASH_MMC_PIO; /* Set in PIO mode */ AT91C_BASE_PIOB->PIO_OER = CONFIG_SYS_DATAFLASH_MMC_PIO; /* Configure in output */ /* Set Output */ AT91C_BASE_PIOB->PIO_SODR = CONFIG_SYS_DATAFLASH_MMC_PIO; -#endif } -void AT91F_SelectSPI(void) { -#ifdef CONFIG_DATAFLASH_MMC_SELECT +void AT91F_SelectSPI(void) +{ AT91C_BASE_PIOB->PIO_PER = CONFIG_SYS_DATAFLASH_MMC_PIO; /* Set in PIO mode */ AT91C_BASE_PIOB->PIO_OER = CONFIG_SYS_DATAFLASH_MMC_PIO; /* Configure in output */ /* Clear Output */ AT91C_BASE_PIOB->PIO_CODR = CONFIG_SYS_DATAFLASH_MMC_PIO; -#endif }