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 <nik...@compulab.co.il>
Reviewed-by: Tom Rini <tr...@konsulko.com>
---
Changes in V4:
- No changes.
Changes in V3:
- No changes.
Changes in V2:
- New patch.
arch/arm/cpu/armv7/sunxi/board.c | 10 +---------
common/spl/spl.c | 2 +-
common/spl/spl_mmc.c | 41 ++++++++++++++++++++++++++++++++--------
include/spl.h | 2 +-
4 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/arch/arm/cpu/armv7/sunxi/board.c b/arch/arm/cpu/armv7/sunxi/board.c
index 9b5c46b..794b829 100644
--- a/arch/arm/cpu/armv7/sunxi/board.c
+++ b/arch/arm/cpu/armv7/sunxi/board.c
@@ -173,16 +173,8 @@ u32 spl_boot_device(void)
#ifdef CONFIG_MMC
if (CONFIG_MMC_SUNXI_SLOT_EXTRA == 2) {
mmc1 = find_mmc_device(1);
- 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;
+ if (sunxi_mmc_has_egon_boot_signature(mmc1))
return BOOT_DEVICE_MMC2;
- }
}
#endif
diff --git a/common/spl/spl.c b/common/spl/spl.c
index b522c8b..7a393dc 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -284,7 +284,7 @@ static int spl_load_image(u32 boot_device)
case BOOT_DEVICE_MMC1:
case BOOT_DEVICE_MMC2:
case BOOT_DEVICE_MMC2_2:
- return spl_mmc_load_image();
+ return spl_mmc_load_image(boot_device);
#endif
#ifdef CONFIG_SPL_NAND_SUPPORT
case BOOT_DEVICE_NAND:
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index b68190a..b3c2c64 100644
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -61,11 +61,32 @@ end:
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
-static int spl_mmc_find_device(struct mmc **mmc)
+static int spl_mmc_find_device(struct mmc **mmc, u32 boot_device)
{
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);
if (err) {
@@ -75,7 +96,7 @@ static int spl_mmc_find_device(struct mmc **mmc)
return err;
}
- err = uclass_get_device(UCLASS_MMC, 0, &dev);
+ err = uclass_get_device(UCLASS_MMC, mmc_dev, &dev);
if (err) {
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
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;
}
#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);
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 */
- *mmc = find_mmc_device(0);
+ *mmc = find_mmc_device(mmc_dev);
if (!*mmc) {
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
puts("spl: mmc device not found\n");
@@ -221,14 +246,14 @@ int spl_mmc_do_fs_boot(struct mmc *mmc)
}
#endif
-int spl_mmc_load_image(void)
+int spl_mmc_load_image(u32 boot_device)
{
struct mmc *mmc;
u32 boot_mode;
int err = 0;
__maybe_unused int part;
- err = spl_mmc_find_device(&mmc);
+ err = spl_mmc_find_device(&mmc, boot_device);
if (err)
return err;
diff --git a/include/spl.h b/include/spl.h
index 46fc454..92cdc04 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -54,7 +54,7 @@ int spl_onenand_load_image(void);
int spl_nor_load_image(void);
/* MMC SPL functions */
-int spl_mmc_load_image(void);
+int spl_mmc_load_image(u32 boot_device);
/* YMODEM SPL functions */
int spl_ymodem_load_image(void);
--
1.9.1
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
