[U-Boot,v2,27/53] sunxi: Use mmc_bootdev=2 for MMC2 boot

Message ID 20180810060711.6547-28-jagan@amarulasolutions.com
State Superseded
Delegated to: Jagannadha Sutradharudu Teki
Headers show
Series
  • clk: Add Allwinner CLK, RESET support
Related show

Commit Message

Jagan Teki Aug. 10, 2018, 6:06 a.m.
With DM_MMC the mmc devices are probed as per dt status
and eMMC can probed maximum device of 2, if all nodes like
mmc0, mmc1 and mmc2 status are 'okay'.

So update mmc_bootdev to 2 and add boot order as 2, 1, 0
devices. so-that it can to boot any identified device even
if the respective device status disabled or unsupported.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
 board/sunxi/board.c            | 2 +-
 include/configs/sunxi-common.h | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

Patch

diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 857d5ff010..89012daad1 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -775,7 +775,7 @@  int misc_init_r(void)
 	} else if (boot == BOOT_DEVICE_MMC1) {
 		env_set("mmc_bootdev", "0");
 	} else if (boot == BOOT_DEVICE_MMC2) {
-		env_set("mmc_bootdev", "1");
+		env_set("mmc_bootdev", "2");
 	}
 
 	setup_environment(gd->fdt_blob);
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index f1578d3754..9016c048ab 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -377,8 +377,10 @@  extern int soft_i2c_gpio_scl;
 #define BOOTENV_DEV_MMC_AUTO(devtypeu, devtypel, instance)		\
 	BOOTENV_DEV_MMC(MMC, mmc, 0)					\
 	BOOTENV_DEV_MMC(MMC, mmc, 1)					\
+	BOOTENV_DEV_MMC(MMC, mmc, 2)					\
 	"bootcmd_mmc_auto="						\
-		"if test ${mmc_bootdev} -eq 1; then "			\
+		"if test ${mmc_bootdev} -eq 2; then "			\
+			"run bootcmd_mmc2; "				\
 			"run bootcmd_mmc1; "				\
 			"run bootcmd_mmc0; "				\
 		"elif test ${mmc_bootdev} -eq 0; then "			\