Add missing header

- pull in patches on their way upstream to fix some issues with ti
- systems.
- refactor beaglebone and pandaboard patches

9 files changed, 460 insertions, 79 deletions

diff --git a/0001-TI-Add-use-a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch b/0001-TI-Add-use-a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch
new file mode 100644
index 0000000..3afdc93
--- /dev/null
+++ b/0001-TI-Add-use-a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch
@@ -0,0 +1,125 @@
+From b2f0945f9542a53960d8e394725f9de199059974 Mon Sep 17 00:00:00 2001
+From: Tom Rini <trini@ti.com>
+Date: Tue, 11 Mar 2014 15:42:01 -0400
+Subject: [PATCH 1/8] TI: Add, use a DEFAULT_LINUX_BOOT_ENV environment string
+
+To deal with a reoccurring problem properly we need to specify addresses
+for the Linux kernel, Flatted Device Tree and ramdisk that obey the
+constraints within the kernel's Documentation/arm/Booting file but also
+make sure that we relocate things within a valid address range.
+
+It is possible with these addresses to also set fdt_high and initrd_high
+to the value of 0xffffffff.  We don't do this by default to allow for
+the most likely success of people using custom addresses however.
+
+Signed-off-by: Tom Rini <trini@ti.com>
+---
+ include/configs/am335x_evm.h      |  5 +----
+ include/configs/am43xx_evm.h      |  5 +----
+ include/configs/ti_armv7_common.h | 22 +++++++++++++++++++++-
+ include/configs/ti_omap4_common.h |  4 +---
+ include/configs/ti_omap5_common.h |  5 +----
+ 5 files changed, 25 insertions(+), 16 deletions(-)
+
+diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
+index 2020e7f..6bd8aec 100644
+--- a/include/configs/am335x_evm.h
++++ b/include/configs/am335x_evm.h
+@@ -61,11 +61,8 @@
+ 
+ #ifndef CONFIG_SPL_BUILD
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+-	"loadaddr=0x80200000\0" \
+-	"fdtaddr=0x80F80000\0" \
+-	"fdt_high=0xffffffff\0" \
++	DEFAULT_LINUX_BOOT_ENV \
+ 	"boot_fdt=try\0" \
+-	"rdaddr=0x81000000\0" \
+ 	"bootpart=0:2\0" \
+ 	"bootdir=/boot\0" \
+ 	"bootfile=zImage\0" \
+diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
+index 614857d..27777c5 100644
+--- a/include/configs/am43xx_evm.h
++++ b/include/configs/am43xx_evm.h
+@@ -112,10 +112,7 @@
+ 
+ #ifndef CONFIG_SPL_BUILD
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+-	"loadaddr=0x80200000\0" \
+-	"fdtaddr=0x80F80000\0" \
+-	"fdt_high=0xffffffff\0" \
+-	"rdaddr=0x81000000\0" \
++	DEFAULT_LINUX_BOOT_ENV \
+ 	"fdtfile=undefined\0" \
+ 	"bootpart=0:2\0" \
+ 	"bootdir=/boot\0" \
+diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
+index 69d69a5..fda99fb 100644
+--- a/include/configs/ti_armv7_common.h
++++ b/include/configs/ti_armv7_common.h
+@@ -36,8 +36,28 @@
+ /*
+  * Our DDR memory always starts at 0x80000000 and U-Boot shall have
+  * relocated itself to higher in memory by the time this value is used.
++ * However, set this to a 32MB offset to allow for easier Linux kernel
++ * booting as the default is often used as the kernel load address.
+  */
+-#define CONFIG_SYS_LOAD_ADDR		0x80000000
++#define CONFIG_SYS_LOAD_ADDR		0x82000000
++
++/*
++ * We setup defaults based on constraints from the Linux kernel, which should
++ * also be safe elsewhere.  We have the default load at 32MB into DDR (for
++ * the kernel), FDT above 128MB (the maximum location for the end of the
++ * kernel), and the ramdisk 512KB above that (allowing for hopefully never
++ * seen large trees).  We say all of this must be within the first 512MB
++ * as that will always be within the kernel lowmem and thus visible via
++ * bootm_size.
++ */
++#define DEFAULT_LINUX_BOOT_ENV \
++	"loadaddr=0x82000000\0" \
++	"kernel_addr_r=0x82000000\0" \
++	"fdtaddr=0x88000000\0" \
++	"fdt_addr_r=0x88000000\0" \
++	"rdaddr=0x88080000\0" \
++	"ramdisk_addr_r=0x88080000\0" \
++	"bootm_size=0x20000000\0"
+ 
+ /*
+  * Default to a quick boot delay.
+diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
+index bcb5eab..387f570 100644
+--- a/include/configs/ti_omap4_common.h
++++ b/include/configs/ti_omap4_common.h
+@@ -87,10 +87,8 @@
+  * Environment setup
+  */
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+-	"loadaddr=0x82000000\0" \
++	DEFAULT_LINUX_BOOT_ENV \
+ 	"console=ttyO2,115200n8\0" \
+-	"fdt_high=0xffffffff\0" \
+-	"fdtaddr=0x80f80000\0" \
+ 	"fdtfile=undefined\0" \
+ 	"bootpart=0:2\0" \
+ 	"bootdir=/boot\0" \
+diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
+index 7b10fbd..2443d55 100644
+--- a/include/configs/ti_omap5_common.h
++++ b/include/configs/ti_omap5_common.h
+@@ -70,10 +70,7 @@
+ #endif
+ 
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+-	"loadaddr=0x80200000\0" \
+-	"fdtaddr=0x80F80000\0" \
+-	"fdt_high=0xffffffff\0" \
+-	"rdaddr=0x81000000\0" \
++	DEFAULT_LINUX_BOOT_ENV \
+ 	"console=" CONSOLEDEV ",115200n8\0" \
+ 	"fdtfile=undefined\0" \
+ 	"bootpart=0:2\0" \
+-- 
+1.9.0
+
diff --git a/0002-am335x_evm-Update-the-ramdisk-args-we-pass-things-in.patch b/0002-am335x_evm-Update-the-ramdisk-args-we-pass-things-in.patch
new file mode 100644
index 0000000..e10bfdd
--- /dev/null
+++ b/0002-am335x_evm-Update-the-ramdisk-args-we-pass-things-in.patch
@@ -0,0 +1,27 @@
+From d501ece818fe10845bb0a005d986acf1e143a313 Mon Sep 17 00:00:00 2001
+From: Tom Rini <trini@ti.com>
+Date: Tue, 11 Mar 2014 15:42:02 -0400
+Subject: [PATCH 2/8] am335x_evm: Update the ramdisk args, we pass things in
+ just fine via DT
+
+Signed-off-by: Tom Rini <trini@ti.com>
+---
+ include/configs/am335x_evm.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
+index 6bd8aec..11088b3 100644
+--- a/include/configs/am335x_evm.h
++++ b/include/configs/am335x_evm.h
+@@ -79,7 +79,7 @@
+ 	"nfsopts=nolock\0" \
+ 	"static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \
+ 		"::off\0" \
+-	"ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=${rdaddr},64M\0" \
++	"ramroot=/dev/ram0 rw\0" \
+ 	"ramrootfstype=ext2\0" \
+ 	"mmcargs=setenv bootargs console=${console} " \
+ 		"${optargs} " \
+-- 
+1.9.0
+
diff --git a/0003-am43xx_evm-Update-the-ramdisk-args-we-pass-things-in.patch b/0003-am43xx_evm-Update-the-ramdisk-args-we-pass-things-in.patch
new file mode 100644
index 0000000..2c91a8d
--- /dev/null
+++ b/0003-am43xx_evm-Update-the-ramdisk-args-we-pass-things-in.patch
@@ -0,0 +1,27 @@
+From 59459e211168e3465c2bdb1b78bfc9c594c9b479 Mon Sep 17 00:00:00 2001
+From: Tom Rini <trini@ti.com>
+Date: Tue, 11 Mar 2014 15:42:03 -0400
+Subject: [PATCH 3/8] am43xx_evm: Update the ramdisk args, we pass things in
+ just fine via DT
+
+Signed-off-by: Tom Rini <trini@ti.com>
+---
+ include/configs/am43xx_evm.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
+index 27777c5..2d9825b 100644
+--- a/include/configs/am43xx_evm.h
++++ b/include/configs/am43xx_evm.h
+@@ -128,7 +128,7 @@
+ 	"usbroot=/dev/sda2 rw\0" \
+ 	"usbrootfstype=ext4 rootwait\0" \
+ 	"usbdev=0\0" \
+-	"ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=${rdaddr},64M\0" \
++	"ramroot=/dev/ram0 rw\0" \
+ 	"ramrootfstype=ext2\0" \
+ 	"mmcargs=setenv bootargs console=${console} " \
+ 		"${optargs} " \
+-- 
+1.9.0
+
diff --git a/0001-add-README.distro.patch b/0004-add-README.distro.patch
index c970b50..7a73380 100644
--- a/0001-add-README.distro.patch
+++ b/0004-add-README.distro.patch
@@ -1,7 +1,7 @@
-From 3fdbcb063121de09e3cdc12144f51251d3fbc86c Mon Sep 17 00:00:00 2001
+From 2ef279ec9eb812e4d67e7ae5eb695eadc63d8570 Mon Sep 17 00:00:00 2001
 From: Dennis Gilmore <dennis@ausil.us>
 Date: Sat, 8 Mar 2014 10:42:34 -0600
