mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-30 08:30:50 +09:00
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>
This commit is contained in:
parent
4abd9cecee
commit
d48b8d1138
2
env/mmc.c
vendored
2
env/mmc.c
vendored
@ -158,7 +158,7 @@ static const char *init_mmc_for_env(struct mmc *mmc)
|
|||||||
if (!mmc)
|
if (!mmc)
|
||||||
return "!No MMC card found";
|
return "!No MMC card found";
|
||||||
|
|
||||||
#ifdef CONFIG_BLK
|
#if CONFIG_IS_ENABLED(BLK)
|
||||||
struct udevice *dev;
|
struct udevice *dev;
|
||||||
|
|
||||||
if (blk_get_from_parent(mmc->dev, &dev))
|
if (blk_get_from_parent(mmc->dev, &dev))
|
||||||
|
Loading…
Reference in New Issue
Block a user