omap5_common: Re-work mmc boot to try SD and eMMC, correct root device

OMAP5 boards may have both eMMC (on MMC2) and an SD slot (on MMC1). We Update the default bootcmd to match what happens on AM335x where we try SD first, and then eMMC. In this case however, the hardware layout used for powering both of these means that in the kernel eMMC shall be found first as it is powered by a fixed regulator and SD found second as SD is powered via the palmas which will result in deferred probing. Tested-by: Aparna Balasubramanian <aparnab@ti.com> Signed-off-by: Tom Rini <trini@ti.com>

omap5_common: Re-work mmc boot to try SD and eMMC, correct root device
OMAP5 boards may have both eMMC (on MMC2) and an SD slot (on MMC1). We Update the default bootcmd to match what happens on AM335x where we try SD first, and then eMMC. In this case however, the hardware layout used for powering both of these means that in the kernel eMMC shall be found first as it is powered by a fixed regulator and SD found second as SD is powered via the palmas which will result in deferred probing. Tested-by: Aparna Balasubramanian <aparnab@ti.com> Signed-off-by: Tom Rini <trini@ti.com>
Tom Rini
1 parent d3379e2254
Showing 1 changed file with 24 additions and 21 deletions Side-by-side Diff
include/configs/omap5_common.h
@@ -83,7 +83,7 @@
 	"partitions=" PARTS_DEFAULT "\0" \
 	"optargs=\0" \
 	"mmcdev=0\0" \
-	"mmcroot=/dev/mmcblk0p2 rwp2 rw\0" \" \
+	"mmcroot=/dev/mmcblk1p2 rwp2 rw\0" \" \
 	"mmcrootfstype=ext4 rootwait\0" \
 	"mmcargs=setenv bootargs console=${console} " \
 		"${optargs} " \
@@ -97,9 +97,24 @@
 	"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 loadbootenv; then " \
+				"echo Loaded environment from ${bootenv};" \
+				"run importbootenv;" \
+			"fi;" \
+			"if test -n $uenvcmd; then " \
+				"echo Running uenvcmd ...;" \
+				"run uenvcmd;" \
+			"fi;" \
+			"if run loadimage; then " \
+				"run loadfdt; " \
+				"echo Booting from mmc${mmcdev} ...; " \
+				"run mmcargs; " \
+				"bootz ${loadaddr} - ${fdtaddr}; " \
+			"fi;" \
+		"fi;\0" \
 	"findfdt="\
 		"if test $board_name = omap5_uevm; then " \
 			"setenv fdtfile omap5-uevm.dtb; fi; " \
@@ -111,23 +126,11 @@
  
 #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; " \
+	"setenv mmcroot /dev/mmcblk0p2 rw; " \
+	"run mmcboot;" \
  
  
 /*
...	...	@@ -83,7 +83,7 @@
83	83	"partitions=" PARTS_DEFAULT "\0" \
84	84	"optargs=\0" \
85	85	"mmcdev=0\0" \
86		- "mmcroot=/dev/mmcblk0p2 rwp2 rw\0" \" \
	86	+ "mmcroot=/dev/mmcblk1p2 rwp2 rw\0" \" \
87	87	"mmcrootfstype=ext4 rootwait\0" \
88	88	"mmcargs=setenv bootargs console=${console} " \
89	89	"${optargs} " \
...	...	@@ -97,9 +97,24 @@
97	97	"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
98	98	"env import -t ${loadaddr} ${filesize}\0" \
99	99	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
100		- "mmcboot=echo Booting from mmc${mmcdev} ...; " \
101		- "run mmcargs; " \
102		- "bootz ${loadaddr} - ${fdtaddr}\0" \
	100	+ "mmcboot=mmc dev ${mmcdev}; " \
	101	+ "if mmc rescan; then " \
	102	+ "echo SD/MMC found on device ${mmcdev};" \
	103	+ "if run loadbootenv; then " \
	104	+ "echo Loaded environment from ${bootenv};" \
	105	+ "run importbootenv;" \
	106	+ "fi;" \
	107	+ "if test -n $uenvcmd; then " \
	108	+ "echo Running uenvcmd ...;" \
	109	+ "run uenvcmd;" \
	110	+ "fi;" \
	111	+ "if run loadimage; then " \
	112	+ "run loadfdt; " \
	113	+ "echo Booting from mmc${mmcdev} ...; " \
	114	+ "run mmcargs; " \
	115	+ "bootz ${loadaddr} - ${fdtaddr}; " \
	116	+ "fi;" \
	117	+ "fi;\0" \
103	118	"findfdt="\
104	119	"if test $board_name = omap5_uevm; then " \
105	120	"setenv fdtfile omap5-uevm.dtb; fi; " \
...	...	@@ -111,23 +126,11 @@
111	126
112	127	#define CONFIG_BOOTCOMMAND \
113	128	"run findfdt; " \
114		- "mmc dev ${mmcdev}; if mmc rescan; then " \
115		- "if run loadbootscript; then " \
116		- "run bootscript; " \
117		- "else " \
118		- "if run loadbootenv; then " \
119		- "run importbootenv; " \
120		- "fi;" \
121		- "if test -n ${uenvcmd}; then " \
122		- "echo Running uenvcmd ...;" \
123		- "run uenvcmd;" \
124		- "fi;" \
125		- "fi;" \
126		- "if run loadimage; then " \
127		- "run loadfdt; " \
128		- "run mmcboot; " \
129		- "fi; " \
130		- "fi"
	129	+ "run mmcboot;" \
	130	+ "setenv mmcdev 1; " \
	131	+ "setenv bootpart 1:2; " \
	132	+ "setenv mmcroot /dev/mmcblk0p2 rw; " \
	133	+ "run mmcboot;" \
131	134
132	135
133	136	/*