-Subject: [PATCH 1/4] add README.distro
+Subject: [PATCH 4/8] add README.distro
 
 Add instructions on how to setup a system to boot using the generic boot
 framework.
diff --git a/0005-add-generic-bootcmd-header.patch b/0005-add-generic-bootcmd-header.patch
new file mode 100644
index 0000000..1134bab
--- /dev/null
+++ b/0005-add-generic-bootcmd-header.patch
@@ -0,0 +1,227 @@
+From db270067bf3b35802fdd8ecc647a80f25bbd7851 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis@ausil.us>
+Date: Sat, 15 Mar 2014 10:13:39 -0500
+Subject: [PATCH 5/8] add generic bootcmd header
+
+---
+ include/config_distro_bootcmd.h | 208 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 208 insertions(+)
+ create mode 100644 include/config_distro_bootcmd.h
+
+diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
+new file mode 100644
+index 0000000..bf44734
+--- /dev/null
++++ b/include/config_distro_bootcmd.h
+@@ -0,0 +1,208 @@
++/*
++ * (C) Copyright 2014
++ * NVIDIA Corporation <www.nvidia.com>
++ *  
++ * Copyright 2014 Red Hat, Inc.
++ *
++ * SPDX-License-Identifier:     GPL-2.0+
++ */
++
++#ifndef _CONFIG_CMD_DISTRO_BOOTCMD_H
++#define _CONFIG_CMD_DISTRO_BOOTCMD_H
++
++
++#ifdef CONFIG_CMD_MMC
++#define BOOTCMDS_MMC \
++	"mmc_boot=" \
++		"setenv devtype mmc; " \
++		"if mmc dev ${devnum}; then " \
++			"run scan_boot; " \
++		"fi\0" \
++	"bootcmd_mmc0=setenv devnum 0; run mmc_boot;\0" \
++	"bootcmd_mmc1=setenv devnum 1; run mmc_boot;\0"
++#define BOOT_TARGETS_MMC "mmc1 mmc0"
++#else
++#define BOOTCMDS_MMC ""
++#define BOOT_TARGETS_MMC ""
++#endif
++
++#ifdef CONFIG_CMD_USB
++#define BOOTCMD_INIT_USB "run usb_init; "
++#define BOOTCMDS_USB \
++	"usb_init=" \
++		"if ${usb_need_init}; then " \
++			"set usb_need_init false; " \
++			"usb start 0; " \
++		"fi\0" \
++	\
++	"usb_boot=" \
++		"setenv devtype usb; " \
++		BOOTCMD_INIT_USB \
++		"if usb dev ${devnum}; then " \
++			"run scan_boot; " \
++		"fi\0" \
++	\
++	"bootcmd_usb0=setenv devnum 0; run usb_boot;\0"
++	"bootcmd_usb1=setenv devnum 1; run usb_boot;\0"
++#define BOOT_TARGETS_USB "usb0 usb1"
++#else
++#define BOOTCMD_INIT_USB ""
++#define BOOTCMDS_USB ""
++#define BOOT_TARGETS_USB ""
++#endif
++
++#ifdef CONFIG_CMD_SATA
++#define BOOTCMDS_SATA \
++	"sata_boot=" \
++		"setenv devtype sata; " \
++		"if sata dev ${devnum}; then " \
++			"run scan_boot; " \
++		"fi\0" \
++	\
++	"bootcmd_sata0=setenv devnum 0; run sata_boot;\0"
++	"bootcmd_sata1=setenv devnum 1; run sata_boot;\0"
++#define BOOT_TARGETS_SATA "sata0 sata1"
++#else
++#define BOOTCMDS_SATA ""
++#define BOOT_TARGETS_SATA ""
++#endif
++
++#ifdef CONFIG_CMD_SCSI
++#define BOOTCMDS_SCSI \
++        "scsi_boot=" \
++                "setenv devtype scsi; " \
++                "if scsi dev ${devnum}; then " \
++                        "run scan_boot; " \
++                "fi\0" \
++        \
++        "bootcmd_scsi0=setenv devnum 0; run scsi_boot;\0"
++        "bootcmd_scsi1=setenv devnum 1; run scsi_boot;\0"
++#define BOOT_TARGETS_SCSI "scsi0 scsi1"
++#else
++#define BOOTCMDS_SCSI ""
++#define BOOT_TARGETS_SCSI ""
++#endif
++
++#ifdef CONFIG_CMD_IDE
++#define BOOTCMDS_IDE \
++        "ide_boot=" \
++                "setenv devtype ide; " \
++                "if ide dev ${devnum}; then " \
++                        "run scan_boot; " \
++                "fi\0" \
++        \
++        "bootcmd_ide0=setenv devnum 0; run ide_boot;\0"
++        "bootcmd_ide1=setenv devnum 1; run ide_boot;\0"
++#define BOOT_TARGETS_IDE "ide0 ide1"
++#else
++#define BOOTCMDS_IDE ""
++#define BOOT_TARGETS_IDE ""
++#endif
++
++#ifdef CONFIG_CMD_DHCP
++#define BOOTCMDS_DHCP \
++	"bootcmd_dhcp=" \
++		BOOTCMD_INIT_USB \
++		"if dhcp ${scriptaddr} boot.scr.uimg; then "\
++			"source ${scriptaddr}; " \
++		"fi\0"
++#define BOOT_TARGETS_DHCP "dhcp"
++#else
++#define BOOTCMDS_DHCP ""
++#define BOOT_TARGETS_DHCP ""
++#endif
++
++#if defined(CONFIG_CMD_DHCP) && defined(CONFIG_CMD_PXE)
++#define BOOTCMDS_PXE \
++	"bootcmd_pxe=" \
++		BOOTCMD_INIT_USB \
++		"dhcp; " \
++		"if pxe get; then " \
++			"pxe boot; " \
++		"fi\0"
++#define BOOT_TARGETS_PXE "pxe"
++#else
++#define BOOTCMDS_PXE ""
++#define BOOT_TARGETS_PXE ""
++#endif
++
++#define BOOTCMDS_COMMON \
++	"rootpart=1\0" \
++	\
++	"do_envimport="                                                   \
++		"load ${devtype} ${devnum}:${rootpart} ${loadaddr} "      \
++			"${environment}\0"                                \
++		"env import -t ${loadaddr} $filesize\0"                   \
++	\
++	"envimport="                                                      \
++		"for environment in ${boot_envs}; do "                    \
++			"if test -e ${devtype} ${devnum}:${rootpart} "    \
++					"${prefix}${environment}; then "  \
++				"echo Found U-Boot environment "          \
++					"${prefix}${environment}; "       \
++				"run do_envimport;"                       \
++				"echo Import FAILED; continuing...; "     \
++			"fi; "                                            \
++		"done\0"                                                  \
++	\
++	"do_script_boot="                                                 \
++		"load ${devtype} ${devnum}:${rootpart} "                  \
++			"${scriptaddr} ${prefix}${script}; "              \
++		"source ${scriptaddr}\0"                                  \
++	\
++	"script_boot="                                                    \
++		"for script in ${boot_scripts}; do "                      \
++			"if test -e ${devtype} ${devnum}:${rootpart} "    \
++					"${prefix}${script}; then "       \
++				"echo Found U-Boot script "               \
++					"${prefix}${script}; "            \
++				"run do_script_boot;"                     \
++				"echo SCRIPT FAILED; continuing...; "     \
++			"fi; "                                            \
++		"done\0"                                                  \
++	\
++	"do_sysboot_boot="                                                \
++		"sysboot ${devtype} ${devnum}:${rootpart} any "           \
++			"${scriptaddr} ${prefix}extlinux/extlinux.conf\0" \
++	\
++	"sysboot_boot="                                                   \
++		"if test -e ${devtype} ${devnum}:${rootpart} "            \
++				"${prefix}extlinux/extlinux.conf; then "  \
++			"echo Found extlinux config "                     \
++				"${prefix}extlinux/extlinux.conf; "       \
++			"run do_sysboot_boot;"                            \
++			"echo SYSBOOT FAILED; continuing...; "            \
++		"fi\0"                                                    \
++	\
++	"scan_boot="                                                      \
++		"echo Scanning ${devtype} ${devnum}...; "                 \
++		"for prefix in ${boot_prefixes}; do "                     \
++			"run sysboot_boot; "                              \
++			"run script_boot; "                               \
++		"done\0"                                                  \
++	\
++	"boot_targets=" \
++		BOOT_TARGETS_MMC " "  \
++		BOOT_TARGETS_USB " "  \
++		BOOT_TARGETS_SATA " " \
++		BOOT_TARGETS_SCSI " " \
++		BOOT_TARGETS_IDE " "  \
++		BOOT_TARGETS_PXE " "  \
++		BOOT_TARGETS_DHCP " " \
++		"\0" \
++	\
++	"boot_prefixes=/ /boot/\0" \
++	\
++	"boot_scripts=boot.scr.uimg boot.scr\0" \
++	\
++	"boot_envs=uEnv.txt\0" \
++	\
++	BOOTCMDS_MMC \
++	BOOTCMDS_USB \
++	BOOTCMDS_SATA \
++	BOOTCMDS_SCSI \
++	BOOTCMDS_IDE \
++	BOOTCMDS_DHCP \
++	BOOTCMDS_PXE
++
++#endif  /* _CONFIG_CMD_DISTRO_BOOTCMD_H */
+-- 
+1.9.0
+
diff --git a/0003-convert-wandboard-to-use-generic-boot-commands.patch b/0006-convert-wandboard-to-use-generic-boot-commands.patch
index cc2c844..c60575c 100644
--- a/0003-convert-wandboard-to-use-generic-boot-commands.patch
+++ b/0006-convert-wandboard-to-use-generic-boot-commands.patch
@@ -1,7 +1,7 @@
-From afa1bca89f7a7ee05ca6e7cd63e76d15718da4aa Mon Sep 17 00:00:00 2001
+From 4a7a3fb87348895c605ec36e4ff1e8272d41ce7c Mon Sep 17 00:00:00 2001
 From: Dennis Gilmore <dennis@ausil.us>
 Date: Sat, 8 Mar 2014 10:59:00 -0600
