| Message ID | 20200712223303.2094457-1-dwmw2@infradead.org |
|---|---|
| State | Accepted |
| Commit | e3cc511eef5d99491e0c51324be499b688dde8de |
| Headers | show |
| Series | [1/3] board: mediatek: fix mmc_get_boot_dev() for platforms without external SD | expand |
On Sun, Jul 12, 2020 at 11:33:01PM +0100, David Woodhouse wrote: > On the UniElec U7623 board there is no external SD slot and the preloader > doesn't fill in the magic field at 0x81dffff0 to indicate that it was > booted from eMMC. > > Signed-off-by: David Woodhouse <dwmw2@infradead.org> Applied to u-boot/master, thanks! -- Tom
diff --git a/board/mediatek/mt7623/mt7623_rfb.c b/board/mediatek/mt7623/mt7623_rfb.c index 4ec2764976..984e75ccaf 100644 --- a/board/mediatek/mt7623/mt7623_rfb.c +++ b/board/mediatek/mt7623/mt7623_rfb.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <mmc.h> DECLARE_GLOBAL_DATA_PTR; @@ -15,10 +16,15 @@ int board_init(void) return 0; } +#ifdef CONFIG_MMC int mmc_get_boot_dev(void) { int g_mmc_devid = -1; char *uflag = (char *)0x81DFFFF0; + + if (!find_mmc_device(1)) + return 0; + if (strncmp(uflag,"eMMC",4)==0) { g_mmc_devid = 0; printf("Boot From Emmc(id:%d)\n\n", g_mmc_devid); @@ -33,3 +39,4 @@ int mmc_get_env_dev(void) { return mmc_get_boot_dev(); } +#endif
On the UniElec U7623 board there is no external SD slot and the preloader doesn't fill in the magic field at 0x81dffff0 to indicate that it was booted from eMMC. Signed-off-by: David Woodhouse <dwmw2 at infradead.org> --- board/mediatek/mt7623/mt7623_rfb.c | 7 +++++++ 1 file changed, 7 insertions(+)