Skip to contentSkip to conversation

spl: imx: Use correct boot-device in spl_boot_mode

PATCH New Harald Seiler 1 participant 1 message Nov 7, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 spl: imx: Use correct boot-device in spl_boot_mode

If a board defines a custom boot order using board_boot_order(), the boot-device which is currently attempted might differ from the return value of spl_boot_device(). Use the given boot_device parameter instead of calling spl_boot_device() to prevent an incorrect "unsupported device" error.

Supporting this use-case was the original intention for the boot_device parameter, which was introduced in commit 2b1cdafa9fdd ("common: Pass the boot device into spl_boot_mode()").

Fixes 2b1cdafa9fdd ("common: Pass the boot device into spl_boot_mode()")

---

Changes for v2:
- Rebase ontop of master to fix a merge-conflict (no functional change)

 arch/arm/mach-imx/spl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-imx/spl.c +1 -1
index 5cc74b6f9b0f..26d07d1bf283 100644
@@ -190,7 +190,7 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
 u32 spl_boot_mode(const u32 boot_device)
 {
 #if defined(CONFIG_MX7) || defined(CONFIG_IMX8M) || defined(CONFIG_IMX8)
-	switch (get_boot_device()) {
+	switch (boot_device) {
 	/* for MMC return either RAW or FAT mode */
 	case SD1_BOOT:
 	case SD2_BOOT:
Signature · 1 line
2.20.1