-Subject: [PATCH 3/4] convert wandboard to use generic boot commands
+Subject: [PATCH 6/8] convert wandboard to use generic boot commands
 
 ---
  include/configs/wandboard.h | 91 +++++++--------------------------------------
diff --git a/0002-convert-beaglebone-to-use-generic-distro-boot-comman.patch b/0007-convert-beaglebone-to-use-generic-boot-commands.patch
index 516e500..819ebda 100644
--- a/0002-convert-beaglebone-to-use-generic-distro-boot-comman.patch
+++ b/0007-convert-beaglebone-to-use-generic-boot-commands.patch
@@ -1,15 +1,15 @@
-From 9d3718215daa053f100cdc6f274e6b04813caef5 Mon Sep 17 00:00:00 2001
+From 4998ea8d57088973c5d4b0306c9c226b85e29bfa Mon Sep 17 00:00:00 2001
 From: Dennis Gilmore <dennis@ausil.us>
-Date: Wed, 12 Mar 2014 14:45:54 -0500
-Subject: [PATCH 2/4] convert beaglebone to use generic distro boot commands
+Date: Sat, 15 Mar 2014 10:24:26 -0500
+Subject: [PATCH 7/8] convert beaglebone to use generic boot commands
 
 ---
- include/configs/am335x_evm.h      | 74 +++++++++++----------------------------
- include/configs/ti_armv7_common.h | 28 +++------------
- 2 files changed, 26 insertions(+), 76 deletions(-)
+ include/configs/am335x_evm.h      | 62 +++++++++------------------------------
+ include/configs/ti_armv7_common.h | 30 +++++--------------
+ 2 files changed, 21 insertions(+), 71 deletions(-)
 
 diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
