LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Harald Seiler 2020-04-15 11:33:31 +02:00 committed by Peng Fan
parent e97590654a
commit c51b751893
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-stm32mp/spl.c
View File

@ -49,7 +49,7 @@ u32 spl_mmc_boot_mode(const u32 boot_device)
return MMCSD_MODE_RAW; return MMCSD_MODE_RAW;
} }
int spl_boot_partition(const u32 boot_device) int spl_mmc_boot_partition(const u32 boot_device)
{ {
switch (boot_device) { switch (boot_device) {
case BOOT_DEVICE_MMC1: case BOOT_DEVICE_MMC1:

5
common/spl/spl_mmc.c
View File

@ -310,8 +310,7 @@ u32 __weak spl_mmc_boot_mode(const u32 boot_device)
} }
#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION #ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
__weak int __weak spl_mmc_boot_partition(const u32 boot_device)
int spl_boot_partition(const u32 boot_device)
{ {
return CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION; 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, NULL,
#endif #endif
#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION #ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION
spl_boot_partition(bootdev->boot_device), spl_mmc_boot_partition(bootdev->boot_device),
#else #else
0, 0,
#endif #endif

14
include/spl.h
View File

@ -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. * 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); 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); void spl_set_bd(void);
/** /**