From patchwork Tue Sep 25 00:30:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 186642 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 CA1C22C008F for ; Tue, 25 Sep 2012 10:31:44 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 243CA280A6; Tue, 25 Sep 2012 02:31:39 +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 bkWj0z881Jlg; Tue, 25 Sep 2012 02:31:38 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 722192809F; Tue, 25 Sep 2012 02:31:30 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CAEE728086 for ; Tue, 25 Sep 2012 02:31:24 +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 pFEAdtrw+1Dh for ; Tue, 25 Sep 2012 02:31:24 +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 260812807B for ; Tue, 25 Sep 2012 02:31:19 +0200 (CEST) Received: by mail-pb0-f44.google.com with SMTP id ro8so2664543pbb.3 for ; Mon, 24 Sep 2012 17:31:19 -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=tRWxF5/ARF/GGFrkKlBKtF1I98e7ZC6FYi5Nr35CLlRtwzwF8SgEDDAuf1vl0KHZPo jtAVoG/Nmfz1wbTL8QK0bk6HOs9Tf0fRa2LDh6jzB/7JUzmY2ytRhAVdstg6PiHpjxOY +j4yetWXy22wmWnG6iFZ04VgcL9Ct1kHubjxyBZQShuL00V62onzGe9wefTGIbFHBe6C tf61NW2BKVcff5yyZspeKI8akcgFR6ALMpoWNvjZHFNZJpFCo4+cvbTPfDqFEUoXNefo wUthxTFSkajo4/2Edee1kLfLVqPEXBxwwvfDLABqDS+Fa5Ycqd/nRwUH0QHHw8JRfpDw 0JYg== Received: by 10.68.241.232 with SMTP id wl8mr40810778pbc.112.1348533079284; Mon, 24 Sep 2012 17:31:19 -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 pj10sm10377538pbb.46.2012.09.24.17.31.17 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 24 Sep 2012 17:31:18 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Mon, 24 Sep 2012 17:30:40 -0700 Message-Id: <1348533068-13038-3-git-send-email-trini@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348533068-13038-1-git-send-email-trini@ti.com> References: <1348533068-13038-1-git-send-email-trini@ti.com> Cc: Sudhakar Rajashekhara , Christian Riesch Subject: [U-Boot] [PATCH v7 02/29] 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();