-index 2020e7f..7d110e9 100644
+index 11088b3..a291a2f 100644
 --- a/include/configs/am335x_evm.h
 +++ b/include/configs/am335x_evm.h
 @@ -50,9 +50,9 @@
@@ -25,37 +25,7 @@ index 2020e7f..7d110e9 100644
  #else
  #define NANDARGS ""
  #endif
-@@ -61,14 +61,16 @@
- 
- #ifndef CONFIG_SPL_BUILD
- #define CONFIG_EXTRA_ENV_SETTINGS \
--	"loadaddr=0x80200000\0" \
--	"fdtaddr=0x80F80000\0" \
--	"fdt_high=0xffffffff\0" \
-+	"fdt_addr_r=0x88000000\0" \
-+	"fdt_high=0xA0000000\0" \
- 	"boot_fdt=try\0" \
--	"rdaddr=0x81000000\0" \
- 	"bootpart=0:2\0" \
- 	"bootdir=/boot\0" \
- 	"bootfile=zImage\0" \
-+	"ramdisk_addr_r=0x88100000\0" \
-+	"kernel_addr_r=0x81000000\0" \
-+	"pxe_addr_r=0x87F00000\0" \
-+	"scriptaddr=0x87E00000\0" \
- 	"fdtfile=undefined\0" \
- 	"console=ttyO0,115200n8\0" \
- 	"partitions=" \
-@@ -82,7 +84,7 @@
- 	"nfsopts=nolock\0" \
- 	"static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \
- 		"::off\0" \
--	"ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=${rdaddr},64M\0" \
-+	"ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=${ramdisk_addr_r},64M\0" \
- 	"ramrootfstype=ext2\0" \
- 	"mmcargs=setenv bootargs console=${console} " \
- 		"${optargs} " \
-@@ -103,60 +105,28 @@
+@@ -100,60 +100,28 @@
  		"nfsroot=${serverip}:${rootpath},${nfsopts} rw " \
  		"ip=dhcp\0" \
  	"bootenv=uEnv.txt\0" \
@@ -124,7 +94,7 @@ index 2020e7f..7d110e9 100644
  	"findfdt="\
  		"if test $board_name = A335BONE; then " \
  			"setenv fdtfile am335x-bone.dtb; fi; " \
-@@ -169,15 +139,13 @@
+@@ -166,15 +134,13 @@
  		"if test $fdtfile = undefined; then " \
  			"echo WARNING: Could not determine device tree to use; fi; \0" \
  	NANDARGS \
@@ -144,7 +114,7 @@ index 2020e7f..7d110e9 100644
  
  /* NS16550 Configuration */
 diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
-index 69d69a5..988f98d 100644
+index fda99fb..79af66e 100644
 --- a/include/configs/ti_armv7_common.h
 +++ b/include/configs/ti_armv7_common.h
 @@ -28,7 +28,6 @@
@@ -155,8 +125,17 @@ index 69d69a5..988f98d 100644
  #define CONFIG_CMDLINE_TAG
  #define CONFIG_SETUP_MEMORY_TAGS
  #define CONFIG_INITRD_TAG
-@@ -40,11 +39,6 @@
- #define CONFIG_SYS_LOAD_ADDR		0x80000000
+@@ -53,6 +52,8 @@
+ #define DEFAULT_LINUX_BOOT_ENV \
+ 	"loadaddr=0x82000000\0" \
+ 	"kernel_addr_r=0x82000000\0" \
++	"pxe_addr_r=0x87F00000\0" \
++	"scriptaddr=0x87E00000\0" \
+ 	"fdtaddr=0x88000000\0" \
+ 	"fdt_addr_r=0x88000000\0" \
+ 	"rdaddr=0x88080000\0" \
+@@ -60,11 +61,6 @@
+ 	"bootm_size=0x20000000\0"
  
  /*
 - * Default to a quick boot delay.
@@ -167,7 +146,7 @@ index 69d69a5..988f98d 100644
   * DDR information.  If the CONFIG_NR_DRAM_BANKS is not defined,
   * we say (for simplicity) that we have 1 bank, always, even when
   * we have more.  We always start at 0x80000000, and we place the
-@@ -105,19 +99,12 @@
+@@ -125,19 +121,12 @@
   * console baudrate of 115200 and use the default baud rate table.
   */
  #define CONFIG_SYS_MALLOC_LEN		(1024 << 10)
@@ -187,7 +166,7 @@ index 69d69a5..988f98d 100644
  /* We set the max number of command args high to avoid HUSH bugs. */
  #define CONFIG_SYS_MAXARGS		64
  
-@@ -150,19 +137,14 @@
+@@ -170,19 +159,14 @@
  #include <config_cmd_default.h>
  #define CONFIG_CMD_ASKENV
  #define CONFIG_CMD_ECHO
diff --git a/0004-convert-omap4-boards-over-to-distro-configs.patch b/0008-convert-pandaboard-to-use-generic-boot-commands.patch
index 3ccc447..eede63d 100644
--- a/0004-convert-omap4-boards-over-to-distro-configs.patch
+++ b/0008-convert-pandaboard-to-use-generic-boot-commands.patch
@@ -1,12 +1,12 @@
-From 1bab90af7e0c00bf5aa4718b864cac767cd34c18 Mon Sep 17 00:00:00 2001
+From dfdd6312dc00d1b2dde14f00fe7bd7fb4e8bdd2c Mon Sep 17 00:00:00 2001
 From: Dennis Gilmore <dennis@ausil.us>
-Date: Wed, 12 Mar 2014 14:40:35 -0500
-Subject: [PATCH 4/4] convert omap4 boards over to distro configs
+Date: Sat, 15 Mar 2014 10:26:49 -0500
+Subject: [PATCH 8/8] convert pandaboard to use generic boot commands
 
 ---
  include/configs/omap4_panda.h     |  3 ---
