update to 2013.10-rc2

- enable extlinux.conf support on most boards
- add distro generic configuration options

33 files changed, 783 insertions, 738 deletions

diff --git a/0001-Add-wandboard-quad-support.patch b/0001-Add-wandboard-quad-support.patch
deleted file mode 100644
index 4c65b89..0000000
--- a/0001-Add-wandboard-quad-support.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From f7687f75a5cba567a8dbccb43dc5826c9deb8de4 Mon Sep 17 00:00:00 2001
-From: Dennis Gilmore <dennis@ausil.us>
-Date: Sun, 30 Jun 2013 15:18:08 -0500
-Subject: [PATCH 01/15] Add wandboard quad support
-
----
- board/boundary/nitrogen6x/nitrogen6quad.cfg | 45 +++++++++++++++++++++++++++++
- board/wandboard/README                      |  5 ++++
- 2 files changed, 50 insertions(+)
- create mode 100644 board/boundary/nitrogen6x/nitrogen6quad.cfg
-
-diff --git a/board/boundary/nitrogen6x/nitrogen6quad.cfg b/board/boundary/nitrogen6x/nitrogen6quad.cfg
-new file mode 100644
-index 0000000..dccd497
---- /dev/null
-+++ b/board/boundary/nitrogen6x/nitrogen6quad.cfg
-@@ -0,0 +1,45 @@
-+/*
-+ * Copyright (C) 2013 Boundary Devices
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not write to the Free Software
-+ * Foundation Inc. 51 Franklin Street Fifth Floor Boston,
-+ * MA 02110-1301 USA
-+ *
-+ * Refer doc/README.imximage for more details about how-to configure
-+ * and create imximage boot image
-+ *
-+ * The syntax is taken as close as possible with the kwbimage
-+ */
-+
-+/* image version */
-+IMAGE_VERSION 2
-+
-+/*
-+ * Boot Device : one of
-+ * spi, sd (the board has no nand neither onenand)
-+ */
-+BOOT_FROM      sd
-+
-+#define __ASSEMBLY__
-+#include <config.h>
-+#include "asm/arch/mx6-ddr.h"
-+#include "asm/arch/iomux.h"
-+#include "asm/arch/crm_regs.h"
-+
-+#include "ddr-setup.cfg"
-+#include "800mhz_4x256mx16.cfg"
-+#include "clocks.cfg"
-diff --git a/board/wandboard/README b/board/wandboard/README
-index 498db2f..4e54ee3 100644
---- a/board/wandboard/README
-+++ b/board/wandboard/README
-@@ -17,6 +17,11 @@ To build U-Boot for the Wandboard Dual Lite version:
- $ make wandboard_dl_config
- $ make
- 
-+To build U-Boot for the Wandboard Quad version:
-+
-+$ make wandboard_quad_config
-+$ make
-+
- To build U-Boot for the Wandboard Solo version:
- 
- $ make wandboard_solo_config
--- 
-1.8.3.1
-
diff --git a/0001-add-distro-default-commands-and-config-options.patch b/0001-add-distro-default-commands-and-config-options.patch
new file mode 100644
index 0000000..6120625
--- /dev/null
+++ b/0001-add-distro-default-commands-and-config-options.patch
@@ -0,0 +1,70 @@
+From b2a3024f46c5a7ea60db45b85b4d92de85c23968 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis@ausil.us>
+Date: Wed, 7 Aug 2013 23:00:42 -0500
+Subject: [PATCH 01/16] add distro default commands and config options
+
+---
+ include/config_distro_default.h | 51 +++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 51 insertions(+)
+ create mode 100644 include/config_distro_default.h
+
+diff --git a/include/config_distro_default.h b/include/config_distro_default.h
+new file mode 100644
+index 0000000..b892868
+--- /dev/null
++++ b/include/config_distro_default.h
+@@ -0,0 +1,51 @@
++/*
++ * Copyright 2013 Red Hat, Inc.
++ *
++ * This file is licensed under the terms of the GNU General Public
++ * License Version 2. This file is licensed "as is" without any
++ * warranty of any kind, whether express or implied.
++ */
++
++#ifndef _CONFIG_CMD_DISTRO_DEFAULT_H
++#define _CONFIG_CMD_DISTRO_DEFAULT_H
++
++/*
++ * List of all commands and options that when defined enables support for features
++ * required by distros to support boards in a standardised and consitant manner.
++ */
++
++
++#define CONFIG_BOOTP_PXE
++
++#if defined(__arm__)
++#define CONFIG_BOOTP_PXE_CLIENTARCH     0x100
++#define CONFIG_BOOTP_VCI_STRING         "U-boot.armv7"
++#endif
++
++#define CONFIG_OF_LIBFDT
++
++#define CONFIG_CMD_BOOTZ
++#define CONFIG_CMD_DHCP
++#define CONFIG_CMD_ELF
++#define CONFIG_CMD_EXT2
++#define CONFIG_CMD_FAT
++#define CONFIG_CMD_MII
++#define CONFIG_CMD_NET
++#define CONFIG_CMD_PING
++#define CONFIG_CMD_PXE
++#define CONFIG_CMD_USB
++
++#define CONFIG_CMDLINE_EDITING
++#define CONFIG_AUTO_COMPLETE
++#define CONFIG_BOOTDELAY     2
++#define CONFIG_SYS_LONGHELP
++#define CONFIG_FIT
++#define CONFIG_MENU
++#define CONFIG_MENU_SHOW
++#define CONFIG_DOS_PARTITION
++#define CONFIG_EFI_PARTITION
++#define CONFIG_SUPPORT_RAW_INITRD
++#define CONFIG_SYS_HUSH_PARSER
++#define CONFIG_USB_STORAGE
++
++#endif	/* _CONFIG_CMD_DISTRO_DEFAULT_H */
+-- 
+1.8.3.1
+
diff --git a/0002-add-option-to-include-generic-distro-config.patch b/0002-add-option-to-include-generic-distro-config.patch
new file mode 100644
index 0000000..4802fdc
--- /dev/null
+++ b/0002-add-option-to-include-generic-distro-config.patch
@@ -0,0 +1,28 @@
+From 2ee3bdd54d7dbfabf512a5496ad9794be45849f2 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis@ausil.us>
+Date: Sun, 1 Sep 2013 21:42:48 -0500
+Subject: [PATCH 02/16] add option to include generic distro config
+
+---
+ include/common.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/include/common.h b/include/common.h
+index 8addf43..113df4a 100644
+--- a/include/common.h
++++ b/include/common.h
+@@ -99,6 +99,11 @@ typedef volatile unsigned char	vu_char;
+ #include <flash.h>
+ #include <image.h>
+ 
++/* use generic distro config */
++#ifdef DISTRO_DEFAULTS
++#include <config_distro_default.h>
++#endif
++
+ #ifdef DEBUG
+ #define _DEBUG	1
+ #else
+-- 
+1.8.3.1
+
diff --git a/0002-am335x-mux-don-t-hang-on-unknown-EEPROMs-assume-Beag.patch b/0002-am335x-mux-don-t-hang-on-unknown-EEPROMs-assume-Beag.patch
deleted file mode 100644
index b3b306b..0000000
--- a/0002-am335x-mux-don-t-hang-on-unknown-EEPROMs-assume-Beag.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 9a379b9ffc8b601f7e6907ceb5c56fa68217de8d Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Wed, 3 Apr 2013 08:32:19 +0200
-Subject: [PATCH 02/15] am335x mux: don't hang on unknown EEPROMs, assume
- BeagleBone Black
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- board/ti/am335x/mux.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c
-index 0283708..ab42011 100644
---- a/board/ti/am335x/mux.c
-+++ b/board/ti/am335x/mux.c
-@@ -305,7 +305,11 @@ void enable_board_pin_mux(struct am335x_baseboard_id *header)
- 		configure_module_pin_mux(mmc0_pin_mux);
- 		configure_module_pin_mux(mmc1_pin_mux);
- 	} else {
--		puts("Unknown board, cannot configure pinmux.");
--		hang();
-+		puts("Unknown board, assuming Beaglebone LT/Black.");
-+		/* Beaglebone LT pinmux */
-+		configure_module_pin_mux(i2c1_pin_mux);
-+		configure_module_pin_mux(mii1_pin_mux);
-+		configure_module_pin_mux(mmc0_pin_mux);
-+		configure_module_pin_mux(mmc1_pin_mux);
- 	}
- }
--- 
-1.8.3.1
-
diff --git a/0003-beaglebone-HACK-always-return-1-for-is_bone_lt.patch b/0003-beaglebone-HACK-always-return-1-for-is_bone_lt.patch
deleted file mode 100644
index 7fce518..0000000
--- a/0003-beaglebone-HACK-always-return-1-for-is_bone_lt.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From a34b729d67b97cd0bc78747406e249b1c0995cdf Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Wed, 3 Apr 2013 08:33:28 +0200
-Subject: [PATCH 03/15] beaglebone: HACK: always return 1 for is_bone_lt
-
-This is to make the eMMC flasher work, the EEPROM hasn't been populated yet
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- board/ti/am335x/board.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
-index fdbe26c..f9e7803 100644
---- a/board/ti/am335x/board.c
-+++ b/board/ti/am335x/board.c
-@@ -57,7 +57,8 @@ static inline int board_is_bone(void)
- 
- static inline int board_is_bone_lt(void)
- {
--	return !strncmp(header.name, "A335BNLT", HDR_NAME_LEN);
-+	//return !strncmp(header.name, "A335BNLT", HDR_NAME_LEN);
-+	return 1;
- }
- 
- static inline int board_is_evm_sk(void)
-@@ -359,7 +360,7 @@ void s_init(void)
- 	if (board_is_evm_sk())
- 		config_ddr(303, MT41J128MJT125_IOCTRL_VALUE, &ddr3_data,
- 			   &ddr3_cmd_ctrl_data, &ddr3_emif_reg_data, 0);
--	else if (board_is_bone_lt())
-+	else if (board_is_bone_lt() && !board_is_bone())
- 		config_ddr(400, MT41K256M16HA125E_IOCTRL_VALUE,
- 			   &ddr3_beagleblack_data,
- 			   &ddr3_beagleblack_cmd_ctrl_data,
--- 
-1.8.3.1
-
diff --git a/0003-set-omap4-boards-to-use-the-generic-distro-support.patch b/0003-set-omap4-boards-to-use-the-generic-distro-support.patch
new file mode 100644
index 0000000..bbb3db0
--- /dev/null
+++ b/0003-set-omap4-boards-to-use-the-generic-distro-support.patch
@@ -0,0 +1,41 @@
+From ad30cfb1284981c5c3f1d3bb92e1ef417546947e Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis@ausil.us>
+Date: Mon, 2 Sep 2013 11:26:39 -0500
+Subject: [PATCH 03/16] set omap4 boards to use the generic distro support
+
+---
+ include/configs/omap4_common.h | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
+index e9f2383..634668a 100644
+--- a/include/configs/omap4_common.h
++++ b/include/configs/omap4_common.h
+@@ -106,6 +106,9 @@
+ /* commands to include */
+ #include <config_cmd_default.h>
+ 
++/* enable generic distro config */
++#define DISTRO_DEFAULTS 1
++
+ /* Enabled commands */
+ #define CONFIG_CMD_EXT2		/* EXT2 Support                 */
+ #define CONFIG_CMD_FAT		/* FAT support                  */
+@@ -132,9 +135,13 @@
+ 
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+ 	"loadaddr=0x82000000\0" \
++	"pxefile_addr_r=0x82000000\0" \
++	"kernel_addr_r=0x84000000\0" \
++	"ramdisk_addr_r=0x90000000\0" \
++	"fdt_addr_r=0x83000000\0" \
+ 	"console=ttyO2,115200n8\0" \
+ 	"fdt_high=0xffffffff\0" \
+-	"fdtaddr=0x80f80000\0" \
++	"fdt_addr=0x80f80000\0" \
+ 	"fdtfile=undefined\0" \
+ 	"bootpart=0:2\0" \
+ 	"bootdir=/boot\0" \
+-- 
+1.8.3.1
+
diff --git a/0004-beaglebone-HACK-raise-USB-current-limit.patch b/0004-beaglebone-HACK-raise-USB-current-limit.patch
deleted file mode 100644
index 54c8bd2..0000000
--- a/0004-beaglebone-HACK-raise-USB-current-limit.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a7eb66eefa4a536e4eec37f9d005bae31ce14ae4 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Wed, 3 Apr 2013 08:27:09 +0200
-Subject: [PATCH 04/15] beaglebone: HACK: raise USB current limit
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- include/configs/am335x_evm.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
-index c5a6d4b..c143137 100644
---- a/include/configs/am335x_evm.h
-+++ b/include/configs/am335x_evm.h
-@@ -151,6 +151,7 @@
- #endif
- 
- #define CONFIG_BOOTCOMMAND \
-+	"i2c mw 0x24 1 0x3e; " \
- 	"run findfdt; " \
- 	"mmc dev ${mmcdev}; if mmc rescan; then " \
- 		"echo SD/MMC found on device ${mmcdev};" \
--- 
-1.8.3.1
-
diff --git a/0004-set-wandboard-to-use-generic-commands-and-set-needed.patch b/0004-set-wandboard-to-use-generic-commands-and-set-needed.patch
new file mode 100644
index 0000000..a6f9438
--- /dev/null
+++ b/0004-set-wandboard-to-use-generic-commands-and-set-needed.patch
@@ -0,0 +1,38 @@
+From 15199560752c0b46c4201f8d96a001123e3eb766 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis@ausil.us>
+Date: Mon, 2 Sep 2013 11:33:46 -0500
+Subject: [PATCH 04/16] set wandboard to use generic commands and set needed
+ variables
+
+---
+ include/configs/wandboard.h | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
+index 665cfc3..75827cd 100644
+--- a/include/configs/wandboard.h
++++ b/include/configs/wandboard.h
+@@ -40,6 +40,9 @@
+ #define CONFIG_CONS_INDEX		1
+ #define CONFIG_BAUDRATE			115200
+ 
++/* enable generic distro config */
++#define DISTRO_DEFAULTS 1
++
+ /* Command definition */
+ #include <config_cmd_default.h>
+ 
+@@ -116,6 +119,10 @@
+ 	"initrd_high=0xffffffff\0" \
+ 	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
+ 	"fdt_addr=0x11000000\0" \
++	"pxefile_addr_r=0x13000000\0" \
++	"kernel_addr_r=0x14000000\0" \
++	"ramdisk_addr_r=0x32000000\0" \
++	"fdt_addr_r=0x12000000\0" \
+ 	"boot_fdt=try\0" \
+ 	"ip_dyn=yes\0" \
+ 	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
+-- 
+1.8.3.1
+
diff --git a/0005-beaglebone-use-kloadaddr-to-avoid-copying-the-kernel.patch b/0005-beaglebone-use-kloadaddr-to-avoid-copying-the-kernel.patch
deleted file mode 100644
index 214aadb..0000000
--- a/0005-beaglebone-use-kloadaddr-to-avoid-copying-the-kernel.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 939bbe4dad5072738b0e4453d8d0d7cebd889450 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Wed, 3 Apr 2013 08:25:04 +0200
-Subject: [PATCH 05/15] beaglebone: use kloadaddr to avoid copying the kernel
- around
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- include/configs/am335x_evm.h | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
-index c143137..7a9628e 100644
---- a/include/configs/am335x_evm.h
-+++ b/include/configs/am335x_evm.h
-@@ -55,6 +55,7 @@
- #ifndef CONFIG_SPL_BUILD
- #define CONFIG_EXTRA_ENV_SETTINGS \
- 	"loadaddr=0x80200000\0" \
-+	"kloadaddr=0x80007fc0\0" \
- 	"fdtaddr=0x80F80000\0" \
- 	"fdt_high=0xffffffff\0" \
- 	"rdaddr=0x81000000\0" \
-@@ -113,11 +114,11 @@
- 		"root=${ramroot} " \
- 		"rootfstype=${ramrootfstype}\0" \
- 	"loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
--	"loaduimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
-+	"loaduimage=load mmc ${bootpart} ${kloadaddr} ${bootdir}/${bootfile}\0" \
- 	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
- 	"mmcboot=echo Booting from mmc ...; " \
- 		"run mmcargs; " \
--		"bootm ${loadaddr} - ${fdtaddr}\0" \
-+		"bootm ${kloadaddr} - ${fdtaddr}\0" \
- 	"nandboot=echo Booting from nand ...; " \
- 		"run nandargs; " \
- 		"nand read ${loadaddr} ${nandsrcaddr} ${nandimgsize}; " \
--- 
-1.8.3.1
-
diff --git a/0005-set-the-default-wandboard-boot-commands.patch b/0005-set-the-default-wandboard-boot-commands.patch
new file mode 100644
index 0000000..47c12a3
--- /dev/null
+++ b/0005-set-the-default-wandboard-boot-commands.patch
@@ -0,0 +1,48 @@
+From 1ed999468cef0281272f13bc1377f3f9937d6441 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis@ausil.us>
+Date: Mon, 2 Sep 2013 11:44:40 -0500
+Subject: [PATCH 05/16] set the default wandboard boot commands
+
+---
+ include/configs/wandboard.h | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
+index 75827cd..4796cdb 100644
+--- a/include/configs/wandboard.h
++++ b/include/configs/wandboard.h
+@@ -124,6 +124,23 @@
+ 	"ramdisk_addr_r=0x32000000\0" \
+ 	"fdt_addr_r=0x12000000\0" \
+ 	"boot_fdt=try\0" \
++	"bootcmd_setup=mmc rescan\0" \
++	"bootcmd_pxe=setenv bootfile \"\" ;dhcp; pxe get; pxe boot\0" \
++	"bootcmd_disk_scr=ext2load ${boot_ifc} ${bootdevice} ${scr_addr_r} boot.scr && source ${scr_addr_r}\0" \
++	"bootcmd_disk_sysboot1=setenv bootfile /boot/extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
++	"bootcmd_disk_sysboot2=setenv bootfile /extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
++	"bootcmd_disk_uenv=ext2load ${boot_ifc} ${bootdevice} ${uenv_addr_r} uEnv.txt; env import -t ${uenv_addr_r} ${filesize}; run bootcmd_uenv\0" \
++	"bootcmd_disk_kernel=ext2load ${boot_ifc} ${bootdevice} ${kernel_addr_r} vmlinuz && ext2load ${boot_ifc} ${bootdevice} ${ramdisk_addr_r} initrd.img && bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr}\0" \
++	"bootcmd_disk=run bootcmd_disk_sysboot1; run bootcmd_disk_sysboot2; run bootcmd_disk_uenv; run bootcmd_disk_scr; run bootcmd_disk_kernel\0" \
++	"bootcmd_sata=setenv boot_ifc scsi; scsi scan && run bootcmd_disk\0" \
++	"bootcmd_mmc=setenv boot_ifc mmc; mmc rescan && run bootcmd_disk\0" \
++	"bootcmd_default=run bootcmd_mmc; run bootcmd_sata; run bootcmd_pxe\0" \
++	"localcmd=run bootcmd_mmc\0" \
++	"bootdevice=0\0" \
++	"bootargs=console=ttymxc0 root=LABEL=rootfs\0" \
++	"bootdelay=2\0" \
++	"bootretry=90\0" \
++	"netretry=once\0" \
+ 	"ip_dyn=yes\0" \
+ 	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
+ 	"mmcpart=1\0" \
+@@ -192,6 +209,7 @@
+ 
+ #define CONFIG_BOOTCOMMAND \
+ 	   "mmc dev ${mmcdev}; if mmc rescan; then " \
++                   "run bootcmd_default; " \
+ 		   "if run loadbootscript; then " \
+ 			   "run bootscript; " \
+ 		   "else " \
+-- 
+1.8.3.1
+
diff --git a/0006-beaglebone-try-to-load-uEnv-uImage-from-eMMC-first.patch b/0006-beaglebone-try-to-load-uEnv-uImage-from-eMMC-first.patch
deleted file mode 100644
index ef38d67..0000000
--- a/0006-beaglebone-try-to-load-uEnv-uImage-from-eMMC-first.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 41a2805057a24940731b7299af711a49ab64b0c4 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Wed, 3 Apr 2013 08:44:03 +0200
-Subject: [PATCH 06/15] beaglebone: try to load uEnv/uImage from eMMC first
-
-If u-boot detects the eMMC, try to load from there, if that fails fall back to uSD. Due to linux "features" rootdev can remain mmcblk0p1.
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- include/configs/am335x_evm.h | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
-index 7a9628e..2547a87 100644
---- a/include/configs/am335x_evm.h
-+++ b/include/configs/am335x_evm.h
-@@ -154,6 +154,24 @@
- #define CONFIG_BOOTCOMMAND \
- 	"i2c mw 0x24 1 0x3e; " \
- 	"run findfdt; " \
-+	"mmc dev 1; if mmc rescan; then " \
-+		"echo SD/MMC found on device ${mmcdev};" \
-+		"setenv mmcdev 1;"\
-+		"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 loaduimage; then " \
-+			"run loadfdt;" \
-+			"run mmcboot;" \
-+		"fi;" \
-+	"else " \
-+		"echo No SD/MMC found on device ${mmcdev};" \
-+	"fi;" \
- 	"mmc dev ${mmcdev}; if mmc rescan; then " \
- 		"echo SD/MMC found on device ${mmcdev};" \
- 		"if run loadbootenv; then " \
--- 
-1.8.3.1
-
diff --git a/0006-set-default-boot-commands-on-omap4-to-use-extlinux.patch b/0006-set-default-boot-commands-on-omap4-to-use-extlinux.patch
new file mode 100644
index 0000000..880398d
--- /dev/null
+++ b/0006-set-default-boot-commands-on-omap4-to-use-extlinux.patch
@@ -0,0 +1,63 @@
+From dd50978404ca7441955047c573c5a30dfdffad75 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis@ausil.us>
+Date: Mon, 2 Sep 2013 11:52:59 -0500
+Subject: [PATCH 6/6] set default boot commands on omap4 to use extlinux
+
+---
+ include/configs/omap4_common.h | 21 +++++++++++++++++++--
+ 1 file changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
+index 634668a..eb1024d 100644
+--- a/include/configs/omap4_common.h
++++ b/include/configs/omap4_common.h
+@@ -155,6 +155,22 @@
+ 		"vram=${vram} " \
+ 		"root=${mmcroot} " \
+ 		"rootfstype=${mmcrootfstype}\0" \
++	"bootcmd_setup=mmc rescan\0" \
++	"bootcmd_pxe=setenv bootfile \"\" ;dhcp; pxe get; pxe boot\0" \
++	"bootcmd_disk_scr=ext2load ${boot_ifc} ${bootdevice} ${scr_addr_r} boot.scr && source ${scr_addr_r}\0" \
++	"bootcmd_disk_sysboot1=setenv bootfile /boot/extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
++	"bootcmd_disk_sysboot2=setenv bootfile /extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
++	"bootcmd_disk_uenv=ext2load ${boot_ifc} ${bootdevice} ${uenv_addr_r} uEnv.txt; env import -t ${uenv_addr_r} ${filesize}; run bootcmd_uenv\0" \
++	"bootcmd_disk_kernel=ext2load ${boot_ifc} ${bootdevice} ${kernel_addr_r} vmlinuz && ext2load ${boot_ifc} ${bootdevice} ${ramdisk_addr_r} initrd.img && bootz ${kernel_addr_r} ${ramdisk_a
++	"bootcmd_disk=run bootcmd_disk_sysboot1; run bootcmd_disk_sysboot2; run bootcmd_disk_uenv; run bootcmd_disk_scr; run bootcmd_disk_kernel\0" \
++	"bootcmd_mmc=setenv boot_ifc mmc; mmc rescan && run bootcmd_disk\0" \
++	"bootcmd_default=run bootcmd_mmc; run bootcmd_pxe\0" \
++	"localcmd=run bootcmd_mmc\0" \
++	"bootdevice=0\0" \
++	"bootargs=console=${console} root=LABEL=rootfs\0" \
++	"bootdelay=2\0" \
++	"bootretry=90\0" \
++	"netretry=once\0" \
+ 	"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
+ 	"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
+ 		"source ${loadaddr}\0" \
+@@ -164,7 +180,7 @@
+ 	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
+ 	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
+ 		"run mmcargs; " \
+-		"bootz ${loadaddr} - ${fdtaddr}\0" \
++		"bootz ${loadaddr} - ${fdt_addr}\0" \
+ 	"findfdt="\
+ 		"if test $board_name = sdp4430; then " \
+ 			"setenv fdtfile omap4-sdp.dtb; fi; " \
+@@ -176,12 +192,13 @@
+ 			"setenv fdtfile omap4-panda-es.dtb; fi;" \
+ 		"if test $fdtfile = undefined; then " \
+ 			"echo WARNING: Could not determine device tree to use; fi; \0" \
+-	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
++	"loadfdt=load mmc ${bootpart} ${fdt_addr} ${bootdir}/${fdtfile}\0" \
+ 
+ #define CONFIG_BOOTCOMMAND \
+ 	"run findfdt; " \
+ 	"mmc dev ${mmcdev}; if mmc rescan; then " \
+ 		"echo SD/MMC found on device ${mmcdev};" \
++		"run bootcmd_default; " \
+ 		"if run loadbootscript; then " \
+ 			"run bootscript; " \
+ 		"else " \
+-- 
+1.8.3.1
+
diff --git a/0006-set-omap4-to-use-extlinux.conf-by-default.patch b/0006-set-omap4-to-use-extlinux.conf-by-default.patch
new file mode 100644
index 0000000..7f74368
--- /dev/null
+++ b/0006-set-omap4-to-use-extlinux.conf-by-default.patch
@@ -0,0 +1,63 @@
+From 92177bae56489e1f9dd87740a37fbb5f3e15face Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis@ausil.us>
+Date: Mon, 2 Sep 2013 12:35:16 -0500
+Subject: [PATCH 06/16] set omap4 to use extlinux.conf by default
+
+---
+ include/configs/omap4_common.h | 21 +++++++++++++++++++--
+ 1 file changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
+index 634668a..7e22321 100644
+--- a/include/configs/omap4_common.h
++++ b/include/configs/omap4_common.h
+@@ -155,6 +155,22 @@
+ 		"vram=${vram} " \
+ 		"root=${mmcroot} " \
+ 		"rootfstype=${mmcrootfstype}\0" \
++	"bootcmd_setup=mmc rescan\0" \
++	"bootcmd_pxe=setenv bootfile \"\" ;dhcp; pxe get; pxe boot\0" \
++	"bootcmd_disk_scr=ext2load ${boot_ifc} ${bootdevice} ${scr_addr_r} boot.scr && source ${scr_addr_r}\0" \
++	"bootcmd_disk_sysboot1=setenv bootfile /boot/extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
++	"bootcmd_disk_sysboot2=setenv bootfile /extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
++	"bootcmd_disk_uenv=ext2load ${boot_ifc} ${bootdevice} ${uenv_addr_r} uEnv.txt; env import -t ${uenv_addr_r} ${filesize}; run bootcmd_uenv\0" \
++	"bootcmd_disk_kernel=ext2load ${boot_ifc} ${bootdevice} ${kernel_addr_r} vmlinuz && ext2load ${boot_ifc} ${bootdevice} ${ramdisk_addr_r} initrd.img && bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr}\0" \
++	"bootcmd_disk=run bootcmd_disk_sysboot1; run bootcmd_disk_sysboot2; run bootcmd_disk_uenv; run bootcmd_disk_scr; run bootcmd_disk_kernel\0" \
++	"bootcmd_mmc=setenv boot_ifc mmc; mmc rescan && run bootcmd_disk\0" \
++	"bootcmd_default=run bootcmd_mmc; run bootcmd_pxe\0" \
++	"localcmd=run bootcmd_mmc\0" \
++	"bootdevice=0\0" \
++	"bootargs=console=${console} root=LABEL=rootfs\0" \
++	"bootdelay=2\0" \
++	"bootretry=90\0" \
++	"netretry=once\0" \
+ 	"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
+ 	"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
+ 		"source ${loadaddr}\0" \
+@@ -164,7 +180,7 @@
+ 	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
+ 	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
+ 		"run mmcargs; " \
+-		"bootz ${loadaddr} - ${fdtaddr}\0" \
++		"bootz ${loadaddr} - ${fdt_addr}\0" \
+ 	"findfdt="\
+ 		"if test $board_name = sdp4430; then " \
+ 			"setenv fdtfile omap4-sdp.dtb; fi; " \
+@@ -176,12 +192,13 @@
+ 			"setenv fdtfile omap4-panda-es.dtb; fi;" \
+ 		"if test $fdtfile = undefined; then " \
+ 			"echo WARNING: Could not determine device tree to use; fi; \0" \
+-	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
++	"loadfdt=load mmc ${bootpart} ${fdt_addr} ${bootdir}/${fdtfile}\0" \
+ 
+ #define CONFIG_BOOTCOMMAND \
+ 	"run findfdt; " \
+ 	"mmc dev ${mmcdev}; if mmc rescan; then " \
+ 		"echo SD/MMC found on device ${mmcdev};" \
++		"run bootcmd_default; " \
+ 		"if run loadbootscript; then " \
+ 			"run bootscript; " \
+ 		"else " \
+-- 
+1.8.3.1
+
diff --git a/0007-beaglebone-Don-t-trigger-uboot-variable-lenght-limit.patch b/0007-beaglebone-Don-t-trigger-uboot-variable-lenght-limit.patch
deleted file mode 100644
index a062acf..0000000
--- a/0007-beaglebone-Don-t-trigger-uboot-variable-lenght-limit.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 88dfa478398f9fdf8e99c19b39f98b4ce1def19b Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Wed, 3 Apr 2013 11:39:16 +0200
-Subject: [PATCH 07/15] beaglebone: Don't trigger uboot variable lenght limit
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- include/configs/am335x_evm.h | 20 +++-----------------
- 1 file changed, 3 insertions(+), 17 deletions(-)
-
-diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
-index 2547a87..afe7348 100644
---- a/include/configs/am335x_evm.h
-+++ b/include/configs/am335x_evm.h
-@@ -154,23 +154,11 @@
- #define CONFIG_BOOTCOMMAND \
- 	"i2c mw 0x24 1 0x3e; " \
- 	"run findfdt; " \
--	"mmc dev 1; if mmc rescan; then " \
--		"echo SD/MMC found on device ${mmcdev};" \
-+	"if mmc dev 1; then " \
-+		"echo eMMC found;" \
- 		"setenv mmcdev 1;"\
--		"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 loaduimage; then " \
--			"run loadfdt;" \
--			"run mmcboot;" \
--		"fi;" \
- 	"else " \
--		"echo No SD/MMC found on device ${mmcdev};" \
-+		"echo No eMMC found;" \
- 	"fi;" \
- 	"mmc dev ${mmcdev}; if mmc rescan; then " \
- 		"echo SD/MMC found on device ${mmcdev};" \
-@@ -186,8 +174,6 @@
- 			"run loadfdt;" \
- 			"run mmcboot;" \
- 		"fi;" \
--	"else " \
--		"run nandboot;" \
- 	"fi;" \
- 
- /* Clock Defines */
--- 
-1.8.3.1
-
diff --git a/0007-enable-CONFIG_CMD_BOOTMENU-for-distro-configs.patch b/0007-enable-CONFIG_CMD_BOOTMENU-for-distro-configs.patch
new file mode 100644
index 0000000..2d714eb
--- /dev/null
+++ b/0007-enable-CONFIG_CMD_BOOTMENU-for-distro-configs.patch
@@ -0,0 +1,24 @@
+From c1e6848661b1ceb9e912a9408da4a00cdd11e85f Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis@ausil.us>
+Date: Mon, 2 Sep 2013 15:27:53 -0500
+Subject: [PATCH 07/16] enable CONFIG_CMD_BOOTMENU for distro configs
+
+---
+ include/config_distro_default.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/config_distro_default.h b/include/config_distro_default.h
+index b892868..99bb4b1 100644
+--- a/include/config_distro_default.h
++++ b/include/config_distro_default.h
+@@ -25,6 +25,7 @@
+ #define CONFIG_OF_LIBFDT
+ 
+ #define CONFIG_CMD_BOOTZ
++#define CONFIG_CMD_BOOTMENU
+ #define CONFIG_CMD_DHCP
+ #define CONFIG_CMD_ELF
+ #define CONFIG_CMD_EXT2
+-- 
+1.8.3.1
+
diff --git a/0008-DISABLE-FIT-image-support-since-it-fails-to-build.patch b/0008-DISABLE-FIT-image-support-since-it-fails-to-build.patch
new file mode 100644
index 0000000..96fbe1d
--- /dev/null
+++ b/0008-DISABLE-FIT-image-support-since-it-fails-to-build.patch
@@ -0,0 +1,24 @@
+From 07771da98733fae6a6939a78b0971bcc24e9748f Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis@ausil.us>
+Date: Mon, 2 Sep 2013 15:56:16 -0500
+Subject: [PATCH 08/16] DISABLE FIT image support since it fails to build
+
+---
+ include/config_distro_default.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/include/config_distro_default.h b/include/config_distro_default.h
+index 99bb4b1..44731ad 100644
+--- a/include/config_distro_default.h
++++ b/include/config_distro_default.h
+@@ -40,7 +40,6 @@
+ #define CONFIG_AUTO_COMPLETE
+ #define CONFIG_BOOTDELAY     2
+ #define CONFIG_SYS_LONGHELP
+-#define CONFIG_FIT
+ #define CONFIG_MENU
+ #define CONFIG_MENU_SHOW
+ #define CONFIG_DOS_PARTITION
+-- 
+1.8.3.1
+
diff --git a/0008-beaglebone-HACK-change-mmc-order-to-avoid-u-boot-cra.patch b/0008-beaglebone-HACK-change-mmc-order-to-avoid-u-boot-cra.patch
deleted file mode 100644
index 1a11546..0000000
--- a/0008-beaglebone-HACK-change-mmc-order-to-avoid-u-boot-cra.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 3cda7e03119219824f71694ab789e0040d5a5e18 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Wed, 3 Apr 2013 11:47:14 +0200
-Subject: [PATCH 08/15] beaglebone: HACK: change mmc order to avoid u-boot
- crashing
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- include/configs/am335x_evm.h | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
-index afe7348..485f26b 100644
---- a/include/configs/am335x_evm.h
-+++ b/include/configs/am335x_evm.h
-@@ -154,11 +154,12 @@
- #define CONFIG_BOOTCOMMAND \
- 	"i2c mw 0x24 1 0x3e; " \
- 	"run findfdt; " \
--	"if mmc dev 1; then " \
--		"echo eMMC found;" \
--		"setenv mmcdev 1;"\
-+	"mmc dev 0; if mmc rescan ; then " \
-+		"echo micro SD card found;" \
-+		"setenv mmcdev 0;"\
- 	"else " \
--		"echo No eMMC found;" \
-+		"echo No micro SD card found, setting mmcdev to 1;" \
-+		"setenv mmcdev 1;"\
- 	"fi;" \
- 	"mmc dev ${mmcdev}; if mmc rescan; then " \
- 		"echo SD/MMC found on device ${mmcdev};" \
--- 
-1.8.3.1
-
diff --git a/0009-add-defualt-DHCP-config-options.patch b/0009-add-defualt-DHCP-config-options.patch
new file mode 100644
index 0000000..1418611
--- /dev/null
+++ b/0009-add-defualt-DHCP-config-options.patch
@@ -0,0 +1,30 @@
+From 10785df495adbfea7856800a93a2ac14fddbd559 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis@ausil.us>
+Date: Mon, 2 Sep 2013 18:26:17 -0500
+Subject: [PATCH 09/16] add defualt DHCP config options
+
+---
+ include/config_distro_default.h | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/include/config_distro_default.h b/include/config_distro_default.h
+index 44731ad..8c786d2 100644
+--- a/include/config_distro_default.h
++++ b/include/config_distro_default.h
+@@ -14,8 +14,12 @@
+  * required by distros to support boards in a standardised and consitant manner.
+  */
+ 
+-
++#define CONFIG_BOOTP_BOOTPATH
++#define CONFIG_BOOTP_DNS
++#define CONFIG_BOOTP_GATEWAY
++#define CONFIG_BOOTP_HOSTNAME
+ #define CONFIG_BOOTP_PXE
++#define CONFIG_BOOTP_SUBNETMASK
+ 
+ #if defined(__arm__)
+ #define CONFIG_BOOTP_PXE_CLIENTARCH     0x100
+-- 
+1.8.3.1
+
diff --git a/0009-beaglebone-update-bootpart-variable-after-mmc-scan.patch b/0009-beaglebone-update-bootpart-variable-after-mmc-scan.patch
deleted file mode 100644
index 39c1a5f..0000000
--- a/0009-beaglebone-update-bootpart-variable-after-mmc-scan.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f6a70dd6dc7f02c177ac37bae2438415910d2f07 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Wed, 3 Apr 2013 12:04:17 +0200
-Subject: [PATCH 09/15] beaglebone: update bootpart variable after mmc scan
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- include/configs/am335x_evm.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
-index 485f26b..941c6fb 100644
---- a/include/configs/am335x_evm.h
-+++ b/include/configs/am335x_evm.h
-@@ -161,6 +161,7 @@
- 		"echo No micro SD card found, setting mmcdev to 1;" \
- 		"setenv mmcdev 1;"\
- 	"fi;" \
-+	"setenv bootpart ${mmcdev}:2;" \
- 	"mmc dev ${mmcdev}; if mmc rescan; then " \
- 		"echo SD/MMC found on device ${mmcdev};" \
- 		"if run loadbootenv; then " \
--- 
-1.8.3.1
-
diff --git a/0010-am335x_evm-enable-gpio-command.patch b/0010-am335x_evm-enable-gpio-command.patch
deleted file mode 100644
index 11292cd..0000000
--- a/0010-am335x_evm-enable-gpio-command.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ecc20428e97df32c85d07dbadd5ac43d3d7a2977 Mon Sep 17 00:00:00 2001
-From: Jason Kridner <jdk@ti.com>
-Date: Thu, 4 Apr 2013 05:57:00 +0000
-Subject: [PATCH 10/15] am335x_evm: enable gpio command
-
----
- 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 941c6fb..70ace70 100644
---- a/include/configs/am335x_evm.h
-+++ b/include/configs/am335x_evm.h
-@@ -44,7 +44,7 @@
- 
- /* commands to include */
- #include <config_cmd_default.h>
--
-+#define CONFIG_CMD_GPIO
- #define CONFIG_CMD_ASKENV
- #define CONFIG_VERSION_VARIABLE
- 
--- 
-1.8.3.1
-
diff --git a/0010-remove-USB-from-distro-default-not-all-systems-suppo.patch b/0010-remove-USB-from-distro-default-not-all-systems-suppo.patch
new file mode 100644
index 0000000..1482fd1
--- /dev/null
+++ b/0010-remove-USB-from-distro-default-not-all-systems-suppo.patch
@@ -0,0 +1,32 @@
+From d0bf7b6dd3ebe7d9bbf2a84cbb3e8d80f576115c Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis@ausil.us>
+Date: Mon, 2 Sep 2013 18:26:55 -0500
+Subject: [PATCH 10/16] remove USB from distro default, not all systems support
+ USB
+
+---
+ include/config_distro_default.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/include/config_distro_default.h b/include/config_distro_default.h
+index 8c786d2..65a0c17 100644
+--- a/include/config_distro_default.h
++++ b/include/config_distro_default.h
+@@ -38,7 +38,6 @@
+ #define CONFIG_CMD_NET
+ #define CONFIG_CMD_PING
+ #define CONFIG_CMD_PXE
+-#define CONFIG_CMD_USB
+ 
+ #define CONFIG_CMDLINE_EDITING
+ #define CONFIG_AUTO_COMPLETE
+@@ -50,6 +49,5 @@
+ #define CONFIG_EFI_PARTITION
+ #define CONFIG_SUPPORT_RAW_INITRD
+ #define CONFIG_SYS_HUSH_PARSER
+-#define CONFIG_USB_STORAGE
+ 
+ #endif	/* _CONFIG_CMD_DISTRO_DEFAULT_H */
+-- 
+1.8.3.1
+
diff --git a/0011-am335x_evm-HACK-to-turn-on-BeagleBone-LEDs.patch b/0011-am335x_evm-HACK-to-turn-on-BeagleBone-LEDs.patch
deleted file mode 100644
index 9471233..0000000
--- a/0011-am335x_evm-HACK-to-turn-on-BeagleBone-LEDs.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 49f32a629c69828226995fc6234818b1e206e2c3 Mon Sep 17 00:00:00 2001
-From: Jason Kridner <jdk@ti.com>
-Date: Thu, 4 Apr 2013 07:16:41 +0000
-Subject: [PATCH 11/15] am335x_evm: HACK to turn on BeagleBone LEDs
-
-* This might break non-BeagleBone platforms
----
- include/configs/am335x_evm.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
-index 70ace70..37c4b2b 100644
---- a/include/configs/am335x_evm.h
-+++ b/include/configs/am335x_evm.h
-@@ -152,6 +152,7 @@
- #endif
- 
- #define CONFIG_BOOTCOMMAND \
-+	"gpio set 53; " \
- 	"i2c mw 0x24 1 0x3e; " \
- 	"run findfdt; " \
- 	"mmc dev 0; if mmc rescan ; then " \
-@@ -163,6 +164,7 @@
- 	"fi;" \
- 	"setenv bootpart ${mmcdev}:2;" \
- 	"mmc dev ${mmcdev}; if mmc rescan; then " \
-+		"gpio set 54; " \
- 		"echo SD/MMC found on device ${mmcdev};" \
- 		"if run loadbootenv; then " \
- 			"echo Loaded environment from ${bootenv};" \
-@@ -172,7 +174,9 @@
- 			"echo Running uenvcmd ...;" \
- 			"run uenvcmd;" \
- 		"fi;" \
-+		"gpio set 55; " \
- 		"if run loaduimage; then " \
-+			"gpio set 56; " \
- 			"run loadfdt;" \
- 			"run mmcboot;" \
- 		"fi;" \
--- 
-1.8.3.1
-
diff --git a/0011-set-omap5-up-to-use-generic-distro-configs.patch b/0011-set-omap5-up-to-use-generic-distro-configs.patch
new file mode 100644
index 0000000..c33dd3d
--- /dev/null
+++ b/0011-set-omap5-up-to-use-generic-distro-configs.patch
@@ -0,0 +1,64 @@
+From 1db2e06693b7f1233b8568d8f2390f1c09db6e23 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis@ausil.us>
+Date: Mon, 2 Sep 2013 21:40:34 -0500
+Subject: [PATCH 11/16] set omap5 up to use generic distro configs
+
+---
+ include/configs/omap5_common.h    | 10 +++++++---
+ include/configs/ti_armv7_common.h |  3 +++
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/include/configs/omap5_common.h b/include/configs/omap5_common.h
+index 8e82fed..dd300d7 100644
+--- a/include/configs/omap5_common.h
++++ b/include/configs/omap5_common.h
+@@ -68,9 +68,13 @@
+ 
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+ 	"loadaddr=0x82000000\0" \
++	"pxefile_addr_r=0x82000000\0" \
++	"kernel_addr_r=0x84000000\0" \
++	"ramdisk_addr_r=0x90000000\0" \
++	"fdt_addr_r=0x83000000\0" \
+ 	"console=" CONSOLEDEV ",115200n8\0" \
+ 	"fdt_high=0xffffffff\0" \
+-	"fdtaddr=0x80f80000\0" \
++	"fdt_addr=0x80f80000\0" \
+ 	"fdtfile=undefined\0" \
+ 	"bootpart=0:2\0" \
+ 	"bootdir=/boot\0" \
+@@ -96,7 +100,7 @@
+ 	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
+ 	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
+ 		"run mmcargs; " \
+-		"bootz ${loadaddr} - ${fdtaddr}\0" \
++		"bootz ${loadaddr} - ${fdt_addr}\0" \
+ 	"findfdt="\
+ 		"if test $board_name = omap5_uevm; then " \
+ 			"setenv fdtfile omap5-uevm.dtb; fi; " \
+@@ -104,7 +108,7 @@
+ 			"setenv fdtfile dra7-evm.dtb; fi;" \
+ 		"if test $fdtfile = undefined; then " \
+ 			"echo WARNING: Could not determine device tree to use; fi; \0" \
+-	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile};\0" \
++	"loadfdt=load mmc ${bootpart} ${fdt_addr} ${bootdir}/${fdtfile};\0" \
+ 
+ #define CONFIG_BOOTCOMMAND \
+ 	"run findfdt; " \
+diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
+index e0ab691..f8887a4 100644
+--- a/include/configs/ti_armv7_common.h
++++ b/include/configs/ti_armv7_common.h
+@@ -148,6 +148,9 @@
+ #define CONFIG_CMD_ECHO
+ #define CONFIG_CMD_BOOTZ
+ 
++/* enable generic distro config */
++#define DISTRO_DEFAULTS 1
++
+ /*
+  * Common filesystems support.  When we have removable storage we
+  * enabled a number of useful commands and support.
+-- 
+1.8.3.1
+
diff --git a/0012-Fix-for-screen-rolling-when-video-played-back-in-bro.patch b/0012-Fix-for-screen-rolling-when-video-played-back-in-bro.patch
deleted file mode 100644
index 07754a8..0000000
--- a/0012-Fix-for-screen-rolling-when-video-played-back-in-bro.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From b5ed0359e7d6a489fc8a293d8b427515e08b90dc Mon Sep 17 00:00:00 2001
-From: Darren Etheridge <detheridge@ti.com>
-Date: Tue, 9 Apr 2013 16:49:38 -0500
-Subject: [PATCH 12/15] Fix for screen rolling when video played back in
- browser on BeagleBone Black This value might need some tweaking, but it
- effectively allows the LCDC and the ARM to play fairer in memory, so the LCDC
- does not get starved causing the screen to roll See Page 439 in spruh73g
- (AM33xx TRM) for details
-
----
- arch/arm/cpu/armv7/am33xx/ddr.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/arch/arm/cpu/armv7/am33xx/ddr.c b/arch/arm/cpu/armv7/am33xx/ddr.c
-index d1e2fd3..3a93db1 100644
---- a/arch/arm/cpu/armv7/am33xx/ddr.c
-+++ b/arch/arm/cpu/armv7/am33xx/ddr.c
-@@ -21,6 +21,12 @@ http://www.ti.com/
- #include <asm/io.h>
- #include <asm/emif.h>
- 
-+/* This value might need some tweaking, but it effectively allows the LCDC */
-+/* and the ARM to play fairer in memory, so the LCDC does not get starved causing */
-+/* the screen to roll */
-+/* See Page 439 in spruh73g (AM33xx TRM) for details */
-+#define AM33XX_INT_CONFIG_COUNT 0x00303030
-+
- /**
-  * Base address for EMIF instances
-  */
-@@ -79,6 +85,10 @@ void set_sdram_timings(const struct emif_regs *regs, int nr)
- 	writel(regs->sdram_tim2, &emif_reg[nr]->emif_sdram_tim_2_shdw);
- 	writel(regs->sdram_tim3, &emif_reg[nr]->emif_sdram_tim_3);
- 	writel(regs->sdram_tim3, &emif_reg[nr]->emif_sdram_tim_3_shdw);
-+
-+	/* Configure INT_CONFIG value so that LCDC does not get stalled */
-+	/* for a long time if ARM is accessing memory */
-+	writel(AM33XX_INT_CONFIG_COUNT, &emif_reg[nr]->emif_l3_config);
- }
- 
- /**
--- 
-1.8.3.1
-
diff --git a/0012-setup-omap5-to-load-extlinux.conf.patch b/0012-setup-omap5-to-load-extlinux.conf.patch
new file mode 100644
index 0000000..b4612d0
--- /dev/null
+++ b/0012-setup-omap5-to-load-extlinux.conf.patch
@@ -0,0 +1,47 @@
+From 9dfd6b636f38b29b97ef11aa1bd515e32912ca1d Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis@ausil.us>
+Date: Mon, 2 Sep 2013 21:43:54 -0500
+Subject: [PATCH 12/16] setup omap5 to load extlinux.conf
+
+---
+ include/configs/omap5_common.h | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/include/configs/omap5_common.h b/include/configs/omap5_common.h
+index dd300d7..7ffc000 100644
+--- a/include/configs/omap5_common.h
++++ b/include/configs/omap5_common.h
+@@ -91,6 +91,22 @@
+ 		"vram=${vram} " \
+ 		"root=${mmcroot} " \
+ 		"rootfstype=${mmcrootfstype}\0" \
++	"bootcmd_setup=mmc rescan\0" \
++	"bootcmd_pxe=setenv bootfile \"\" ;dhcp; pxe get; pxe boot\0" \
++	"bootcmd_disk_scr=ext2load ${boot_ifc} ${bootdevice} ${scr_addr_r} boot.scr && source ${scr_addr_r}\0" \
++	"bootcmd_disk_sysboot1=setenv bootfile /boot/extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
++	"bootcmd_disk_sysboot2=setenv bootfile /extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
++	"bootcmd_disk_uenv=ext2load ${boot_ifc} ${bootdevice} ${uenv_addr_r} uEnv.txt; env import -t ${uenv_addr_r} ${filesize}; run bootcmd_uenv\0" \
++	"bootcmd_disk_kernel=ext2load ${boot_ifc} ${bootdevice} ${kernel_addr_r} vmlinuz && ext2load ${boot_ifc} ${bootdevice} ${ramdisk_addr_r} initrd.img && bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr}\0" \
++	"bootcmd_disk=run bootcmd_disk_sysboot1; run bootcmd_disk_sysboot2; run bootcmd_disk_uenv; run bootcmd_disk_scr; run bootcmd_disk_kernel\0" \
++	"bootcmd_mmc=setenv boot_ifc mmc; mmc rescan && run bootcmd_disk\0" \
++	"bootcmd_default=run bootcmd_mmc; run bootcmd_pxe\0" \
++	"localcmd=run bootcmd_mmc\0" \
++	"bootdevice=0\0" \
++	"bootargs=console=${console} root=LABEL=rootfs\0" \
++	"bootdelay=2\0" \
++	"bootretry=90\0" \
++	"netretry=once\0" \
+ 	"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
+ 	"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
+ 		"source ${loadaddr}\0" \
+@@ -113,6 +129,7 @@
+ #define CONFIG_BOOTCOMMAND \
+ 	"run findfdt; " \
+ 	"mmc dev ${mmcdev}; if mmc rescan; then " \
++		"run bootcmd_default; " \
+ 		"if run loadbootscript; then " \
+ 			"run bootscript; " \
+ 		"else " \
+-- 
+1.8.3.1
+
diff --git a/0013-Setup-beagleboard-to-used-generic-distro-configs.patch b/0013-Setup-beagleboard-to-used-generic-distro-configs.patch
new file mode 100644
index 0000000..20a577b
--- /dev/null
+++ b/0013-Setup-beagleboard-to-used-generic-distro-configs.patch
@@ -0,0 +1,57 @@
+From 697cda9d70d6eb5aff2a3984ecf51967e74a9592 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis@ausil.us>
+Date: Mon, 2 Sep 2013 21:47:40 -0500
+Subject: [PATCH 13/16] Setup beagleboard to used generic distro configs
+
+---
+ include/configs/omap3_beagle.h | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
+index c1245e7..11426c5 100644
+--- a/include/configs/omap3_beagle.h
++++ b/include/configs/omap3_beagle.h
+@@ -130,6 +130,9 @@
+ /* commands to include */
+ #include <config_cmd_default.h>
+ 
++/* enable generic distro config */
++#define DISTRO_DEFAULTS 1
++
+ #define CONFIG_CMD_ASKENV
+ 
+ #define CONFIG_CMD_CACHE
+@@ -194,9 +197,13 @@
+ 
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+ 	"loadaddr=0x80200000\0" \
++	"pxefile_addr_r=0x82000000\0" \
++	"kernel_addr_r=0x84000000\0" \
++	"ramdisk_addr_r=0x90000000\0" \
++	"fdt_addr_r=0x83000000\0" \
+ 	"rdaddr=0x81000000\0" \
+ 	"fdt_high=0xffffffff\0" \
+-	"fdtaddr=0x80f80000\0" \
++	"fdt_addr=0x80f80000\0" \
+ 	"usbtty=cdc_acm\0" \
+ 	"bootfile=uImage\0" \
+ 	"ramdisk=ramdisk.gz\0" \
+@@ -263,13 +270,13 @@
+ 		"rootfstype=${ramrootfstype}\0" \
+ 	"loadramdisk=load mmc ${bootpart} ${rdaddr} ${bootdir}/${ramdisk}\0" \
+ 	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
+-	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
++	"loadfdt=load mmc ${bootpart} ${fdt_addr} ${bootdir}/${fdtfile}\0" \
+ 	"mmcboot=echo Booting from mmc ...; " \
+ 		"run mmcargs; " \
+ 		"bootm ${loadaddr}\0" \
+ 	"mmcbootz=echo Booting with DT from mmc${mmcdev} ...; " \
+ 		"run mmcargs; " \
+-		"bootz ${loadaddr} - ${fdtaddr}\0" \
++		"bootz ${loadaddr} - ${fdt_addr}\0" \
+ 	"nandboot=echo Booting from nand ...; " \
+ 		"run nandargs; " \
+ 		"nand read ${loadaddr} 280000 400000; " \
+-- 
+1.8.3.1
+
diff --git a/0013-beaglebone-enable-CONFIG_SUPPORT_RAW_INITRD-option.patch b/0013-beaglebone-enable-CONFIG_SUPPORT_RAW_INITRD-option.patch
deleted file mode 100644
index 92a46a7..0000000
--- a/0013-beaglebone-enable-CONFIG_SUPPORT_RAW_INITRD-option.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 69204af251563cc8300ef681bfd5132944972a40 Mon Sep 17 00:00:00 2001
-From: Robert Nelson <robertcnelson@gmail.com>
-Date: Thu, 25 Apr 2013 13:50:35 -0500
-Subject: [PATCH 13/15] beaglebone: enable CONFIG_SUPPORT_RAW_INITRD option
-
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
----
- include/configs/am335x_evm.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
-index 37c4b2b..d6b79ca 100644
---- a/include/configs/am335x_evm.h
-+++ b/include/configs/am335x_evm.h
-@@ -36,6 +36,7 @@
- 
- #define CONFIG_OF_LIBFDT
- #define CONFIG_CMD_BOOTZ
-+#define CONFIG_SUPPORT_RAW_INITRD
- #define CONFIG_CMDLINE_TAG		/* enable passing of ATAGs */
- #define CONFIG_SETUP_MEMORY_TAGS
- #define CONFIG_INITRD_TAG
--- 
-1.8.3.1
-
diff --git a/0014-mmc-Add-RSTN-enable-for-emmc.patch b/0014-mmc-Add-RSTN-enable-for-emmc.patch
deleted file mode 100644
index 145c1ec..0000000
--- a/0014-mmc-Add-RSTN-enable-for-emmc.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From d24d6e58aa0d5d64c3d9df3fd4d20c17680a6e8e Mon Sep 17 00:00:00 2001
-From: Dennis Gilmore <dennis@ausil.us>
-Date: Thu, 4 Jul 2013 10:53:10 -0500
-Subject: [PATCH 14/15] mmc: Add RSTN enable for emmc
-
-eMMC has the capability of using an external RSTn line.
-It has to be enabled via an access to the ECSD so add a command to do so.
-
-Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
----
- common/cmd_mmc.c  | 24 ++++++++++++++++++++++++
- drivers/mmc/mmc.c | 32 ++++++++++++++++++++++++++++++++
- include/mmc.h     |  4 ++++
- 3 files changed, 60 insertions(+)
-
-diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
-index 5f1ed43..87f8577 100644
---- a/common/cmd_mmc.c
-+++ b/common/cmd_mmc.c
-@@ -238,6 +238,29 @@ static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
- 			return CMD_RET_USAGE;
- 		print_mmc_devices('\n');
- 		return 0;
-+	} else if (strncmp(argv[1], "rstn", 4) == 0) {
-+		struct mmc *mmc;
-+		u8 val;
-+		int err;
-+
-+		if (argc != 3)
-+			return CMD_RET_USAGE;
-+
-+		val = simple_strtol(argv[2], NULL, 10);
-+
-+		mmc = find_mmc_device(curr_device);
-+		if (!mmc) {
-+			printf("no mmc device at slot %x\n", curr_device);
-+			return 1;
-+		}
-+		err = mmc_set_rst_n(mmc, val);
-+		if (err != 0) {
-+			printf("failed to set RST_N to 0x%02x\n",
-+					(unsigned int)val & 0xff);
-+			return 1;
-+		}
-+
-+		return 0;
- 	} else if (strcmp(argv[1], "dev") == 0) {
- 		int dev, part = -1;
- 		struct mmc *mmc;
-@@ -431,6 +454,7 @@ U_BOOT_CMD(
- 	"mmc part - lists available partition on current mmc device\n"
- 	"mmc dev [dev] [part] - show or set current mmc device [partition]\n"
- 	"mmc list - lists available devices\n"
-+	"mmc rstn - enable hardware reset of emmc\n"
- #ifdef CONFIG_SUPPORT_EMMC_BOOT
- 	"mmc open <dev> <boot_partition>\n"
- 	" - Enable boot_part for booting and enable R/W access of boot_part\n"
-diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
-index 73f7195..b866d77 100644
---- a/drivers/mmc/mmc.c
-+++ b/drivers/mmc/mmc.c
-@@ -1491,6 +1491,38 @@ static void do_preinit(void)
- }
- 
- 
-+/* enable hardware reset signal */
-+int mmc_set_rst_n(struct mmc *mmc, u8 val)
-+{
-+	ALLOC_CACHE_ALIGN_BUFFER(u8, ext_csd, 512);
-+	int err;
-+
-+	memset(ext_csd, 0, 512);
-+	err = mmc_send_ext_csd(mmc, ext_csd);
-+	if (err)
-+		return err;
-+
-+	printf("before: RST_N=0x%02x\n",
-+			(unsigned int)ext_csd[EXT_CSD_RST_N_FUNCTION] & 0xff);
-+
-+	printf("setting rstn to 0x%02x\n", (unsigned int)val & 0xff);
-+
-+	err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL,
-+			EXT_CSD_RST_N_FUNCTION, val);
-+	if (err)
-+		return err;
-+
-+	memset(ext_csd, 0, 512);
-+	err = mmc_send_ext_csd(mmc, ext_csd);
-+	if (err)
-+		return err;
-+
-+	printf("after: RST_N=0x%02x\n",
-+			(unsigned int)ext_csd[EXT_CSD_RST_N_FUNCTION] & 0xff);
-+
-+	return 0;
-+}
-+
- int mmc_initialize(bd_t *bis)
- {
- 	INIT_LIST_HEAD (&mmc_devices);
-diff --git a/include/mmc.h b/include/mmc.h
-index 583c30e..a9f68dc 100644
---- a/include/mmc.h
-+++ b/include/mmc.h
-@@ -165,6 +165,7 @@
-  */
- #define EXT_CSD_GP_SIZE_MULT		143	/* R/W */
- #define EXT_CSD_PARTITIONING_SUPPORT	160	/* RO */
-+#define EXT_CSD_RST_N_FUNCTION          162     /* R/W */
- #define EXT_CSD_RPMB_MULT		168	/* RO */
- #define EXT_CSD_ERASE_GROUP_DEF		175	/* R/W */
- #define EXT_CSD_BOOT_BUS_WIDTH		177
-@@ -178,6 +179,7 @@
- #define EXT_CSD_HC_ERASE_GRP_SIZE	224	/* RO */
- #define EXT_CSD_BOOT_MULT		226	/* RO */
- 
-+
- /*
-  * EXT_CSD field definitions
-  */
-@@ -357,4 +359,6 @@ struct mmc *mmc_spi_init(uint bus, uint cs, uint speed, uint mode);
- int mmc_legacy_init(int verbose);
- #endif
- 
-+int mmc_set_rst_n(struct mmc *mmc, u8 val);
-+
- #endif /* _MMC_H_ */
--- 
-1.8.3.1
-
diff --git a/0014-setup-beagleboard-to-load-extlinux.conf.patch b/0014-setup-beagleboard-to-load-extlinux.conf.patch
new file mode 100644
index 0000000..5f7f131
--- /dev/null
+++ b/0014-setup-beagleboard-to-load-extlinux.conf.patch
@@ -0,0 +1,47 @@
+From 57ed04c0f92c8eb06af2984001b9792fcbdc653b Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis@ausil.us>
+Date: Mon, 2 Sep 2013 21:55:37 -0500
+Subject: [PATCH 14/16] setup beagleboard to load extlinux.conf
+
+---
+ include/configs/omap3_beagle.h | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
+index 11426c5..80587bb 100644
+--- a/include/configs/omap3_beagle.h
++++ b/include/configs/omap3_beagle.h
+@@ -255,6 +255,22 @@
+ 			"setenv fdtfile omap3-beagle-xm.dtb; fi; " \
+ 		"if test $fdtfile = undefined; then " \
+ 			"echo WARNING: Could not determine device tree to use; fi; \0" \
++	"bootcmd_setup=mmc rescan\0" \
++	"bootcmd_pxe=setenv bootfile \"\" ;dhcp; pxe get; pxe boot\0" \
++	"bootcmd_disk_scr=ext2load ${boot_ifc} ${bootdevice} ${scr_addr_r} boot.scr && source ${scr_addr_r}\0" \
++	"bootcmd_disk_sysboot1=setenv bootfile /boot/extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
++	"bootcmd_disk_sysboot2=setenv bootfile /extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
++	"bootcmd_disk_uenv=ext2load ${boot_ifc} ${bootdevice} ${uenv_addr_r} uEnv.txt; env import -t ${uenv_addr_r} ${filesize}; run bootcmd_uenv\0" \
++	"bootcmd_disk_kernel=ext2load ${boot_ifc} ${bootdevice} ${kernel_addr_r} vmlinuz && ext2load ${boot_ifc} ${bootdevice} ${ramdisk_addr_r} initrd.img && bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr}\0" \
++	"bootcmd_disk=run bootcmd_disk_sysboot1; run bootcmd_disk_sysboot2; run bootcmd_disk_uenv; run bootcmd_disk_scr; run bootcmd_disk_kernel\0" \
++	"bootcmd_mmc=setenv boot_ifc mmc; mmc rescan && run bootcmd_disk\0" \
++	"bootcmd_default=run bootcmd_mmc; run bootcmd_pxe\0" \
++	"localcmd=run bootcmd_mmc\0" \
++	"bootdevice=0\0" \
++	"bootargs=console=${console} root=LABEL=rootfs\0" \
++	"bootdelay=2\0" \
++	"bootretry=90\0" \
++	"netretry=once\0" \
+ 	"bootenv=uEnv.txt\0" \
+ 	"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
+ 	"importbootenv=echo Importing environment from mmc ...; " \
+@@ -292,6 +308,7 @@
+ #define CONFIG_BOOTCOMMAND \
+ 	"run findfdt; " \
+ 	"mmc dev ${mmcdev}; if mmc rescan; then " \
++                "run bootcmd_default; " \
+ 		"if run userbutton; then " \
+ 			"setenv bootenv uEnv.txt;" \
+ 		"else " \
+-- 
+1.8.3.1
+
diff --git a/0015-setup-address-variables-needed-for-distro-config.patch b/0015-setup-address-variables-needed-for-distro-config.patch
new file mode 100644
index 0000000..54c4a77
--- /dev/null
+++ b/0015-setup-address-variables-needed-for-distro-config.patch
@@ -0,0 +1,59 @@
+From 90e8c16399acfe095309117f47abebd7bc89d9e4 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis@ausil.us>
+Date: Mon, 2 Sep 2013 22:05:04 -0500
+Subject: [PATCH 15/16] setup address variables needed for distro config
+
+---
+ include/configs/am335x_evm.h | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
+index e0a87f8..837fff4 100644
+--- a/include/configs/am335x_evm.h
++++ b/include/configs/am335x_evm.h
+@@ -57,7 +57,11 @@
+ #ifndef CONFIG_SPL_BUILD
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+ 	"loadaddr=0x80200000\0" \
+-	"fdtaddr=0x80F80000\0" \
++	"pxefile_addr_r=0x82000000\0" \
++	"kernel_addr_r=0x84000000\0" \
++	"ramdisk_addr_r=0x90000000\0" \
++	"fdt_addr_r=0x83000000\0" \
++	"fdt_addr=0x80F80000\0" \
+ 	"fdt_high=0xffffffff\0" \
+ 	"boot_fdt=try\0" \
+ 	"rdaddr=0x81000000\0" \
+@@ -106,11 +110,11 @@
+ 		"rootfstype=${ramrootfstype}\0" \
+ 	"loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
+ 	"loaduimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
+-	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
++	"loadfdt=load mmc ${bootpart} ${fdt_addr} ${bootdir}/${fdtfile}\0" \
+ 	"mmcloados=run mmcargs; " \
+ 		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+ 			"if run loadfdt; then " \
+-				"bootm ${loadaddr} - ${fdtaddr}; " \
++				"bootm ${loadaddr} - ${fdt_addr}; " \
+ 			"else " \
+ 				"if test ${boot_fdt} = try; then " \
+ 					"bootm; " \
+@@ -143,12 +147,12 @@
+ 		"setenv autoload no; " \
+ 		"dhcp; " \
+ 		"tftp ${loadaddr} ${bootfile}; " \
+-		"tftp ${fdtaddr} ${fdtfile}; " \
++		"tftp ${fdt_addr} ${fdtfile}; " \
+ 		"run netargs; " \
+-		"bootm ${loadaddr} - ${fdtaddr}\0" \
++		"bootm ${loadaddr} - ${fdt_addr}\0" \
+ 	"ramboot=echo Booting from ramdisk ...; " \
+ 		"run ramargs; " \
+-		"bootm ${loadaddr} ${rdaddr} ${fdtaddr}\0" \
++		"bootm ${loadaddr} ${rdaddr} ${fdt_addr}\0" \
+ 	"findfdt="\
+ 		"if test $board_name = A335BONE; then " \
+ 			"setenv fdtfile am335x-bone.dtb; fi; " \
+-- 
+1.8.3.1
+
diff --git a/0015-wandboard-add-pxe-support-set-default-boot-command-l.patch b/0015-wandboard-add-pxe-support-set-default-boot-command-l.patch
deleted file mode 100644
index 267c257..0000000
--- a/0015-wandboard-add-pxe-support-set-default-boot-command-l.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From e156720cf4ca48c3e955b0e48f17bf324fe992f4 Mon Sep 17 00:00:00 2001
-From: Dennis Gilmore <dennis@ausil.us>
-Date: Wed, 17 Jul 2013 09:11:57 -0500
-Subject: [PATCH 15/15] wandboard: add pxe support, set default boot command
- like highbank
-
----
- include/configs/wandboard.h | 42 +++++++++++++++++++++++++++++++++++++++---
- 1 file changed, 39 insertions(+), 3 deletions(-)
-
-diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
-index ee6bf21..159f950 100644
---- a/include/configs/wandboard.h
-+++ b/include/configs/wandboard.h
-@@ -58,6 +58,8 @@
- #define CONFIG_LOADADDR			0x12000000
- #define CONFIG_SYS_TEXT_BASE		0x17800000
- 
-+#define CONFIG_SUPPORT_RAW_INITRD
-+
- /* MMC Configuration */
- #define CONFIG_FSL_ESDHC
- #define CONFIG_FSL_USDHC
-@@ -72,6 +74,14 @@
- #define CONFIG_CMD_FAT
- #define CONFIG_DOS_PARTITION
- 
-+/* PXE support */
-+#define CONFIG_BOOTP_PXE
-+#define CONFIG_BOOTP_PXE_CLIENTARCH     0x100
-+#define CONFIG_BOOTP_VCI_STRING         "U-boot.armv7.wandboard"
-+#define CONFIG_CMD_PXE
-+#define CONFIG_MENU
-+
-+
- /* Ethernet Configuration */
- #define CONFIG_CMD_PING
- #define CONFIG_CMD_DHCP
-@@ -117,7 +127,32 @@
- 	"initrd_high=0xffffffff\0" \
- 	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
- 	"fdt_addr=0x11000000\0" \
-+	"pxefile_addr_r=0x12000000\0" \
-+	"kernel_addr_r=0x13000000\0" \
-+	"ramdisk_addr_r=0x32000000\0" \
-+	"fdt_addr_r=0x11000000\0" \
- 	"boot_fdt=try\0" \
-+	"bootcmd_setup=mmc rescan\0" \
-+	"bootcmd_pxe=setenv bootfile \"\" ;dhcp; pxe get; pxe boot\0" \
-+	"bootcmd_disk_scr=ext2load ${boot_ifc} ${bootdevice} ${scr_addr_r} boot.scr && source ${scr_addr_r}\0" \
-+	"bootcmd_disk_sysboot1=setenv bootfile /boot/extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
-+	"bootcmd_disk_sysboot2=setenv bootfile /extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
-+	"bootcmd_disk_uenv=ext2load ${boot_ifc} ${bootdevice} ${uenv_addr_r} uEnv.txt; env import -t ${uenv_addr_r} ${filesize}; run bootcmd_uenv\0" \
-+	"bootcmd_disk_kernel=ext2load ${boot_ifc} ${bootdevice} ${kernel_addr_r} vmlinuz && ext2load ${boot_ifc} ${bootdevice} ${ramdisk_addr_r} initrd.img && bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr}\0" \
-+	"bootcmd_disk=run bootcmd_disk_sysboot1; run bootcmd_disk_sysboot2; run bootcmd_disk_uenv; run bootcmd_disk_scr; run bootcmd_disk_kernel\0" \
-+	"bootcmd_sata=setenv boot_ifc scsi; scsi scan && run bootcmd_disk\0" \
-+	"bootcmd_mmc=setenv boot_ifc mmc; mmc rescan && run bootcmd_disk\0" \
-+	"bootcmd_default=run bootcmd_mmc; run bootcmd_sata; run bootcmd_pxe\0" \
-+	"bootcmd0=run bootcmd_setup; run bootcmd_default\0" \
-+	"bootcmd1=run bootcmd_setup; run bootcmd_pxe; run bootcmd_default\0" \
-+	"bootcmd2=run bootcmd_setup; run bootcmd_sata; run bootcmd_default\0" \
-+	"bootcmd15=run bootcmd_setup; run bootcmd_mmc; run bootcmd_default\0" \
-+	"localcmd=run bootcmd_sata\0" \
-+	"bootdevice=0\0" \
-+	"bootargs=console=ttymxc0 root=LABEL=rootfs\0" \
-+	"bootdelay=2\0" \
-+	"bootretry=90\0" \
-+	"netretry=once\0" \
- 	"ip_dyn=yes\0" \
- 	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
- 	"mmcpart=1\0" \
-@@ -139,11 +174,11 @@
- 	"mmcargs=setenv bootargs console=${console},${baudrate} " \
- 		"root=${mmcroot}\0" \
- 	"loadbootscript=" \
--		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
-+		"load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
- 	"bootscript=echo Running bootscript from mmc ...; " \
- 		"source\0" \
--	"loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
--	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
-+	"loaduimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
-+	"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
- 	"mmcboot=echo Booting from mmc ...; " \
- 		"run mmcargs; " \
- 		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-@@ -186,6 +221,7 @@
- 
- #define CONFIG_BOOTCOMMAND \
- 	   "mmc dev ${mmcdev}; if mmc rescan; then " \
-+		   "run bootcmd_default; " \
- 		   "if run loadbootscript; then " \
- 			   "run bootscript; " \
- 		   "else " \
--- 
-1.8.3.1
-
diff --git a/0016-setup-am335x_evm-to-load-extlinux.conf.patch b/0016-setup-am335x_evm-to-load-extlinux.conf.patch
new file mode 100644
index 0000000..a3ba644
--- /dev/null
+++ b/0016-setup-am335x_evm-to-load-extlinux.conf.patch
@@ -0,0 +1,47 @@
+From 81734e836b590b556cd91586f3d0f86d0ffe35d8 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis@ausil.us>
+Date: Mon, 2 Sep 2013 22:09:55 -0500
+Subject: [PATCH 16/16] setup am335x_evm to load extlinux.conf
+
+---
+ include/configs/am335x_evm.h | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
+index 837fff4..c49b19c 100644
+--- a/include/configs/am335x_evm.h
++++ b/include/configs/am335x_evm.h
+@@ -128,6 +128,7 @@
+ 	"mmcboot=mmc dev ${mmcdev}; " \
+ 		"if mmc rescan; then " \
+ 			"echo SD/MMC found on device ${mmcdev};" \
++			"run bootcmd_default; " \
+ 			"if run loadbootenv; then " \
+ 				"echo Loaded environment from ${bootenv};" \
+ 				"run importbootenv;" \
+@@ -164,6 +165,22 @@
+ 			"setenv fdtfile am335x-evmsk.dtb; fi; " \
+ 		"if test $fdtfile = undefined; then " \
+ 			"echo WARNING: Could not determine device tree to use; fi; \0" \
++	"bootcmd_setup=mmc rescan\0" \
++	"bootcmd_pxe=setenv bootfile \"\" ;dhcp; pxe get; pxe boot\0" \
++	"bootcmd_disk_scr=ext2load ${boot_ifc} ${bootdevice} ${scr_addr_r} boot.scr && source ${scr_addr_r}\0" \
++	"bootcmd_disk_sysboot1=setenv bootfile /boot/extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
++	"bootcmd_disk_sysboot2=setenv bootfile /extlinux/extlinux.conf; sysboot ${boot_ifc} ${bootdevice} ext2\0" \
++	"bootcmd_disk_uenv=ext2load ${boot_ifc} ${bootdevice} ${uenv_addr_r} uEnv.txt; env import -t ${uenv_addr_r} ${filesize}; run bootcmd_uenv\0" \
++	"bootcmd_disk_kernel=ext2load ${boot_ifc} ${bootdevice} ${kernel_addr_r} vmlinuz && ext2load ${boot_ifc} ${bootdevice} ${ramdisk_addr_r} initrd.img && bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr}\0" \
++	"bootcmd_disk=run bootcmd_disk_sysboot1; run bootcmd_disk_sysboot2; run bootcmd_disk_uenv; run bootcmd_disk_scr; run bootcmd_disk_kernel\0" \
++	"bootcmd_mmc=setenv boot_ifc mmc; mmc rescan && run bootcmd_disk\0" \
++	"bootcmd_default=run bootcmd_mmc; run bootcmd_pxe\0" \
++	"localcmd=run bootcmd_mmc\0" \
++	"bootdevice=0\0" \
++	"bootargs=console=${console} root=LABEL=rootfs\0" \
++	"bootdelay=2\0" \
++	"bootretry=90\0" \
++	"netretry=once\0" \
+ 	NANDARGS
+ #endif
+ 
+-- 
+1.8.3.1
+
diff --git a/sources b/sources
index b87e9e7..39a1809 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8445162690052e6afd4b8f87af2bb557  u-boot-2013.07.tar.bz2
+e6ed3e9817cd80b0fc933f157c24b335  u-boot-2013.10-rc2.tar.bz2