Add missing header

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

1 files changed, 196 insertions, 0 deletions

diff --git a/0007-convert-beaglebone-to-use-generic-boot-commands.patch b/0007-convert-beaglebone-to-use-generic-boot-commands.patch
new file mode 100644
index 0000000..819ebda
--- /dev/null
+++ b/0007-convert-beaglebone-to-use-generic-boot-commands.patch
@@ -0,0 +1,196 @@
+From 4998ea8d57088973c5d4b0306c9c226b85e29bfa Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis@ausil.us>
+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      | 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 11088b3..a291a2f 100644
+--- a/include/configs/am335x_evm.h
++++ b/include/configs/am335x_evm.h
+@@ -50,9 +50,9 @@
+ 	"nandrootfstype=ubifs rootwait=1\0" \
+ 	"nandboot=echo Booting from nand ...; " \
+ 		"run nandargs; " \
+-		"nand read ${fdtaddr} u-boot-spl-os; " \
+-		"nand read ${loadaddr} kernel; " \
+-		"bootz ${loadaddr} - ${fdtaddr}\0"
++		"nand read ${fdt_addr_r} u-boot-spl-os; " \
++		"nand read ${kernel_addr_r} kernel; " \
++		"bootz ${kernel_addr_r} - ${fdt_addr_r}\0"
+ #else
+ #define NANDARGS ""
+ #endif
+@@ -100,60 +100,28 @@
+ 		"nfsroot=${serverip}:${rootpath},${nfsopts} rw " \
+ 		"ip=dhcp\0" \
+ 	"bootenv=uEnv.txt\0" \
+-	"loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
++	"loadbootenv=load mmc ${mmcdev} ${kernel_addr_r} ${bootenv}\0" \
+ 	"importbootenv=echo Importing environment from mmc ...; " \
+-		"env import -t $loadaddr $filesize\0" \
++		"env import -t $kernel_addr_r $filesize\0" \
+ 	"ramargs=setenv bootargs console=${console} " \
+ 		"${optargs} " \
+ 		"root=${ramroot} " \
+ 		"rootfstype=${ramrootfstype}\0" \
+-	"loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
+-	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
+-	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
+-	"mmcloados=run mmcargs; " \
+-		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+-			"if run loadfdt; then " \
+-				"bootz ${loadaddr} - ${fdtaddr}; " \
+-			"else " \
+-				"if test ${boot_fdt} = try; then " \
+-					"bootz; " \
+-				"else " \
+-					"echo WARN: Cannot load the DT; " \
+-				"fi; " \
+-			"fi; " \
+-		"else " \
+-			"bootz; " \
+-		"fi;\0" \
+-	"mmcboot=mmc dev ${mmcdev}; " \
+-		"if mmc rescan; then " \
+-			"echo SD/MMC found on device ${mmcdev};" \
+-			"if run loadbootenv; then " \
+-				"echo Loaded environment from ${bootenv};" \
+-				"run importbootenv;" \
+-			"fi;" \
+-			"if test -n $uenvcmd; then " \
+-				"echo Running uenvcmd ...;" \
+-				"run uenvcmd;" \
+-			"fi;" \
+-			"if run loadimage; then " \
+-				"run mmcloados;" \
+-			"fi;" \
+-		"fi;\0" \
+ 	"spiboot=echo Booting from spi ...; " \
+ 		"run spiargs; " \
+ 		"sf probe ${spibusno}:0; " \
+-		"sf read ${loadaddr} ${spisrcaddr} ${spiimgsize}; " \
+-		"bootz ${loadaddr}\0" \
++		"sf read ${kernel_addr_r} ${spisrcaddr} ${spiimgsize}; " \
++		"bootz ${kernel_addr_r}\0" \
+ 	"netboot=echo Booting from network ...; " \
+ 		"setenv autoload no; " \
+ 		"dhcp; " \
+-		"tftp ${loadaddr} ${bootfile}; " \
+-		"tftp ${fdtaddr} ${fdtfile}; " \
++		"tftp ${kernel_addr_r} ${bootfile}; " \
++		"tftp ${fdt_addr_r} ${fdtfile}; " \
+ 		"run netargs; " \
+-		"bootz ${loadaddr} - ${fdtaddr}\0" \
++		"bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
+ 	"ramboot=echo Booting from ramdisk ...; " \
+ 		"run ramargs; " \
+-		"bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \
++		"bootz ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}\0" \
+ 	"findfdt="\
+ 		"if test $board_name = A335BONE; then " \
+ 			"setenv fdtfile am335x-bone.dtb; fi; " \
+@@ -166,15 +134,13 @@
+ 		"if test $fdtfile = undefined; then " \
+ 			"echo WARNING: Could not determine device tree to use; fi; \0" \
+ 	NANDARGS \
+-	DFUARGS
++	DFUARGS \
++	BOOTCMDS_COMMON
+ #endif
+ 
+ #define CONFIG_BOOTCOMMAND \
+ 	"run findfdt; " \
+-	"run mmcboot;" \
+-	"setenv mmcdev 1; " \
+-	"setenv bootpart 1:2; " \
+-	"run mmcboot;" \
++	"for target in ${boot_targets}; do run bootcmd_${target}; done" \
+ 	"run nandboot;"
+ 
+ /* NS16550 Configuration */
+diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
+index fda99fb..79af66e 100644
+--- a/include/configs/ti_armv7_common.h
++++ b/include/configs/ti_armv7_common.h
+@@ -28,7 +28,6 @@
+ #define CONFIG_SYS_NO_FLASH
+ 
+ /* Support both device trees and ATAGs. */
+-#define CONFIG_OF_LIBFDT
+ #define CONFIG_CMDLINE_TAG
+ #define CONFIG_SETUP_MEMORY_TAGS
+ #define CONFIG_INITRD_TAG
+@@ -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.
+- */
+-#define CONFIG_BOOTDELAY		1
+-
+-/*
+  * 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
+@@ -125,19 +121,12 @@
+  * console baudrate of 115200 and use the default baud rate table.
+  */
+ #define CONFIG_SYS_MALLOC_LEN		(1024 << 10)
+-#define CONFIG_SYS_HUSH_PARSER
+ #define CONFIG_SYS_PROMPT		"U-Boot# "
+ #define CONFIG_SYS_CONSOLE_INFO_QUIET
+ #define CONFIG_BAUDRATE			115200
+ #define CONFIG_ENV_VARS_UBOOT_CONFIG	/* Strongly encouraged */
+ #define CONFIG_ENV_OVERWRITE		/* Overwrite ethaddr / serial# */
+ 
+-/* As stated above, the following choices are optional. */
+-#define CONFIG_SYS_LONGHELP
+-#define CONFIG_AUTO_COMPLETE
+-#define CONFIG_CMDLINE_EDITING
+-#define CONFIG_VERSION_VARIABLE
+-
+ /* We set the max number of command args high to avoid HUSH bugs. */
+ #define CONFIG_SYS_MAXARGS		64
+ 
+@@ -170,19 +159,14 @@
+ #include <config_cmd_default.h>
+ #define CONFIG_CMD_ASKENV
+ #define CONFIG_CMD_ECHO
+-#define CONFIG_CMD_BOOTZ
+ 
+ /*
+- * Common filesystems support.  When we have removable storage we
+- * enabled a number of useful commands and support.
++ * Include the generic config options and boot environment when not
++ * building our SPL
+  */
+-#if defined(CONFIG_MMC) || defined(CONFIG_USB_STORAGE)
+-#define CONFIG_DOS_PARTITION
+-#define CONFIG_CMD_FAT
+-#define CONFIG_FAT_WRITE
+-#define CONFIG_CMD_EXT2
+-#define CONFIG_CMD_EXT4
+-#define CONFIG_CMD_FS_GENERIC
++#ifndef CONFIG_SPL_BUILD
++#include <config_distro_defaults.h>
++#include <config_distro_bootcmd.h>
+ #endif
+ 
+ /*
+-- 
+1.9.0
+