mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-03-28 01:01:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

spl: mmc: support squashfs

Browse Source 
spl_mmc_do_fs_boot supports now loading an image from squashfs.

Also, convert #if defined(CONFIG_SPL_xx) to if (CONFIG_IS_ENABLED(xx))

Signed-off-by: Richard Genoud <richard.genoud@bootlin.com>
Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: João Marcos Costa <joaomarcos.costa@bootlin.com>
This commit is contained in:
Richard Genoud 2026-03-13 11:42:27 +01:00 committed by Tom Rini
parent 6494e823b4
commit fb0df35528
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/spl/spl_mmc.c
View File

@ -226,6 +226,11 @@ static int __maybe_unused spl_mmc_fs_load(struct spl_image_info *spl_image,
if (!err)
return 0;
}
if (CONFIG_IS_ENABLED(FS_SQUASHFS)) {
err = spl_load_image_sqfs(spl_image, bootdev, blk_dev, part, file);
if (!err)
return 0;
}
return err;
}
@ -284,13 +289,15 @@ static int spl_mmc_do_fs_boot(struct spl_image_info *spl_image,
u32 __weak spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device)
{
#if defined(CONFIG_SPL_FS_FAT) || defined(CONFIG_SPL_FS_EXT4)
return MMCSD_MODE_FS;
#elif defined(CONFIG_SUPPORT_EMMC_BOOT)
return MMCSD_MODE_EMMCBOOT;
#else
if (CONFIG_IS_ENABLED(FS_FAT) ||
CONFIG_IS_ENABLED(FS_EXT4) ||
CONFIG_IS_ENABLED(FS_SQUASHFS))
return MMCSD_MODE_FS;
if (IS_ENABLED(CONFIG_SUPPORT_EMMC_BOOT))
return MMCSD_MODE_EMMCBOOT;
return MMCSD_MODE_RAW;
#endif
}
#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION