we only need a single uEnv.txt now for all the vfat setups

remove the patches to be replaced

25 files changed, 6 insertions, 812 deletions

diff --git a/0001-add-distro-default-commands-and-config-options.patch b/0001-add-distro-default-commands-and-config-options.patch
deleted file mode 100644
index 6120625..0000000
--- a/0001-add-distro-default-commands-and-config-options.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-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
deleted file mode 100644
index 4802fdc..0000000
--- a/0002-add-option-to-include-generic-distro-config.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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/0003-set-omap4-boards-to-use-the-generic-distro-support.patch b/0003-set-omap4-boards-to-use-the-generic-distro-support.patch
deleted file mode 100644
index bbb3db0..0000000
--- a/0003-set-omap4-boards-to-use-the-generic-distro-support.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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-set-wandboard-to-use-generic-commands-and-set-needed.patch b/0004-set-wandboard-to-use-generic-commands-and-set-needed.patch
deleted file mode 100644
index a6f9438..0000000
--- a/0004-set-wandboard-to-use-generic-commands-and-set-needed.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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-set-the-default-wandboard-boot-commands.patch b/0005-set-the-default-wandboard-boot-commands.patch
deleted file mode 100644
index 47c12a3..0000000
--- a/0005-set-the-default-wandboard-boot-commands.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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-set-default-boot-commands-on-omap4-to-use-extlinux.patch b/0006-set-default-boot-commands-on-omap4-to-use-extlinux.patch
deleted file mode 100644
index 880398d..0000000
--- a/0006-set-default-boot-commands-on-omap4-to-use-extlinux.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-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
deleted file mode 100644
index 7f74368..0000000
--- a/0006-set-omap4-to-use-extlinux.conf-by-default.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-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-enable-CONFIG_CMD_BOOTMENU-for-distro-configs.patch b/0007-enable-CONFIG_CMD_BOOTMENU-for-distro-configs.patch
deleted file mode 100644
index 2d714eb..0000000
--- a/0007-enable-CONFIG_CMD_BOOTMENU-for-distro-configs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 96fbe1d..0000000
--- a/0008-DISABLE-FIT-image-support-since-it-fails-to-build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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/0009-add-defualt-DHCP-config-options.patch b/0009-add-defualt-DHCP-config-options.patch
deleted file mode 100644
index 1418611..0000000
--- a/0009-add-defualt-DHCP-config-options.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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/0010-remove-USB-from-distro-default-not-all-systems-suppo.patch b/0010-remove-USB-from-distro-default-not-all-systems-suppo.patch
deleted file mode 100644
index 1482fd1..0000000
--- a/0010-remove-USB-from-distro-default-not-all-systems-suppo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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-set-omap5-up-to-use-generic-distro-configs.patch b/0011-set-omap5-up-to-use-generic-distro-configs.patch
deleted file mode 100644
index c33dd3d..0000000
--- a/0011-set-omap5-up-to-use-generic-distro-configs.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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-setup-omap5-to-load-extlinux.conf.patch b/0012-setup-omap5-to-load-extlinux.conf.patch
deleted file mode 100644
index b4612d0..0000000
--- a/0012-setup-omap5-to-load-extlinux.conf.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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
deleted file mode 100644
index 20a577b..0000000
--- a/0013-Setup-beagleboard-to-used-generic-distro-configs.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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/0014-setup-beagleboard-to-load-extlinux.conf.patch b/0014-setup-beagleboard-to-load-extlinux.conf.patch
deleted file mode 100644
index 5f7f131..0000000
--- a/0014-setup-beagleboard-to-load-extlinux.conf.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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
deleted file mode 100644
index 54c4a77..0000000
--- a/0015-setup-address-variables-needed-for-distro-config.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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/0016-setup-am335x_evm-to-load-extlinux.conf.patch b/0016-setup-am335x_evm-to-load-extlinux.conf.patch
deleted file mode 100644
index a3ba644..0000000
--- a/0016-setup-am335x_evm-to-load-extlinux.conf.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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/uEnv.txt.beaglebone b/uEnv.txt
index 34147ba..8a21d38 100644
--- a/uEnv.txt.beaglebone
+++ b/uEnv.txt
@@ -1,4 +1,3 @@
-abcboard=am335x-bone
 bootpart=0:3
 bootfile=boot.scr
 bootdir=/boot
