1 files changed, 0 insertions, 115 deletions
diff --git a/recipes-bsp/u-boot/u-boot/0047-BeagleBoard-Adjust-boot-command-on-USER-button.patch b/recipes-bsp/u-boot/u-boot/0047-BeagleBoard-Adjust-boot-command-on-USER-button.patch
deleted file mode 100644
index 7d40ff7ebe..0000000000
--- a/recipes-bsp/u-boot/u-boot/0047-BeagleBoard-Adjust-boot-command-on-USER-button.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From d3f9ba7264111551ea11f33aadbecc15c87a4332 Mon Sep 17 00:00:00 2001
-From: Jason Kridner <jkridner@beagleboard.org>
-Date: Wed, 21 Jul 2010 08:47:59 -0500
-Subject: [PATCH 47/51] BeagleBoard: Adjust boot command on USER button
-
-When the USER button is pressed, the default boot command will attempt
-to load user.scr.  If that fails, it will try to load a ramdisk image.
-
-This version also sets the rootfstype and assumes that the userbutton
-command returns success (0) when the button is pressed.  It also really
-attempts to load the user.scr file.
----
- include/configs/omap3_beagle.h |   51 ++++++++++++++++++++++++++++++++++-----
- 1 files changed, 44 insertions(+), 7 deletions(-)
-
-diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
-index b265b0c..1a76004 100644
---- a/include/configs/omap3_beagle.h
-+++ b/include/configs/omap3_beagle.h
-@@ -200,9 +200,12 @@
- #define CONFIG_BOOTDELAY		3
- 
- #define CONFIG_EXTRA_ENV_SETTINGS \
--	"loadaddr=0x82000000\0" \
-+	"loadaddr=0x80200000\0" \
-+	"rdaddr=0x81600000\0" \
- 	"usbtty=cdc_acm\0" \
- 	"console=ttyS2,115200n8\0" \
-+	"optargs=\0" \
-+	"bootscr=boot.scr\0" \
- 	"mpurate=500\0" \
- 	"buddy=none\0" \
- 	"vram=12M\0" \
-@@ -213,7 +216,10 @@
- 	"mmcrootfstype=ext3 rootwait\0" \
- 	"nandroot=/dev/mtdblock4 rw\0" \
- 	"nandrootfstype=jffs2\0" \
-+	"ramroot=/dev/ram0 rw\0" \
-+	"ramrootfstype=ext2\0" \
- 	"mmcargs=setenv bootargs console=${console} " \
-+		"${optargs} " \
- 		"mpurate=${mpurate} " \
- 		"buddy=${buddy} "\
- 		"vram=${vram} " \
-@@ -222,6 +228,7 @@
- 		"root=${mmcroot} " \
- 		"rootfstype=${mmcrootfstype}\0" \
- 	"nandargs=setenv bootargs console=${console} " \
-+		"${optargs} " \
- 		"mpurate=${mpurate} " \
- 		"buddy=${buddy} "\
- 		"vram=${vram} " \
-@@ -229,7 +236,18 @@
- 		"omapdss.def_disp=${defaultdisplay} " \
- 		"root=${nandroot} " \
- 		"rootfstype=${nandrootfstype}\0" \
--	"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
-+	"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} ${bootscr}\0" \
-+	"ramargs=setenv bootargs console=${console} " \
-+		"${optargs} " \
-+		"mpurate=${mpurate} " \
-+		"buddy=${buddy} "\
-+		"vram=${vram} " \
-+		"omapfb.mode=dvi:${dvimode} " \
-+		"omapdss.def_disp=${defaultdisplay} " \
-+		"root=${ramroot} rw ramdisk_size=65536 " \
-+		"initrd=${rdaddr},64M " \
-+		"rootfstype=${ramrootfstype}\0" \
-+	"loadramdisk=fatload mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
- 	"bootscript=echo Running bootscript from mmc ...; " \
- 		"source ${loadaddr}\0" \
- 	"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
-@@ -240,15 +258,34 @@
- 		"run nandargs; " \
- 		"nand read ${loadaddr} 280000 400000; " \
- 		"bootm ${loadaddr}\0" \
-+	"ramboot=echo Booting from ramdisk ...; " \
-+		"run ramargs; " \
-+		"bootm ${loadaddr}\0" \
- 
- #define CONFIG_BOOTCOMMAND \
- 	"if mmc init ${mmcdev}; then " \
--		"if run loadbootscript; then " \
--			"run bootscript; " \
-+		"if userbutton; then " \
-+			"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 " \
--			"if run loaduimage; then " \
--				"run mmcboot; " \
--			"else run nandboot; " \
-+			"setenv bootscr boot.scr; " \
-+			"if run loadbootscript; then " \
-+				"run bootscript; " \
-+			"else " \
-+				"if run loaduimage; then " \
-+					"run mmcboot; " \
-+				"else run nandboot; " \
-+				"fi; " \
- 			"fi; " \
- 		"fi; " \
- 	"else run nandboot; fi"
--- 
-1.6.6.1
-