From: H. Nikolaus Schaller <hns@goldelico.com>
Date: Wed, 20 Jan 2016 11:01:57 +0000 (+0100)
Subject: Fix bootcmd and some initialization in ti_omap5_common so that we don't need a boot... 
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60b6ad53df3920e44e0bbf1f5e590e0ab04472bc;p=pandora-u-boot.git

Fix bootcmd and some initialization in ti_omap5_common so that we don't need a boot.scr any more

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---

diff --git a/include/configs/letux_cortex15.h b/include/configs/letux_cortex15.h
index cc109e30cc4..1e7a318bc78 100644
--- a/include/configs/letux_cortex15.h
+++ b/include/configs/letux_cortex15.h
@@ -22,34 +22,6 @@
 #undef CONFIG_SYS_I2C_TCA642X_BUS_NUM
 #undef CONFIG_SYS_I2C_TCA642X_ADDR
 
-#undef CONFIG_BOOTCOMMAND
-#define CONFIG_BOOTCOMMAND \
-	"echo bootcmd for LC15;" \
-	"setenv mmcdev 0; " \
-	"if test ${dofastboot} -eq 1; then " \
-		"echo Boot fastboot requested, resetting dofastboot ...;" \
-		"setenv dofastboot 0; saveenv;" \
-		"echo Booting into fastboot ...; fastboot;" \
-	"fi;" \
-	"if run loadbootscript; then " \
-		"run bootscript;" \
-	"else;" \
-		"echo trying mmc0;" \
-		"setenv mmcdev 0; " \
-		"setenv bootpart 0:1; " \
-		"setenv mmcroot /dev/mmcblk0p2 rw; " \
-		"run findfdt; " \
-		"run mmcboot;" \
-		"echo trying mmc1;" \
-		"setenv mmcdev 1; " \
-		"setenv bootpart 1:1; " \
-		"setenv mmcroot /dev/mmcblk1p2 rw; " \
-		"run mmcboot;" \
-	"fi;" \
-	""
-
-#endif
-
 #if 0	/* for the moment, disable to store environment in eMMC */
 #undef CONFIG_ENV_IS_IN_MMC
 #undef CONFIG_SYS_MMC_ENV_DEV
diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
index 3589cdc3a88..330208884fa 100644
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -76,6 +76,7 @@
 	"bootpart=0:2\0" \
 	"bootdir=/boot\0" \
 	"bootfile=zImage\0" \
+	"bootfilecmd=bootz\0" \
 	"usbtty=cdc_acm\0" \
 	"vram=16M\0" \
 	"partitions=" PARTS_DEFAULT "\0" \
@@ -92,7 +93,7 @@
 				"run loadfdt; " \
 				"echo Booting from mmc${mmcdev} ...; " \
 				"run args_mmc; " \
-				"bootz ${loadaddr} - ${fdtaddr}; " \
+				"${bootfilecmd} ${loadaddr} - ${fdtaddr}; " \
 			"fi;" \
 		"fi;\0" \
 	"findfdt="\
@@ -117,17 +118,19 @@
 	NETARGS \
 
 #define CONFIG_BOOTCOMMAND \
+	"echo Letux OMAP5 bootcmd;" \
 	"if test ${dofastboot} -eq 1; then " \
 		"echo Boot fastboot requested, resetting dofastboot ...;" \
 		"setenv dofastboot 0; saveenv;" \
 		"echo Booting into fastboot ...; fastboot 0;" \
 	"fi;" \
 	"run findfdt; " \
+	"setenv mmcdev 0; " \
+	"setenv bootpart 0:2; " \
 	"run envboot; " \
 	"run mmcboot;" \
 	"setenv mmcdev 1; " \
 	"setenv bootpart 1:2; " \
-	"setenv mmcroot /dev/mmcblk0p2 rw; " \
 	"run mmcboot;" \
 	""
 #endif