diff --git a/uEnv.txt.beagle b/uEnv.txt.beagle
deleted file mode 100644
index acbb710..0000000
--- a/uEnv.txt.beagle
+++ /dev/null
@@ -1,5 +0,0 @@
-abcboard=omap3-beagle
-bootpart=0:3
-bootfile=boot.scr
-bootdir=/boot
-uenvcmd=ext2load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}; echo Running boot.scr script from mmc ...; source ${loadaddr} 
diff --git a/uEnv.txt.beagle_xm b/uEnv.txt.beagle_xm
deleted file mode 100644
index aef87fb..0000000
--- a/uEnv.txt.beagle_xm
+++ /dev/null
@@ -1,5 +0,0 @@
-abcboard=omap3-beagle-xm
-bootpart=0:3
-bootfile=boot.scr
-bootdir=/boot
-uenvcmd=ext2load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}; echo Running boot.scr script from mmc ...; source ${loadaddr} 
diff --git a/uEnv.txt.panda b/uEnv.txt.panda
deleted file mode 100644
index 5645d53..0000000
--- a/uEnv.txt.panda
+++ /dev/null
@@ -1,4 +0,0 @@
-abcboard=omap4-panda
-bootpart=0:3
-bootfile=boot.scr
-uenvcmd=ext4load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}; echo Running boot.scr script from mmc ...; source ${loadaddr}
diff --git a/uEnv.txt.panda_a4 b/uEnv.txt.panda_a4
deleted file mode 100644
index e7eba52..0000000
--- a/uEnv.txt.panda_a4
+++ /dev/null
@@ -1,4 +0,0 @@
-abcboard=omap4-panda-a4
-bootpart=0:3
-bootfile=boot.scr
-uenvcmd=ext4load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}; echo Running boot.scr script from mmc ...; source ${loadaddr}
diff --git a/uEnv.txt.panda_es b/uEnv.txt.panda_es
deleted file mode 100644
index fe4dac6..0000000
--- a/uEnv.txt.panda_es
+++ /dev/null
@@ -1,4 +0,0 @@
-abcboard=omap4-panda-es
-bootpart=0:3
-bootfile=boot.scr
-uenvcmd=ext4load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}; echo Running boot.scr script from mmc ...; source ${loadaddr}
diff --git a/uEnv.txt.uevm b/uEnv.txt.uevm
deleted file mode 100644
index 70923cf..0000000
--- a/uEnv.txt.uevm
+++ /dev/null
@@ -1,4 +0,0 @@
-abcboard=omap5-evm
-bootpart=0:3
-bootfile=boot.scr
-uenvcmd=ext4load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}; echo Running boot.scr script from mmc ...; source ${loadaddr}
diff --git a/uboot-tools.spec b/uboot-tools.spec
index 68b9e99..7ca1cd5 100644
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@@ -1,12 +1,12 @@
-%global candidate rc4
+#global candidate
 
 Name:           uboot-tools
 Version:        2013.10
-Release:        0.5%{?candidate:.%{candidate}}%{?dist}
+Release:        1%{?candidate:.%{candidate}}%{?dist}
 Summary:        U-Boot utilities
 
 Group:          Development/Tools
-License:        GPLv2+
+License:        GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
 URL:            http://www.denx.de/wiki/U-Boot
 Source0:        ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2
 Source1:        uEnv.txt.beagle
@@ -434,6 +434,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Oct 17 2013 Dennis Gilmore <dennis@ausil.us> - 2013.10-1
+- update to 2013.10 final
+
 * Fri Oct 04 2013 Dennis Gilmore <dennis@ausil.us> - 2013.10-0.5.rc4
 - update to 2013.10-rc4