Commit b212ad24 authored by Alex Bee's avatar Alex Bee Committed by Kever Yang
Browse files

rockchip: Fix MMC boot order



Basically all, i.e. rk3036.dtsi, rk3128.dtsi, rk3xxx.dtsi, rk322x.dtsi,
rk3288.dtsi, rk3308-u-boot.dtsi, rk3328-u-boot.dtsi, rk3399-u-boot.dtsi
and px30-u-boot.dtsi Rockchip SoC devicetrees which have mmc indexes
are defining eMMC as mmc0 and sdmmc as mmc1.
This means that the rule to try to boot from the SD card first is ignored,
which as per comment is what we want and is important for distros, which
rely on that.

Fix this by setting the correct mmc index, i.e. first from mmc1 (SD card),
second from mmc0 (eMMC).
Signed-off-by: default avatarAlex Bee <knaerzche@gmail.com>
Reviewed-by: Kever Yang's avatarKever Yang <kever.yang@rock-chips.com>
parent 3e5b62f7
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
/* First try to boot from SD (index 0), then eMMC (index 1) */ /* First try to boot from SD (index 1), then eMMC (index 0) */
#if CONFIG_IS_ENABLED(CMD_MMC) #if CONFIG_IS_ENABLED(CMD_MMC)
#define BOOT_TARGET_MMC(func) \ #define BOOT_TARGET_MMC(func) \
func(MMC, mmc, 0) \ func(MMC, mmc, 1) \
func(MMC, mmc, 1) func(MMC, mmc, 0)
#else #else
#define BOOT_TARGET_MMC(func) #define BOOT_TARGET_MMC(func)
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment