GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-04-05 14:01:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

spl: mmc: add support for BOOT_DEVICE_MMC2

Browse source 
Currently the mmc device that SPL looks at is always mmc0, regardless
of the BOOT_DEVICE_MMCx value. This forces some boards to
implement hacks in order to boot from other mmc devices.

Make SPL take into account the correct mmc device.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Nikita Kiryanov 2015-11-08 17:11:54 +02:00 • committed by Tom Rini
parent 7b9e980e87
commit a1e56cf6d4
4 changed files with 36 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/arm/cpu/armv7/sunxi/board.c
View file

@ -173,16 +173,8 @@ u32 spl_boot_device(void)
#ifdef CONFIG_MMC #ifdef CONFIG_MMC
if (CONFIG_MMC_SUNXI_SLOT_EXTRA == 2) { if (CONFIG_MMC_SUNXI_SLOT_EXTRA == 2) {
mmc1 = find_mmc_device(1); mmc1 = find_mmc_device(1);
if (sunxi_mmc_has_egon_boot_signature(mmc1)) { if (sunxi_mmc_has_egon_boot_signature(mmc1))
/*
* spl_mmc.c: spl_mmc_load_image() is hard-coded to
* use find_mmc_device(0), no matter what we
* return. Swap mmc0 and mmc2 to make this work.
*/
mmc0->block_dev.dev = 1;
mmc1->block_dev.dev = 0;
return BOOT_DEVICE_MMC2; return BOOT_DEVICE_MMC2;
}
} }
#endif #endif

2
common/spl/spl.c
View file

@ -284,7 +284,7 @@ static int spl_load_image(u32 boot_device)
case BOOT_DEVICE_MMC1: case BOOT_DEVICE_MMC1:
case BOOT_DEVICE_MMC2: case BOOT_DEVICE_MMC2:
case BOOT_DEVICE_MMC2_2: case BOOT_DEVICE_MMC2_2:
return spl_mmc_load_image(); return spl_mmc_load_image(boot_device);
#endif #endif
#ifdef CONFIG_SPL_NAND_SUPPORT #ifdef CONFIG_SPL_NAND_SUPPORT
case BOOT_DEVICE_NAND: case BOOT_DEVICE_NAND:

41
common/spl/spl_mmc.c
View file

@ -61,11 +61,32 @@ end:
return 0; return 0;
} }
int spl_mmc_get_device_index(u32 boot_device)
{
switch (boot_device) {
case BOOT_DEVICE_MMC1:
return 0;
case BOOT_DEVICE_MMC2:
case BOOT_DEVICE_MMC2_2:
return 1;
}
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
printf("spl: unsupported mmc boot device.\n");
#endif
return -ENODEV;
}
#ifdef CONFIG_DM_MMC #ifdef CONFIG_DM_MMC
static int spl_mmc_find_device(struct mmc **mmc) static int spl_mmc_find_device(struct mmc **mmc, u32 boot_device)
{ {
struct udevice *dev; struct udevice *dev;
int err; int err, mmc_dev;
mmc_dev = spl_mmc_get_device_index(boot_device);
if (mmc_dev < 0)
return mmc_dev;
err = mmc_initialize(NULL); err = mmc_initialize(NULL);
if (err) { if (err) {
@ -75,7 +96,7 @@ static int spl_mmc_find_device(struct mmc **mmc)
return err; return err;
} }
err = uclass_get_device(UCLASS_MMC, 0, &dev); err = uclass_get_device(UCLASS_MMC, mmc_dev, &dev);
if (err) { if (err) {
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
printf("spl: could not find mmc device. error: %d\n", err); printf("spl: could not find mmc device. error: %d\n", err);
@ -88,9 +109,13 @@ static int spl_mmc_find_device(struct mmc **mmc)
return *mmc != NULL ? 0 : -ENODEV; return *mmc != NULL ? 0 : -ENODEV;
} }
#else #else
static int spl_mmc_find_device(struct mmc **mmc) static int spl_mmc_find_device(struct mmc **mmc, u32 boot_device)
{ {
int err; int err, mmc_dev;
mmc_dev = spl_mmc_get_device_index(boot_device);
if (mmc_dev < 0)
return mmc_dev;
err = mmc_initialize(gd->bd); err = mmc_initialize(gd->bd);
if (err) { if (err) {
@ -101,7 +126,7 @@ static int spl_mmc_find_device(struct mmc **mmc)
} }
/* We register only one device. So, the dev id is always 0 */ /* We register only one device. So, the dev id is always 0 */
*mmc = find_mmc_device(0); *mmc = find_mmc_device(mmc_dev);
if (!*mmc) { if (!*mmc) {
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
puts("spl: mmc device not found\n"); puts("spl: mmc device not found\n");
@ -221,14 +246,14 @@ int spl_mmc_do_fs_boot(struct mmc *mmc)
} }
#endif #endif
int spl_mmc_load_image(void) int spl_mmc_load_image(u32 boot_device)
{ {
struct mmc *mmc; struct mmc *mmc;
u32 boot_mode; u32 boot_mode;
int err = 0; int err = 0;
__maybe_unused int part; __maybe_unused int part;
err = spl_mmc_find_device(&mmc); err = spl_mmc_find_device(&mmc, boot_device);
if (err) if (err)
return err; return err;

2
include/spl.h
View file

@ -54,7 +54,7 @@ int spl_onenand_load_image(void);
int spl_nor_load_image(void); int spl_nor_load_image(void);
/* MMC SPL functions */ /* MMC SPL functions */
int spl_mmc_load_image(void); int spl_mmc_load_image(u32 boot_device);
/* YMODEM SPL functions */ /* YMODEM SPL functions */
int spl_ymodem_load_image(void); int spl_ymodem_load_image(void);