From: Harald Seiler <hws@denx.de>
To: u-boot@lists.denx.de
Subject: [PATCH 1/5] imx: spl: return boot mode for asked MMC device in spl_mmc_boot_mode()
Date: Thu, 23 Apr 2020 13:07:49 +0200 [thread overview]
Message-ID: <20200423110753.51231-2-hws@denx.de> (raw)
In-Reply-To: <20200423110753.51231-1-hws@denx.de>
From: Anatolij Gustschin <agust@denx.de>
Boards may extend or re-define the boot list in their board_boot_order()
function by modifying spl_boot_list. E.g. a board might boot SPL from a
slow SPI NOR flash and then load the U-Boot from an eMMC or SD-card.
Or it might use additional MMC boot device in spl_boot_list for cases
when the image in SPI NOR flash is not found, so it could fall back to
eMMC, SD-card or another boot device.
Getting the MMC boot mode in spl_mmc will fail when we are trying to
boot from an MMC device in the spl_boot_list and the original board
boot mode (as returned by spl_boot_device()) is not an MMC boot mode.
Fix it by checking the asked MMC boot device from the spl_mmc_boot_mode()
argument.
Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
arch/arm/mach-imx/spl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
index 49bb3b928da1..e5835150a06d 100644
--- a/arch/arm/mach-imx/spl.c
+++ b/arch/arm/mach-imx/spl.c
@@ -229,7 +229,7 @@ u32 spl_mmc_boot_mode(const u32 boot_device)
#ifdef CONFIG_SPL_FORCE_MMC_BOOT
switch (boot_device) {
#else
- switch (spl_boot_device()) {
+ switch (boot_device) {
#endif
/* for MMC return either RAW or FAT mode */
case BOOT_DEVICE_MMC1:
--
2.26.1
next prev parent reply other threads:[~2020-04-23 11:07 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-23 11:07 [PATCH 0/5] Fix spl_mmc_boot_mode() implementation for IMX Harald Seiler
2020-04-23 11:07 ` Harald Seiler [this message]
2020-05-02 9:08 ` [PATCH 1/5] imx: spl: return boot mode for asked MMC device in spl_mmc_boot_mode() sbabic at denx.de
2020-04-23 11:07 ` [PATCH 2/5] Revert "imx: Introduce CONFIG_SPL_FORCE_MMC_BOOT to force MMC boot on falcon mode" Harald Seiler
2020-05-02 9:08 ` sbabic at denx.de
2020-04-23 11:07 ` [PATCH 3/5] Revert "imx: defconfig: Enable CONFIG_SPL_FORCE_MMC_BOOT" Harald Seiler
2020-05-02 9:08 ` sbabic at denx.de
2020-04-23 11:07 ` [PATCH 4/5] imx: spl: Remove ifdefs in spl_mmc_boot_mode() Harald Seiler
2020-05-02 9:08 ` sbabic at denx.de
2020-04-23 11:07 ` [PATCH 5/5] imx: spl: Fix use of removed SPL_FAT_SUPPORT config Harald Seiler
2020-05-02 9:08 ` sbabic at denx.de
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200423110753.51231-2-hws@denx.de \
--to=hws@denx.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox