[oe] [PATCH] u-boot: beagleboard: improve env var setting

[Jason Kridner]

I was running out of room for all the arguments.  This should help.

Conflicts:

	recipes/u-boot/u-boot_git.bb

Signed-off-by: Jason Kridner <jkridner at beagleboard.org>
---
 ...beagleboard-improved-boot-env-var-setting.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-improved-boot-env-var-setting.patch

diff --git a/recipes/u-boot/u-boot-git/beagleboard/0001-beagleboard-improved-boot-env-var-setting.patch b/recipes/u-boot/u-boot-git/beagleboard/0001-beagleboard-improved-boot-env-var-setting.patch
new file mode 100644
index 0000000..2e0afdf
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/beagleboard/0001-beagleboard-improved-boot-env-var-setting.patch
@@ -0,0 +1,63 @@
+From 4d44d40658a2f0a499aa2d90e58167838efccfa4 Mon Sep 17 00:00:00 2001
+From: Jason Kridner <jkridner at beagleboard.org>
+Date: Wed, 18 Aug 2010 16:38:24 -0500
+Subject: [PATCH] beagleboard: improved boot env var setting
+
+* Enabled evaluation of expressions with 'setexpr'
+* Made room for a 64MB ramdisk by moving from 0x81600000 to 0x81000000
+* Removed expression from 'ramroot' that wouldn't be evaluated
+* Doubled console I/O buffer size from 256 to 512
+* Doubled maximum command arguments size from 16 to 32
+
+Signed-off-by: Jason Kridner <jkridner at beagleboard.org>
+---
+ include/configs/omap3_beagle.h |    9 +++++----
+ 1 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
+index 4f5c1d4..6bc992c 100644
+--- a/include/configs/omap3_beagle.h
++++ b/include/configs/omap3_beagle.h
+@@ -152,6 +152,7 @@
+ #define CONFIG_CMD_NAND		/* NAND support			*/
+ #define CONFIG_CMD_LED		/* LED support			*/
+ #define CONFIG_VIDEO_OMAP3	/* DSS Support			*/
++#define CONFIG_CMD_SETEXPR	/* Evaluate expressions		*/
+ 
+ #undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
+ #undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
+@@ -201,7 +202,7 @@
+ 
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+ 	"loadaddr=0x80200000\0" \
+-	"rdaddr=0x81600000\0" \
++	"rdaddr=0x81000000\0" \
+ 	"usbtty=cdc_acm\0" \
+ 	"console=ttyS2,115200n8\0" \
+ 	"optargs=\0" \
+@@ -217,7 +218,7 @@
+ 	"mmcrootfstype=ext3 rootwait\0" \
+ 	"nandroot=/dev/mtdblock4 rw\0" \
+ 	"nandrootfstype=jffs2\0" \
+-	"ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=${rdaddr},64M\0" \
++	"ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=0x81000000,64M\0" \
+ 	"ramrootfstype=ext2\0" \
+ 	"mmcargs=setenv bootargs console=${console} " \
+ 		"${optargs} " \
+@@ -301,11 +302,11 @@
+ #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
+ #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
+ #define CONFIG_SYS_PROMPT		"OMAP3 beagleboard.org # "
+-#define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
++#define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
+ /* Print Buffer Size */
+ #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
+ 					sizeof(CONFIG_SYS_PROMPT) + 16)
+-#define CONFIG_SYS_MAXARGS		16	/* max number of command args */
++#define CONFIG_SYS_MAXARGS		32	/* max number of command args */
+ /* Boot Argument Buffer Size */
+ #define CONFIG_SYS_BARGSIZE		(CONFIG_SYS_CBSIZE)
+ 
+-- 
+1.5.6.4
+
diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb
index f82f570..ae47ee5 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 ="r64"
+PR ="r67"
 
 FILESPATHPKG =. "u-boot-git:"
 
@@ -72,6 +72,7 @@ SRC_URI_beagleboard = "git://www.denx.de/git/u-boot.git;protocol=git \
                        file://0045-BeagleBoard-Enable-pullups-on-i2c2.patch \
                        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://fw_env.config \
 "
 SRCREV_beagleboard = "ca6e1c136ddb720c3bb2cc043b99f7f06bc46c55"
-- 
1.5.6.4