On Thu, May 22, 2025 at 02:37:06PM +0200, Neil Armstrong wrote: > From: Dmitrii Merkurev <dimori...@google.com> > > Switch the mmc backend to this new shared block helpers, > reducing block logic and only leaving MMC specific logic. > > Signed-off-by: Dmitrii Merkurev <dimori...@google.com> > Reviewed-by: Mattijs Korpershoek <mkorpersh...@kernel.org> > Tested-by: Mattijs Korpershoek <mkorpersh...@kernel.org> > Signed-off-by: Neil Armstrong <neil.armstr...@linaro.org> > --- > drivers/fastboot/Kconfig | 4 +- > drivers/fastboot/Makefile | 3 +- > drivers/fastboot/fb_mmc.c | 210 > +++------------------------------------------- > 3 files changed, 16 insertions(+), 201 deletions(-) > > diff --git a/drivers/fastboot/Kconfig b/drivers/fastboot/Kconfig > index > 70207573de2bd0d56b4b7fa6f7e17fdc5803ba15..33825ee408fbd9aff26cd390a140421c7c98ecc3 > 100644 > --- a/drivers/fastboot/Kconfig > +++ b/drivers/fastboot/Kconfig > @@ -91,7 +91,7 @@ config FASTBOOT_USB_DEV > config FASTBOOT_FLASH > bool "Enable FASTBOOT FLASH command" > default y if ARCH_SUNXI || ARCH_ROCKCHIP > - depends on MMC || (MTD_RAW_NAND && CMD_MTDPARTS) > + depends on MMC || (MTD_RAW_NAND && CMD_MTDPARTS) || BLK > select IMAGE_SPARSE > help > The fastboot protocol includes a "flash" command for writing > @@ -113,7 +113,7 @@ choice > > config FASTBOOT_FLASH_MMC > bool "FASTBOOT on MMC" > - depends on MMC > + depends on MMC && BLK > > config FASTBOOT_FLASH_NAND > bool "FASTBOOT on NAND"
OK, this logic is odd. For a little while now at least, MMC select's BLK. So neither of these are needed. And I bet the first hunk is what causes the issue of some platform getting stuck at a prompt when configuring in CI because it enabled FASTBOOT, enables BLK, but did not enable FASTBOOT_FLASH before now. -- Tom
signature.asc
Description: PGP signature
