e57cc1b
From aed767e84ab0b6c3b63343a374c3a63b5937580e Mon Sep 17 00:00:00 2001
e57cc1b
From: Robert Nelson <robertcnelson@gmail.com>
e57cc1b
Date: Sun, 1 Apr 2012 11:44:25 -0500
e57cc1b
Subject: [PATCH] panda: convert to uEnv.txt bootscript
e57cc1b
e57cc1b
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
e57cc1b
---
e57cc1b
 include/configs/omap4_common.h |   28 +++++++++++++++++-----------
e57cc1b
 1 files changed, 17 insertions(+), 11 deletions(-)
e57cc1b
e57cc1b
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
e57cc1b
index 21e0f60..98994c3 100644
e57cc1b
--- a/include/configs/omap4_common.h
e57cc1b
+++ b/include/configs/omap4_common.h
e57cc1b
@@ -162,23 +162,29 @@
e57cc1b
 		"vram=${vram} " \
e57cc1b
 		"root=${mmcroot} " \
e57cc1b
 		"rootfstype=${mmcrootfstype}\0" \
e57cc1b
-	"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
e57cc1b
-	"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
e57cc1b
-		"source ${loadaddr}\0" \
e57cc1b
+	"bootenv=uEnv.txt\0" \
e57cc1b
+	"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
e57cc1b
+	"importbootenv=echo Importing environment from mmc ...; " \
e57cc1b
+		"env import -t $loadaddr $filesize\0" \
e57cc1b
 	"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
e57cc1b
-	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
e57cc1b
+	"mmcboot=echo Booting from mmc ...; " \
e57cc1b
 		"run mmcargs; " \
e57cc1b
 		"bootm ${loadaddr}\0" \
e57cc1b
 
e57cc1b
 #define CONFIG_BOOTCOMMAND \
e57cc1b
 	"if mmc rescan ${mmcdev}; then " \
e57cc1b
-		"if run loadbootscript; then " \
e57cc1b
-			"run bootscript; " \
e57cc1b
-		"else " \
e57cc1b
-			"if run loaduimage; then " \
e57cc1b
-				"run mmcboot; " \
e57cc1b
-			"fi; " \
e57cc1b
-		"fi; " \
e57cc1b
+		"echo SD/MMC found on device ${mmcdev};" \
e57cc1b
+		"if run loadbootenv; then " \
e57cc1b
+			"echo Loaded environment from ${bootenv};" \
e57cc1b
+			"run importbootenv;" \
e57cc1b
+		"fi;" \
e57cc1b
+		"if test -n $uenvcmd; then " \
e57cc1b
+			"echo Running uenvcmd ...;" \
e57cc1b
+			"run uenvcmd;" \
e57cc1b
+		"fi;" \
e57cc1b
+		"if run loaduimage; then " \
e57cc1b
+			"run mmcboot;" \
e57cc1b
+		"fi;" \
e57cc1b
 	"fi"
e57cc1b
 
e57cc1b
 #define CONFIG_AUTO_COMPLETE		1
e57cc1b
-- 
e57cc1b
1.7.9.1
e57cc1b