mach-k3: add eMMC FS boot support for am62[ap]
Subsystems (2)
PATCH 1/1 mach-k3: add eMMC FS boot support for am62[ap]
This makes spl_mmc_boot_mode consistent across am62x, 62a and 62p.
If MMCSD_MODE_EMMCBOOT is returned, FS boot fails since it checks for FS on the hardware partitions, not the UDA. So to allow FS boot from EMMC, the function should return MMCSD_MODE_FS instead which allows us to read from FS on the UDA.
--- arch/arm/mach-k3/am62ax/am62a7_init.c | 4 ++++ arch/arm/mach-k3/am62px/am62p5_init.c | 4 ++++ 2 files changed, 8 insertions(+)
arch/arm/mach-k3/am62ax/am62a7_init.c +4 -0
@@ -216,6 +216,10 @@ u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device)switch (bootmode) {case BOOT_DEVICE_EMMC : +if (IS_ENABLED (CONFIG_SUPPORT_EMMC_BOOT )) +return MMCSD_MODE_EMMCBOOT ; +if (IS_ENABLED (CONFIG_SPL_FS_FAT ) ||IS_ENABLED (CONFIG_SPL_FS_EXT4 )) +return MMCSD_MODE_FS ;return MMCSD_MODE_EMMCBOOT ;case BOOT_DEVICE_MMC :if (bootmode_cfg &MAIN_DEVSTAT_PRIMARY_MMC_FS_RAW_MASK )
arch/arm/mach-k3/am62px/am62p5_init.c +4 -0
@@ -262,6 +262,10 @@ u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device)switch (bootmode) {case BOOT_DEVICE_EMMC : +if (IS_ENABLED (CONFIG_SUPPORT_EMMC_BOOT )) +return MMCSD_MODE_EMMCBOOT ; +if (IS_ENABLED (CONFIG_SPL_FS_FAT ) ||IS_ENABLED (CONFIG_SPL_FS_EXT4 )) +return MMCSD_MODE_FS ;return MMCSD_MODE_EMMCBOOT ;case BOOT_DEVICE_MMC :if (bootmode_cfg &MAIN_DEVSTAT_PRIMARY_MMC_FS_RAW_MASK )
Signature · 1 line
2.49.0
Quoted 8 lines · Anshul Dalal
This makes
spl_mmc_boot_modeconsistent across am62x, 62a and 62p.If
MMCSD_MODE_EMMCBOOTis returned, FS boot fails since it checks for FS on the hardware partitions, not the UDA. So to allow FS boot from EMMC, the function should returnMMCSD_MODE_FSinstead which allows us to read from FS on the UDA.[...]
Applied to u-boot/master, thanks!
[1/1] mach-k3: add eMMC FS boot support for am62[ap]
commit: 3b7893145e3621574f01e0bfde1277ec730dc5b6
Signature · 1 line
Tom