summaryrefslogtreecommitdiff
path: root/env
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2018-03-22 22:53:50 +0100
committerTom Rini <trini@konsulko.com>2018-04-06 20:45:44 -0400
commitd48b8d1138a45ee88f2af0a883d87a1a93ae0592 (patch)
treee59ef5cd016128de9972e3c1e02229ee08c3631e /env
parent4abd9cecee71e269d3af4f3c4c7aec492b9a642f (diff)
env: Properly check for BLK support
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 <sjoerd.simons@collabora.co.uk> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'env')
-rw-r--r--env/mmc.c2
1 files changed, 1 insertions, 1 deletions
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))