From: Vagrant Cascadian <vagrant@debian.org>
Date: Mon, 12 Sep 2016 19:43:29 +0000 (+0000)
Subject: udoo_quad-support
X-Git-Tag: archive/raspbian/2016.11+dfsg1-3+rpi1^2^2^2^2~12
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c4036acaf3df633e6fe133b9fe74a65e3a39f375;p=u-boot.git

udoo_quad-support


Gbp-Pq: Topic udoo
Gbp-Pq: Name udoo_quad-support.patch
---

diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index fba78d01c..3a3054f8b 100644
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -92,11 +92,15 @@
 		"fi\0" \
 	"mmcargs=setenv bootargs console=${console},${baudrate} " \
 		"root=${mmcroot}\0" \
+	"loadbootenv=load mmc ${mmcdev}:${mmcpart} ${loadaddr} uEnv.txt\0" \
+	"importbootenv=echo Importing environment from mmc (uEnv.txt)...; " \
+		"env import -t $loadaddr $filesize\0" \
 	"loadbootscript=" \
 		"load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
 	"bootscript=echo Running bootscript from mmc ...; " \
 		"source\0" \
 	"loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
+	"loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} zImage\0" \
 	"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
 	"mmcboot=echo Booting from mmc ...; " \
 		"run mmcargs; " \
@@ -146,17 +150,33 @@
 				"echo WARNING: Could not determine dtb to use; fi; \0"
 
 #define CONFIG_BOOTCOMMAND \
-	   "run findfdt; " \
-	   "mmc dev ${mmcdev}; if mmc rescan; then " \
-		   "if run loadbootscript; then " \
-			   "run bootscript; " \
-		   "else " \
-			   "if run loadimage; then " \
-				   "run mmcboot; " \
-			   "else run netboot; " \
-			   "fi; " \
-		   "fi; " \
-	   "else run netboot; fi"
+	"run findfdt; " \
+	"mmc dev ${mmcdev};" \
+	"if mmc rescan; then " \
+		"echo SD/MMC found on device ${mmcdev};" \
+		"if run loadbootenv; then " \
+			"run importbootenv;" \
+		"fi;" \
+		"echo Checking if uenvcmd is set ...;" \
+		"if test -n $uenvcmd; then " \
+			"echo Running uenvcmd ...;" \
+			"run uenvcmd;" \
+		"fi;" \
+		"if run loadbootscript; then " \
+			"echo Running boot script ${script} ...;" \
+			"run bootscript; " \
+		"fi;" \
+		"setenv script /boot/${script};" \
+		"if run loadbootscript; then " \
+			"echo Running boot script ${script} ...;" \
+			"run bootscript; " \
+		"fi;" \
+		"echo Running default loadzimage ...;" \
+		"if run loadzimage; then " \
+			"run loadfdt;" \
+			"run mmcboot;" \
+		"fi;" \
+	"fi;"
 
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)