- include/configs/ti_omap4_common.h | 44 +++++++++++++--------------------------
- 2 files changed, 15 insertions(+), 32 deletions(-)
+ include/configs/ti_omap4_common.h | 34 ++++++++--------------------------
+ 2 files changed, 8 insertions(+), 29 deletions(-)
 
 diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h
 index 7378acd..26f7aee 100644
@@ -25,28 +25,10 @@ index 7378acd..26f7aee 100644
  /* GPIO */
  #define CONFIG_CMD_GPIO
 diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
-index bcb5eab..69af58b 100644
+index 387f570..a92e681 100644
 --- a/include/configs/ti_omap4_common.h
 +++ b/include/configs/ti_omap4_common.h
-@@ -87,10 +87,14 @@
-  * Environment setup
-  */
- #define CONFIG_EXTRA_ENV_SETTINGS \
--	"loadaddr=0x82000000\0" \
-+	"kernel_addr_r=0x82000000\0" \
- 	"console=ttyO2,115200n8\0" \
--	"fdt_high=0xffffffff\0" \
--	"fdtaddr=0x80f80000\0" \
-+	"fdt_high=0xA0000000\0" \
-+	"kernel_addr_r=0x81000000\0" \
-+	"scriptaddr=0x87E00000\0" \
-+	"pxe_addr_r=0x87F00000\0" \
-+	"fdt_addr_r=0x88000000\0" \
-+	"ramdisk_addr_r=0x88100000\0" \
- 	"fdtfile=undefined\0" \
- 	"bootpart=0:2\0" \
- 	"bootdir=/boot\0" \
-@@ -104,16 +108,16 @@
+@@ -102,16 +102,16 @@
  		"vram=${vram} " \
  		"root=${mmcroot} " \
  		"rootfstype=${mmcrootfstype}\0" \
