From patchwork Fri Aug 24 23:58:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 179921 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 2F5BE2C00E7 for ; Sat, 25 Aug 2012 09:59:10 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 087BA28091; Sat, 25 Aug 2012 01:59:05 +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 sqwy894DhPYl; Sat, 25 Aug 2012 01:59:04 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BA53D28096; Sat, 25 Aug 2012 01:58:48 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 83F942807E for ; Sat, 25 Aug 2012 01:58:43 +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 aXL6pEmWBERf for ; Sat, 25 Aug 2012 01:58:43 +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 B78C828080 for ; Sat, 25 Aug 2012 01:58:41 +0200 (CEST) Received: by pbbrr4 with SMTP id rr4so4207992pbb.3 for ; Fri, 24 Aug 2012 16:58:39 -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=oz5EeAwtFSTR0XWiWlaIG6rtq7hmpust5bg3rkYF/Ak=; b=u65CGvG4Ql7ZQqZnUpXweUAkwXkgDXKKdlyxKRAnddzVMzwtx52wfWttFAwjmF/YEc 4IVja68VUzeD4An0IPWOKvS/i/W0VI3PxvDkgztkRk0dCUx7J19vQRxq/AzI7433fqkd cbeW7z2wnJLqbq61Hv1iw98l+lxCRV+OElQsYk2UeRHTsvIelrcOI6MpnCkzDQ2SbY3u bEeXAf8A2QIXRl/GeKqUFenXSFb+0MTz0kBUrHfxqCZoW4H+JX5K1aWtaUWGGdiOzAMC pxL8orphr4fIAZmiREjGFffam6DMJ17qZKIaP8vr3xjMLeGrGQ5NU3nLsWEmN0dLuz/B mvUg== Received: by 10.66.73.69 with SMTP id j5mr14239695pav.8.1345852719761; Fri, 24 Aug 2012 16:58:39 -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 pg9sm9274015pbb.26.2012.08.24.16.58.38 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 24 Aug 2012 16:58:39 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Fri, 24 Aug 2012 16:58:16 -0700 Message-Id: <1345852714-13138-3-git-send-email-trini@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1345852714-13138-1-git-send-email-trini@ti.com> References: <1345852714-13138-1-git-send-email-trini@ti.com> Cc: Sudhakar Rajashekhara , Christian Riesch Subject: [U-Boot] [PATCH v4 02/20] 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 --- 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();