spl: mmc: Rename spl_boot_partition() to spl_mmc_boot_partition()

This function is only relevant to the MMC driver so calling it
spl_boot_partition() might be confusing.  Rename it to
spl_mmc_boot_partition() to make its purpose more clear (and bring
it in line with spl_mmc_boot_mode()).

Signed-off-by: Harald Seiler <hws@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/mach-stm32mp/spl.c b/arch/arm/mach-stm32mp/spl.c
index 55ff97de27941305d1880f37c5f9eff9557b26fd..f85391c6af2f93b6185063efb64bf55e74f82ae1 100644 (file)
--- a/arch/arm/mach-stm32mp/spl.c
+++ b/arch/arm/mach-stm32mp/spl.c
@@ -49,7 +49,7 @@ u32 spl_mmc_boot_mode(const u32 boot_device)
        return MMCSD_MODE_RAW;
 }
 
-int spl_boot_partition(const u32 boot_device)
+int spl_mmc_boot_partition(const u32 boot_device)
 {
        switch (boot_device) {
        case BOOT_DEVICE_MMC1:

diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index fb8ad5d5400618eaf12c2db2a29524f71c54e272..a68cdec8dc8f5e15c0751555f9328df76125799a 100644 (file)
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -310,8 +310,7 @@ u32 __weak spl_mmc_boot_mode(const u32 boot_device)
 }
 
 #ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
-__weak
-int spl_boot_partition(const u32 boot_device)
+int __weak spl_mmc_boot_partition(const u32 boot_device)
 {
        return CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION;
 }
@@ -431,7 +430,7 @@ int spl_mmc_load_image(struct spl_image_info *spl_image,
                            NULL,
 #endif
 #ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION
-                           spl_boot_partition(bootdev->boot_device),
+                           spl_mmc_boot_partition(bootdev->boot_device),
 #else
                            0,
 #endif

diff --git a/include/spl.h b/include/spl.h
index fffcc610bb2b1c655c626b8391408d87585d00c7..8b15cd4914ce4a4c32299ebb9d6e6a61d72171cc 100644 (file)
--- a/include/spl.h
+++ b/include/spl.h
@@ -255,7 +255,19 @@ u32 spl_boot_device(void);
  * spl_boot_device() as U-Boot is not always loaded from the same device as SPL.
  */
 u32 spl_mmc_boot_mode(const u32 boot_device);
-int spl_boot_partition(const u32 boot_device);
+
+/**
+ * spl_mmc_boot_partition() - MMC partition to load U-Boot from.
+ * @boot_device:       ID of the device which the MMC driver wants to load
+ *                     U-Boot from.
+ *
+ * This function should return the partition number which the SPL
+ * should load U-Boot from (on the given boot_device) when
+ * CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION is set.
+ *
+ * If not overridden, it is weakly defined in common/spl/spl_mmc.c.
+ */
+int spl_mmc_boot_partition(const u32 boot_device);
 void spl_set_bd(void);
 
 /**