From patchwork Wed Aug 15 21:30:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 177825 X-Patchwork-Delegate: trini@ti.com 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 65FE02C0096 for ; Thu, 16 Aug 2012 07:31:14 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DF02C281B7; Wed, 15 Aug 2012 23:31: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 g0QLVpyQYqyP; Wed, 15 Aug 2012 23:31:07 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8579A281BE; Wed, 15 Aug 2012 23:30:58 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 38CBB28123 for ; Wed, 15 Aug 2012 23:30:55 +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 sLgdmoMkIwMp for ; Wed, 15 Aug 2012 23:30:53 +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-pb0-f44.google.com (mail-pb0-f44.google.com [209.85.160.44]) by theia.denx.de (Postfix) with ESMTPS id 423B2280FC for ; Wed, 15 Aug 2012 23:30:51 +0200 (CEST) Received: by pbbrr4 with SMTP id rr4so473025pbb.3 for ; Wed, 15 Aug 2012 14:30:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=81Vb0WELuk+jFz1z8oXyR83HL1h4znkECCEspFVVSLo=; b=IrH81u6xMDXlmdPWkbMKTqVh3wUD+HYaZHUzxEaQZL3FwqmLII5o4JmLRlOrt7GN9A XWf4cxD+ftbnZnRzi/nw4fEF29/+24rH6f3NcKQIIs7wrN5kdq8OMq/WhGHNxdMd+MO5 qRowLQbAxe0ETY3KL4/dp1GdsOCgFZ8hWYH1kXR4NRkEfoa77HwleRwtHeHaRCwRFliZ o3lCr4ZRsKW5/6vOq0FEYNOfH8lzj7rZs7Do/w1CFS02FqexWdRIfyHbzg4iECxT1VI+ I08b4wt3MYN7r52vRIN7IpOM4jY30xKYWtxGQ26vRw4U9Vvl7IVCF6lZ/O2bFoUqlUNo OI3A== Received: by 10.68.218.196 with SMTP id pi4mr9651290pbc.128.1345066249781; Wed, 15 Aug 2012 14:30:49 -0700 (PDT) Received: from localhost.localdomain (ip68-230-54-74.ph.ph.cox.net. [68.230.54.74]) by mx.google.com with ESMTPS id kp3sm1128717pbc.64.2012.08.15.14.30.48 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 15 Aug 2012 14:30:49 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Wed, 15 Aug 2012 14:30:38 -0700 Message-Id: <1345066254-6911-2-git-send-email-trini@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1345066254-6911-1-git-send-email-trini@ti.com> References: <1345066254-6911-1-git-send-email-trini@ti.com> Cc: Sudhakar Rajashekhara , Heiko Schocher , Christian Riesch Subject: [U-Boot] [PATCH 01/17] spl_mmc: Make FAT checks / calls guarded with CONFIG_SPL_FAT_SUPPORT X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 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 Signed-off-by: Tom Rini Acked-by: Stefano Babic --- arch/arm/cpu/armv7/omap-common/spl_mmc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/cpu/armv7/omap-common/spl_mmc.c b/arch/arm/cpu/armv7/omap-common/spl_mmc.c index 2f921bb..7552f6c 100644 --- a/arch/arm/cpu/armv7/omap-common/spl_mmc.c +++ b/arch/arm/cpu/armv7/omap-common/spl_mmc.c @@ -84,6 +84,7 @@ end: } } +#ifdef CONFIG_SPL_FAT_SUPPORT static void mmc_load_image_fat(struct mmc *mmc) { s32 err; @@ -116,6 +117,7 @@ end: hang(); } } +#endif void spl_mmc_load_image(void) { @@ -140,9 +142,11 @@ void spl_mmc_load_image(void) if (boot_mode == MMCSD_MODE_RAW) { debug("boot mode - RAW\n"); mmc_load_image_raw(mmc); +#ifdef CONFIG_SPL_FAT_SUPPORT } else if (boot_mode == MMCSD_MODE_FAT) { debug("boot mode - FAT\n"); mmc_load_image_fat(mmc); +#endif } else { puts("spl: wrong MMC boot mode\n"); hang();