mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-23 13:10:26 +09:00
spl: mmc: Rename spl_boot_mode() to spl_mmc_boot_mode()
The function's name is misleading as one might think it is used generally to select the boot-mode when in reality it is only used by the MMC driver to find out in what way it should try reading U-Boot Proper from a device (either using a filesystem, a raw sector/partition, or an eMMC boot partition). Rename it to spl_mmc_boot_mode() to make it more obvious what this function is about. Link: https://lists.denx.de/pipermail/u-boot/2020-April/405979.html Signed-off-by: Harald Seiler <hws@denx.de> Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
4a66d4ee33
commit
e97590654a
@ -189,7 +189,7 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
|
||||
|
||||
#if defined(CONFIG_SPL_MMC_SUPPORT)
|
||||
/* called from spl_mmc to see type of boot mode for storage (RAW or FAT) */
|
||||
u32 spl_boot_mode(const u32 boot_device)
|
||||
u32 spl_mmc_boot_mode(const u32 boot_device)
|
||||
{
|
||||
#if defined(CONFIG_MX7) || defined(CONFIG_IMX8M) || defined(CONFIG_IMX8)
|
||||
switch (get_boot_device()) {
|
||||
|
@ -199,7 +199,7 @@ void board_init_f(ulong dummy)
|
||||
#endif
|
||||
}
|
||||
|
||||
u32 spl_boot_mode(const u32 boot_device)
|
||||
u32 spl_mmc_boot_mode(const u32 boot_device)
|
||||
{
|
||||
#if defined(CONFIG_SUPPORT_EMMC_BOOT)
|
||||
u32 devstat = readl(CTRLMMR_MAIN_DEVSTAT);
|
||||
|
@ -223,7 +223,7 @@ void board_init_f(ulong dummy)
|
||||
#endif
|
||||
}
|
||||
|
||||
u32 spl_boot_mode(const u32 boot_device)
|
||||
u32 spl_mmc_boot_mode(const u32 boot_device)
|
||||
{
|
||||
switch (boot_device) {
|
||||
case BOOT_DEVICE_MMC1:
|
||||
|
@ -187,7 +187,7 @@ u32 spl_boot_device(void)
|
||||
return gd->arch.omap_boot_device;
|
||||
}
|
||||
|
||||
u32 spl_boot_mode(const u32 boot_device)
|
||||
u32 spl_mmc_boot_mode(const u32 boot_device)
|
||||
{
|
||||
return gd->arch.omap_boot_mode;
|
||||
}
|
||||
|
@ -58,7 +58,7 @@ u32 spl_boot_device(void)
|
||||
return boot_device;
|
||||
}
|
||||
|
||||
u32 spl_boot_mode(const u32 boot_device)
|
||||
u32 spl_mmc_boot_mode(const u32 boot_device)
|
||||
{
|
||||
return MMCSD_MODE_RAW;
|
||||
}
|
||||
|
@ -92,7 +92,7 @@ u32 spl_boot_device(void)
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SPL_MMC_SUPPORT
|
||||
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;
|
||||
|
@ -28,7 +28,7 @@ u32 spl_boot_device(void)
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SPL_MMC_SUPPORT
|
||||
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;
|
||||
|
@ -49,7 +49,7 @@ u32 spl_boot_device(void)
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SPL_MMC_SUPPORT
|
||||
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;
|
||||
|
@ -30,7 +30,7 @@ u32 spl_boot_device(void)
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SPL_MMC_SUPPORT
|
||||
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;
|
||||
|
@ -44,7 +44,7 @@ u32 spl_boot_device(void)
|
||||
return BOOT_DEVICE_MMC1;
|
||||
}
|
||||
|
||||
u32 spl_boot_mode(const u32 boot_device)
|
||||
u32 spl_mmc_boot_mode(const u32 boot_device)
|
||||
{
|
||||
return MMCSD_MODE_RAW;
|
||||
}
|
||||
|
@ -8,7 +8,7 @@
|
||||
#include <mmc.h>
|
||||
#include <spl.h>
|
||||
|
||||
u32 spl_boot_mode(const u32 boot_device)
|
||||
u32 spl_mmc_boot_mode(const u32 boot_device)
|
||||
{
|
||||
struct mmc *mmc;
|
||||
|
||||
|
@ -298,7 +298,7 @@ static int spl_mmc_do_fs_boot(struct spl_image_info *spl_image, struct mmc *mmc,
|
||||
}
|
||||
#endif
|
||||
|
||||
u32 __weak spl_boot_mode(const u32 boot_device)
|
||||
u32 __weak spl_mmc_boot_mode(const u32 boot_device)
|
||||
{
|
||||
#if defined(CONFIG_SPL_FS_FAT) || defined(CONFIG_SPL_FS_EXT4)
|
||||
return MMCSD_MODE_FS;
|
||||
@ -350,7 +350,7 @@ int spl_mmc_load(struct spl_image_info *spl_image,
|
||||
}
|
||||
}
|
||||
|
||||
boot_mode = spl_boot_mode(bootdev->boot_device);
|
||||
boot_mode = spl_mmc_boot_mode(bootdev->boot_device);
|
||||
err = -EINVAL;
|
||||
switch (boot_mode) {
|
||||
case MMCSD_MODE_EMMCBOOT:
|
||||
|
@ -238,7 +238,23 @@ int spl_load_imx_container(struct spl_image_info *spl_image,
|
||||
/* SPL common functions */
|
||||
void preloader_console_init(void);
|
||||
u32 spl_boot_device(void);
|
||||
u32 spl_boot_mode(const u32 boot_device);
|
||||
|
||||
/**
|
||||
* spl_mmc_boot_mode() - Lookup function for the mode of an MMC boot source.
|
||||
* @boot_device: ID of the device which the MMC driver wants to read
|
||||
* from. Common values are e.g. BOOT_DEVICE_MMC1,
|
||||
* BOOT_DEVICE_MMC2, BOOT_DEVICE_MMC2_2.
|
||||
*
|
||||
* This function should return one of MMCSD_MODE_FS, MMCSD_MODE_EMMCBOOT, or
|
||||
* MMCSD_MODE_RAW for each MMC boot source which is defined for the target. The
|
||||
* boot_device parameter tells which device the MMC driver is interested in.
|
||||
*
|
||||
* If not overridden, it is weakly defined in common/spl/spl_mmc.c.
|
||||
*
|
||||
* Note: It is important to use the boot_device parameter instead of e.g.
|
||||
* 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);
|
||||
void spl_set_bd(void);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user