From patchwork Fri Jan 6 19:35:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 712121 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 3twFCG1snfz9sCg for ; Sat, 7 Jan 2017 06:35:54 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CBB24B3959; Fri, 6 Jan 2017 20:35:51 +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 0iYLKwsYdTSs; Fri, 6 Jan 2017 20:35:51 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2C723B38E4; Fri, 6 Jan 2017 20:35:51 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7EC33A75C2 for ; Fri, 6 Jan 2017 20:35:48 +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 h0FXBopEXbFC for ; Fri, 6 Jan 2017 20:35:48 +0100 (CET) Received: from fllnx210.ext.ti.com (fllnx210.ext.ti.com [198.47.19.17]) by theia.denx.de (Postfix) with ESMTPS id 081B9A75B7 for ; Fri, 6 Jan 2017 20:35:47 +0100 (CET) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by fllnx210.ext.ti.com (8.15.1/8.15.1) with ESMTP id v06JZjaF026778; Fri, 6 Jan 2017 13:35:45 -0600 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id v06JZjLY011404; Fri, 6 Jan 2017 13:35:45 -0600 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.294.0; Fri, 6 Jan 2017 13:35:44 -0600 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id v06JZjbi022795; Fri, 6 Jan 2017 13:35:45 -0600 Received: from localhost (uda0226330.am.dhcp.ti.com [128.247.83.127]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id v06JZj309779; Fri, 6 Jan 2017 13:35:45 -0600 (CST) From: "Andrew F. Davis" To: Tom Rini , Simon Glass , Lokesh Vutla Date: Fri, 6 Jan 2017 13:35:45 -0600 Message-ID: <20170106193545.27832-2-afd@ti.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170106193545.27832-1-afd@ti.com> References: <20170106193545.27832-1-afd@ti.com> MIME-Version: 1.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 2/2] spl: Remove inline ifdef check for EXT and FAT support X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" These files are only included for build by the make system when CONFIG_SPL_{EXT,FAT}_SUPPORT is enabled, remove the unneed checks for these in the source files. Signed-off-by: Andrew F. Davis Reviewed-by: Tom Rini Reviewed-by: Simon Glass --- common/spl/spl_ext.c | 2 -- common/spl/spl_fat.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c index 6165f88d2b..a58f7ef3fe 100644 --- a/common/spl/spl_ext.c +++ b/common/spl/spl_ext.c @@ -9,7 +9,6 @@ #include #include -#ifdef CONFIG_SPL_EXT_SUPPORT int spl_load_image_ext(struct spl_image_info *spl_image, struct blk_desc *block_dev, int partition, const char *filename) @@ -138,4 +137,3 @@ int spl_load_image_ext_os(struct spl_image_info *spl_image, return -ENOSYS; } #endif -#endif diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c index aa5a39e4f7..66917ffa4f 100644 --- a/common/spl/spl_fat.c +++ b/common/spl/spl_fat.c @@ -19,7 +19,6 @@ static int fat_registered; -#ifdef CONFIG_SPL_FAT_SUPPORT static int spl_register_fat_device(struct blk_desc *block_dev, int partition) { int err = 0; @@ -154,4 +153,3 @@ int spl_load_image_fat_os(struct spl_image_info *spl_image, return -ENOSYS; } #endif -#endif