[oe] [PATCH] u-boot: beagleboard: use user.scr when no boot.scr

[Jason Kridner]

Even if the USER button isn't pressed.  Still don't default to ramdisk
unless the USER button is pressed.

Signed-off-by: Jason Kridner <jkridner at beagleboard.org>
---
 ...rd-try-user.scr-even-if-USER-isn-t-presse.patch |   63 ++++++++++++++++++++
 recipes/u-boot/u-boot_git.bb                       |    3 +-
 2 files changed, 65 insertions(+), 1 deletions(-)
 create mode 100644 recipes/u-boot/u-boot-git/beagleboard/0001-beagleboard-try-user.scr-even-if-USER-isn-t-presse.patch

diff --git a/recipes/u-boot/u-boot-git/beagleboard/0001-beagleboard-try-user.scr-even-if-USER-isn-t-presse.patch b/recipes/u-boot/u-boot-git/beagleboard/0001-beagleboard-try-user.scr-even-if-USER-isn-t-presse.patch
new file mode 100644
index 0000000..ebc1831
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0001-beagleboard-try-user.scr-even-if-USER-isn-t-presse.patch
@@ -0,0 +1,63 @@
+From dcbcbcded81e92a30081663371e2bd458ecccaba Mon Sep 17 00:00:00 2001
+From: Jason Kridner <jkridner at beagleboard.org>
+Date: Fri, 20 Aug 2010 15:40:33 -0500
+Subject: [PATCH] beagleboard: try user.scr, even if USER isn't pressed
+
+But only do so after looking for boot.scr.
+
+Signed-off-by: Jason Kridner <jkridner at beagleboard.org>
+---
+ include/configs/omap3_beagle.h |   33 ++++++++++++++++-----------------
+ 1 files changed, 16 insertions(+), 17 deletions(-)
+
+diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
+index 6bc992c..978b41a 100644
+--- a/include/configs/omap3_beagle.h
++++ b/include/configs/omap3_beagle.h
+@@ -272,27 +272,26 @@
+ 			"setenv bootscr user.scr;" \
+ 			"if run loadbootscript; then " \
+ 				"run bootscript; " \
+-			"else " \
+-				"if run loaduimage; then " \
+-					"if run loadramdisk; then " \
+-						"run ramboot; " \
+-					"else " \
+-						"run mmcboot; " \
+-					"fi; " \
+-				"fi; " \
+ 			"fi; " \
+-		"else " \
+-			"setenv bootscr boot.scr; " \
+-			"if run loadbootscript; then " \
+-				"run bootscript; " \
+-			"else " \
+-				"if run loaduimage; then " \
+-					"run mmcboot; " \
+-				"else run nandboot; " \
++			"if run loaduimage; then " \
++				"if run loadramdisk; then " \
++					"run ramboot; " \
+ 				"fi; " \
++				"run mmcboot; " \
+ 			"fi; " \
+ 		"fi; " \
+-	"else run nandboot; fi"
++		"if run loadbootscript; then " \
++			"run bootscript; " \
++		"fi; " \
++		"setenv bootscr user.scr;" \
++		"if run loadbootscript; then " \
++			"run bootscript; " \
++		"fi; " \
++		"if run loaduimage; then " \
++			"run mmcboot; " \
++		"fi; " \
++	"fi; " \
++	"run nandboot;"
+ 
+ #define CONFIG_AUTO_COMPLETE		1
+ /*
+-- 
+1.5.6.4
+
diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb
index ae47ee5..90978f8 100644
--- a/recipes/u-boot/u-boot_git.bb
+++ b/recipes/u-boot/u-boot_git.bb
@@ -1,5 +1,5 @@
 require u-boot.inc
-PR ="r67"
+PR ="r68"
 
 FILESPATHPKG =. "u-boot-git:"
 
@@ -73,6 +73,7 @@ SRC_URI_beagleboard = "git://www.denx.de/git/u-boot.git;protocol=git \
                        file://0046-BeagleBoard-Add-camera-to-default-bootargs.patch \
 		       file://0001-BeagleBoard-move-ramdisk-parameters.patch \
 		       file://0001-beagleboard-improved-boot-env-var-setting.patch \
+		       file://0001-beagleboard-try-user.scr-even-if-USER-isn-t-presse.patch \
                        file://fw_env.config \
 "
 SRCREV_beagleboard = "ca6e1c136ddb720c3bb2cc043b99f7f06bc46c55"
-- 
1.5.6.4