| Message ID | 20230824031101.3460411-14-nm@ti.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | board: ti: Add support for BeaglePlay | expand |
On mer., août 23, 2023 at 22:10, Nishanth Menon <nm@ti.com> wrote: > While boot partition support with EMMC boot is useful, it is > constrained by the size of boot hardware partition itself. > > In the case of K3 devices, tispl images can contain OP-TEE images that > can substantially vary in size and the u-boot image itself can vary over > time as we enable various features. > > So use the CSD information in the case of EMMC_BOOT configuration being > enabled to pick boot partition or UDA FS mode operation to pick. > > If EMMC_BOOT is disabled, then depend on filesystem configuration to > pick data from UDA. > > While at this, drop the extraneous whitespace. > > Signed-off-by: Nishanth Menon <nm@ti.com> Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> > --- > Changes since V4: > - Did'nt pickup Mattijs' reviewed-by - no more iffdeffery - so might be > good to relook. > > V4: https://lore.kernel.org/r/20230822184135.2328409-4-nm@ti.com > > arch/arm/mach-k3/am625_init.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/mach-k3/am625_init.c b/arch/arm/mach-k3/am625_init.c > index 499cb57267b9..8fa36f7b913e 100644 > --- a/arch/arm/mach-k3/am625_init.c > +++ b/arch/arm/mach-k3/am625_init.c > @@ -220,9 +220,15 @@ u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device) > u32 bootmode_cfg = (devstat & MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_MASK) >> > MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_SHIFT; > > - > switch (bootmode) { > case BOOT_DEVICE_EMMC: > + if (IS_ENABLED(CONFIG_SUPPORT_EMMC_BOOT)) { > + if (spl_mmc_emmc_boot_partition(mmc)) > + return MMCSD_MODE_EMMCBOOT; > + return MMCSD_MODE_FS; > + } > + 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) > -- > 2.40.0
diff --git a/arch/arm/mach-k3/am625_init.c b/arch/arm/mach-k3/am625_init.c index 499cb57267b9..8fa36f7b913e 100644 --- a/arch/arm/mach-k3/am625_init.c +++ b/arch/arm/mach-k3/am625_init.c @@ -220,9 +220,15 @@ u32 spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device) u32 bootmode_cfg = (devstat & MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_MASK) >> MAIN_DEVSTAT_PRIMARY_BOOTMODE_CFG_SHIFT; - switch (bootmode) { case BOOT_DEVICE_EMMC: + if (IS_ENABLED(CONFIG_SUPPORT_EMMC_BOOT)) { + if (spl_mmc_emmc_boot_partition(mmc)) + return MMCSD_MODE_EMMCBOOT; + return MMCSD_MODE_FS; + } + 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)
While boot partition support with EMMC boot is useful, it is constrained by the size of boot hardware partition itself. In the case of K3 devices, tispl images can contain OP-TEE images that can substantially vary in size and the u-boot image itself can vary over time as we enable various features. So use the CSD information in the case of EMMC_BOOT configuration being enabled to pick boot partition or UDA FS mode operation to pick. If EMMC_BOOT is disabled, then depend on filesystem configuration to pick data from UDA. While at this, drop the extraneous whitespace. Signed-off-by: Nishanth Menon <nm@ti.com> --- Changes since V4: - Did'nt pickup Mattijs' reviewed-by - no more iffdeffery - so might be good to relook. V4: https://lore.kernel.org/r/20230822184135.2328409-4-nm@ti.com arch/arm/mach-k3/am625_init.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)