From patchwork Thu Mar 22 21:53:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sjoerd Simons X-Patchwork-Id: 889659 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=collabora.co.uk Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 406gRc50g1z9s2M for ; Fri, 23 Mar 2018 08:54:03 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 03753C21C8B; Thu, 22 Mar 2018 21:53:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED, SPF_HELO_PASS, UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 5750BC21C6A; Thu, 22 Mar 2018 21:53:55 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 90F38C21C8B; Thu, 22 Mar 2018 21:53:53 +0000 (UTC) Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lists.denx.de (Postfix) with ESMTPS id 15457C21BE5 for ; Thu, 22 Mar 2018 21:53:53 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: sjoerd) with ESMTPSA id 79B42270024 Received: by beast.luon.net (Postfix, from userid 1000) id 670113E2302; Thu, 22 Mar 2018 22:53:50 +0100 (CET) From: Sjoerd Simons To: u-boot@lists.denx.de Date: Thu, 22 Mar 2018 22:53:50 +0100 Message-Id: <20180322215350.3631-1-sjoerd.simons@collabora.co.uk> X-Mailer: git-send-email 2.16.2 MIME-Version: 1.0 Cc: Jorge Ramirez-Ortiz , Maxime Ripard , Fiach Antaw Subject: [U-Boot] [PATCH] env: Properly check for BLK support X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Use CONFIG_IS_ENABLED to see if CONFIG_BLK is enabled. Otherwise SPL compilation breaks on boards which do have CONFIG_BLK enabled but not DM_MMC for the SPL as follows: env/mmc.c: In function ‘init_mmc_for_env’: env/mmc.c:164:6: warning: implicit declaration of function ‘blk_get_from_parent’; did you mean ‘efi_get_ram_base’? [-Wimplicit-function-declaration] if (blk_get_from_parent(mmc->dev, &dev)) ^~~~~~~~~~~~~~~~~~~ efi_get_ram_base env/mmc.c:164:29: error: ‘struct mmc’ has no member named ‘dev’ if (blk_get_from_parent(mmc->dev, &dev)) ^~ Signed-off-by: Sjoerd Simons Reviewed-by: Simon Glass --- env/mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env/mmc.c b/env/mmc.c index 6f11deccb1..bf7015cd14 100644 --- a/env/mmc.c +++ b/env/mmc.c @@ -158,7 +158,7 @@ static const char *init_mmc_for_env(struct mmc *mmc) if (!mmc) return "!No MMC card found"; -#ifdef CONFIG_BLK +#if CONFIG_IS_ENABLED(BLK) struct udevice *dev; if (blk_get_from_parent(mmc->dev, &dev))