commit eef05fd3ba68 ("mmc: bring back partition init for non-DM MMC
drivers") added this call to support drivers not yet migrated to driver
model. Slightly previously, however, commit 91ff6865629c ("blk: Rework
guard around part_init call") had removed the last reference in the code
to SPL_LIBDISK_SUPPORT, replacing it with a non-stage-specific check for
CONFIG_PARTITIONS and CONFIG_HAVE_BLOCK_DEVICE. Make that same change to
the guard here.Signed-off-by: Thomas Hebb <[email protected]> --- drivers/mmc/mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index d43983d4a6..e0720318a9 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -2617,7 +2617,7 @@ static int mmc_startup(struct mmc *mmc) bdesc->revision[0] = 0; #endif -#if !defined(CONFIG_DM_MMC) && (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBDISK_SUPPORT)) +#if !defined(CONFIG_DM_MMC) && (defined(CONFIG_PARTITIONS) && defined(CONFIG_HAVE_BLOCK_DEVICE)) part_init(bdesc); #endif -- 2.24.1
