From patchwork Fri Sep 30 10:41:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Schwarz X-Patchwork-Id: 117090 X-Patchwork-Delegate: albert.aribaud@free.fr 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 82AE0B6F71 for ; Fri, 30 Sep 2011 20:42:23 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D63282859B; Fri, 30 Sep 2011 12:42:18 +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 lzCubk8wZs+e; Fri, 30 Sep 2011 12:42:18 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 05FC928546; Fri, 30 Sep 2011 12:42:10 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A1B18284E7 for ; Fri, 30 Sep 2011 12:42:07 +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 xdJBwLbLkrvp for ; Fri, 30 Sep 2011 12:42:07 +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-fx0-f44.google.com (mail-fx0-f44.google.com [209.85.161.44]) by theia.denx.de (Postfix) with ESMTPS id 066B0284AD for ; Fri, 30 Sep 2011 12:42:05 +0200 (CEST) Received: by fxd18 with SMTP id 18so2591403fxd.3 for ; Fri, 30 Sep 2011 03:42:05 -0700 (PDT) Received: by 10.223.101.2 with SMTP id a2mr4798266fao.2.1317379325233; Fri, 30 Sep 2011 03:42:05 -0700 (PDT) Received: from localhost.localdomain (DSL01.212.114.252.242.ip-pool.NEFkom.net. [212.114.252.242]) by mx.google.com with ESMTPS id o22sm6157028fab.11.2011.09.30.03.42.03 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 30 Sep 2011 03:42:04 -0700 (PDT) From: Simon Schwarz To: u-boot@lists.denx.de Date: Fri, 30 Sep 2011 12:41:33 +0200 Message-Id: <1317379294-16314-2-git-send-email-simonschwarzcor@gmail.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1317379294-16314-1-git-send-email-simonschwarzcor@gmail.com> References: <1317379294-16314-1-git-send-email-simonschwarzcor@gmail.com> Organization: Corscience GmbH & Co. KG Subject: [U-Boot] [PATCH 1/2] devkit8000: protect board_mmc_init 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 This function is also defined in omap-common/spl_mmc.de so the implementation in devkit8000.c was protected by a ifdef. Signed-off-by: Simon Schwarz --- board/timll/devkit8000/devkit8000.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c index 9124569..dc99afb 100644 --- a/board/timll/devkit8000/devkit8000.c +++ b/board/timll/devkit8000/devkit8000.c @@ -125,7 +125,7 @@ void set_muxconf_regs(void) MUX_DEVKIT8000(); } -#ifdef CONFIG_GENERIC_MMC +#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) int board_mmc_init(bd_t *bis) { omap_mmc_init(0);