@@ -69,7 +51,7 @@ index bcb5eab..69af58b 100644
  	"findfdt="\
  		"if test $board_name = sdp4430; then " \
  			"setenv fdtfile omap4-sdp.dtb; fi; " \
-@@ -125,29 +129,11 @@
+@@ -123,29 +123,11 @@
  			"setenv fdtfile omap4-panda-es.dtb; fi;" \
  		"if test $fdtfile = undefined; then " \
  			"echo WARNING: Could not determine device tree to use; fi; \0" \
diff --git a/uboot-tools.spec b/uboot-tools.spec
index f6d673b..10cbb13 100644
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@@ -2,7 +2,7 @@
 
 Name:           uboot-tools
 Version:        2014.04
-Release:        0.2%{?candidate:.%{candidate}}%{?dist}
+Release:        0.3%{?candidate:.%{candidate}}%{?dist}
 Summary:        U-Boot utilities
 
 Group:          Development/Tools
@@ -12,10 +12,14 @@ Source0:        ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{ca
 Source1:        uEnv.txt
 Patch1:         u-boot-fat.patch
 
-Patch10:        0001-add-README.distro.patch
-Patch11:        0002-convert-beaglebone-to-use-generic-distro-boot-comman.patch
-Patch12:        0003-convert-wandboard-to-use-generic-boot-commands.patch
-Patch13:        0004-convert-omap4-boards-over-to-distro-configs.patch
+Patch10:        0001-TI-Add-use-a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch
+Patch11:        0002-am335x_evm-Update-the-ramdisk-args-we-pass-things-in.patch
+Patch12:        0003-am43xx_evm-Update-the-ramdisk-args-we-pass-things-in.patch
+Patch13:        0004-add-README.distro.patch
+Patch14:        0005-add-generic-bootcmd-header.patch
+Patch15:        0006-convert-wandboard-to-use-generic-boot-commands.patch
+Patch16:        0007-convert-beaglebone-to-use-generic-boot-commands.patch
+Patch17:        0008-convert-pandaboard-to-use-generic-boot-commands.patch
 
 %ifnarch %{arm}
 BuildRequires:  gcc-arm-linux-gnu
@@ -154,6 +158,10 @@ u-boot bootloader binaries for Wandboard i.MX6 Solo
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
 
 mkdir builds
 # convert fedora logo to bmp for use in u-boot
@@ -434,6 +442,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat Mar 15 2014 Dennis Gilmore <dennis@ausil.us> - 2014.04-0.3.rc2
+- Add missing header
+- pull in patches on their way upstream to fix some issues with ti
+- systems.
+- refactor beaglebone and pandaboard patches
+
 * Thu Mar 13 2014 Dennis Gilmore <dennis@ausil.us> - 2014.04-0.2.rc2
 - actually apply patches