From patchwork Sun Dec 20 03:00:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 559301 X-Patchwork-Delegate: marek.vasut@gmail.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 699EA14031B for ; Sun, 20 Dec 2015 14:01:38 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 55B274B788; Sun, 20 Dec 2015 04:01:22 +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 ZywnehcIAQXh; Sun, 20 Dec 2015 04:01:22 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 502064B7E5; Sun, 20 Dec 2015 04:01:16 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 933CF4B6DF for ; Sun, 20 Dec 2015 04:01:03 +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 9w9yEqDJOFuZ for ; Sun, 20 Dec 2015 04:01:03 +0100 (CET) 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-out.m-online.net (mail-out.m-online.net [212.18.0.9]) by theia.denx.de (Postfix) with ESMTPS id 500D44B788 for ; Sun, 20 Dec 2015 04:00:58 +0100 (CET) Received: from mail.nefkom.net (unknown [192.168.8.184]) by mail-out.m-online.net (Postfix) with ESMTP id 3pNTG20Lv1z3hj7x; Sun, 20 Dec 2015 04:00:58 +0100 (CET) X-Auth-Info: 8EQhlRWIdiAV2woQ4HM5EkZZc5Kd1ldEBygEaMveqUI= Received: from chi.lan (unknown [195.140.253.167]) by smtp-auth.mnet-online.de (Postfix) with ESMTPA id 3pNTG15756zvdWS; Sun, 20 Dec 2015 04:00:57 +0100 (CET) From: Marek Vasut To: u-boot@lists.denx.de Date: Sun, 20 Dec 2015 04:00:45 +0100 Message-Id: <1450580446-6435-5-git-send-email-marex@denx.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1450580446-6435-1-git-send-email-marex@denx.de> References: <1450580446-6435-1-git-send-email-marex@denx.de> Cc: Marek Vasut , Chin Liang See Subject: [U-Boot] [PATCH 5/6] arm: socfpga: Enable DFU MMC support only if DM_MMC is enabled 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" It is not possible to compile DFU MMC support if the MMC support is not compiled into U-Boot. Secure the code with an ifdef to prevent compiler splat. Signed-off-by: Marek Vasut Cc: Dinh Nguyen Cc: Chin Liang See Acked-by: Chin Liang See --- include/configs/socfpga_common.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 3d46330..4124d8b 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -249,7 +249,9 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #define CONFIG_USB_FUNCTION_MASS_STORAGE #define CONFIG_USB_FUNCTION_DFU +#ifdef CONFIG_DM_MMC #define CONFIG_DFU_MMC +#endif #define CONFIG_SYS_DFU_DATA_BUF_SIZE (32 * 1024 * 1024) #define DFU_DEFAULT_POLL_TIMEOUT 300