[PATCH] arm: mach-k3: am625: Relax emmc boot condition

[PATCH] arm: mach-k3: am625: Relax emmc boot condition

[Michael Trimarchi]

spl_mmc_emmc_boot_partition return a number different from 0
if the partition is a boot one. We can have the uboot img
for instance in a raw offset in emmc partition 0 so we would
like to continue to load the next stage. If the user want
to use EMMC as boot device allow him to use any part of the
emmc and not only boot partition

Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
---
 arch/arm/mach-k3/am625_init.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-k3/am625_init.c b/arch/arm/mach-k3/am625_init.c
index 8fa36f7b91..cb4c3a05b5 100644
--- a/arch/arm/mach-k3/am625_init.c
+++ b/arch/arm/mach-k3/am625_init.c
@@ -222,11 +222,8 @@ 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)) {
-			if (spl_mmc_emmc_boot_partition(mmc))
-				return MMCSD_MODE_EMMCBOOT;
-			return MMCSD_MODE_FS;
-		}
+		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;
-- 
2.40.1

Re: [PATCH] arm: mach-k3: am625: Relax emmc boot condition

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 537 bytes --]

On Fri, Dec 08, 2023 at 08:53:05AM +0100, Michael Trimarchi wrote:

> spl_mmc_emmc_boot_partition return a number different from 0
> if the partition is a boot one. We can have the uboot img
> for instance in a raw offset in emmc partition 0 so we would
> like to continue to load the next stage. If the user want
> to use EMMC as boot device allow him to use any part of the
> emmc and not only boot partition
> 
> Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>

Applied to u-boot/next, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]