From 71ed9fc9f3e22f5a33db2a14b8fa799c212c8468 Mon Sep 17 00:00:00 2001 From: mr-fredsky <81426871+mr-fredsky@users.noreply.github.com> Date: Fri, 5 May 2023 12:05:53 +0200 Subject: [PATCH 1/2] use spl_mmc_boot_mode instead of spl_boot_mode Per spl_mmc_boot_mode() - Lookup function for the mode of an MMC boot source: spl_boot_mode is not a valid name and is not used in u-boot. The correct name is spl_mmc_boot_mode. --- arch/arm/mach-socfpga/spl_soc64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-socfpga/spl_soc64.c b/arch/arm/mach-socfpga/spl_soc64.c index 1a31c0dd35a..f550f4f70e8 100644 --- a/arch/arm/mach-socfpga/spl_soc64.c +++ b/arch/arm/mach-socfpga/spl_soc64.c @@ -77,7 +77,7 @@ u32 spl_boot_device(void) } #if IS_ENABLED(CONFIG_SPL_MMC) -u32 spl_boot_mode(const u32 boot_device) +u32 spl_mmc_boot_mode(const u32 boot_device) { #if defined(CONFIG_SPL_FS_FAT) || defined(CONFIG_SPL_FS_EXT4) return MMCSD_MODE_FS; From 7ee2565f4d1676809a9fe354465d47d0b1fcd802 Mon Sep 17 00:00:00 2001 From: mr-fredsky <81426871+mr-fredsky@users.noreply.github.com> Date: Mon, 8 May 2023 15:35:30 +0200 Subject: [PATCH 2/2] fix: struct mmc *mmc wasn't supplied as 1st arg --- arch/arm/mach-socfpga/spl_soc64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-socfpga/spl_soc64.c b/arch/arm/mach-socfpga/spl_soc64.c index f550f4f70e8..1599338a870 100644 --- a/arch/arm/mach-socfpga/spl_soc64.c +++ b/arch/arm/mach-socfpga/spl_soc64.c @@ -77,7 +77,7 @@ u32 spl_boot_device(void) } #if IS_ENABLED(CONFIG_SPL_MMC) -u32 spl_mmc_boot_mode(const u32 boot_device) +u32 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;