From: alaganraj <alaganraj.s@ti.com>
Date: Tue, 6 Aug 2013 15:18:07 +0000 (+0530)
Subject: arm: omap5: dra7xx: Rework bootcmd to handle two MMC devs
X-Git-Tag: ti2013.04.02.prod.13.08.001
X-Git-Url: https://git.ti.com/gitweb?p=glsdk%2Fglsdk-u-boot.git;a=commitdiff_plain;h=748fe28ee979d4752005541a51f5a4b4324b46ba;hp=f0f89609ff5e9f923dc53fc96c0625b0e70984c0;ds=sidebyside

arm: omap5: dra7xx: Rework bootcmd to handle two MMC devs

omap5_uevm and dra7xx_evm both can boot from either the MMC card
or eMMC chip on board. We should try both interfaces.

This modification also allows a graceful fallback if
a device exists but boot images are not present on it.

This is adopted from am335x_evm patch.

Signed-off-by: alaganraj <alaganraj.s@ti.com>
---

diff --git a/include/configs/omap5_common.h b/include/configs/omap5_common.h
index f2c4c7032..323649e38 100644
--- a/include/configs/omap5_common.h
+++ b/include/configs/omap5_common.h
@@ -164,9 +164,26 @@
 	"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
 		"env import -t ${loadaddr} ${filesize}\0" \
 	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
-	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
-		"run mmcargs; " \
-		"bootz ${loadaddr} - ${fdtaddr}\0" \
+	"mmcboot=mmc dev ${mmcdev}; " \
+		"if mmc rescan; then " \
+			"echo SD/MMC found on device ${mmcdev};" \
+			"if run loadbootscript; then " \
+				"run bootscript; " \
+			"else " \
+				"if run loadbootenv; then " \
+					"run importbootenv; " \
+				"fi;" \
+				"if test -n ${uenvcmd}; then " \
+					"echo Running uenvcmd ...;" \
+					"run uenvcmd;" \
+				"fi;" \
+			"fi;" \
+			"if run loadimage; then " \
+				"run loadfdt; " \
+				"run mmcargs; " \
+				"bootz ${loadaddr} - ${fdtaddr};" \
+			"fi; " \
+		"fi;\0" \
 	"findfdt="\
 		"if test $board_name = omap5_uevm; then " \
 			"setenv fdtfile omap5-uevm.dtb; fi;\0 " \
@@ -174,23 +191,10 @@
 
 #define CONFIG_BOOTCOMMAND \
 	"run findfdt; " \
-	"mmc dev ${mmcdev}; if mmc rescan; then " \
-		"if run loadbootscript; then " \
-			"run bootscript; " \
-		"else " \
-			"if run loadbootenv; then " \
-				"run importbootenv; " \
-			"fi;" \
-			"if test -n ${uenvcmd}; then " \
-				"echo Running uenvcmd ...;" \
-				"run uenvcmd;" \
-			"fi;" \
-		"fi;" \
-		"if run loadimage; then " \
-			"run loadfdt; " \
-			"run mmcboot; " \
-		"fi; " \
-	"fi"
+	"run mmcboot;" \
+	"setenv mmcdev 1; " \
+	"setenv bootpart 1:2; " \
+	"run mmcboot;" \
 
 #define CONFIG_AUTO_COMPLETE		1