use ext2load for dtb loading

- cleanup duplicate defines

16 files changed, 22 insertions, 16 deletions

diff --git a/0001-add-distro-default-commands-and-config-options.patch b/0001-add-distro-default-commands-and-config-options.patch
index b5acf13..2dc8605 100644
--- a/0001-add-distro-default-commands-and-config-options.patch
+++ b/0001-add-distro-default-commands-and-config-options.patch
@@ -1,7 +1,7 @@
 From 9172c5926e6875a59a8d1cc82d30b2118ab7308b 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/15] add distro default commands and config options
+Subject: [PATCH 01/16] add distro default commands and config options
 
 ---
  include/config_distro_default.h | 51 +++++++++++++++++++++++++++++++++++++++++
diff --git a/0002-add-option-to-include-generic-distro-config.patch b/0002-add-option-to-include-generic-distro-config.patch
index efaa40b..62388f7 100644
--- a/0002-add-option-to-include-generic-distro-config.patch
+++ b/0002-add-option-to-include-generic-distro-config.patch
@@ -1,7 +1,7 @@
 From 3c3c10fad1f61f8ad01414c868080e0e1bb5fc91 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/15] add option to include generic distro config
+Subject: [PATCH 02/16] add option to include generic distro config
 
 ---
  include/common.h | 5 +++++
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
index 5d69e51..ea03238 100644
--- a/0003-set-omap4-boards-to-use-the-generic-distro-support.patch
+++ b/0003-set-omap4-boards-to-use-the-generic-distro-support.patch
@@ -1,7 +1,7 @@
 From f12653a82d5417114fb422ae3e3883b96ec31ea5 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/15] set omap4 boards to use the generic distro support
+Subject: [PATCH 03/16] set omap4 boards to use the generic distro support
 
 ---
  include/configs/omap4_common.h | 9 ++++++++-
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
index 7a2b945..3feaa48 100644
--- a/0004-set-wandboard-to-use-generic-commands-and-set-needed.patch
+++ b/0004-set-wandboard-to-use-generic-commands-and-set-needed.patch
@@ -1,7 +1,7 @@
 From 4fe19544ffda98c8ab9eea55d29f8c9179716e88 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/15] set wandboard to use generic commands and set needed
+Subject: [PATCH 04/16] set wandboard to use generic commands and set needed
  variables
 
 ---
diff --git a/0005-set-the-default-wandboard-boot-commands.patch b/0005-set-the-default-wandboard-boot-commands.patch
index 09b7fc3..5b2e9d8 100644
--- a/0005-set-the-default-wandboard-boot-commands.patch
+++ b/0005-set-the-default-wandboard-boot-commands.patch
@@ -1,7 +1,7 @@
 From e213040f9253ebf299a1dd491443419e9d37d7b8 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/15] set the default wandboard boot commands
+Subject: [PATCH 05/16] set the default wandboard boot commands
 
 ---
  include/configs/wandboard.h | 18 ++++++++++++++++++
diff --git a/0006-set-omap4-to-use-extlinux.conf-by-default.patch b/0006-set-omap4-to-use-extlinux.conf-by-default.patch
index a46548d..8c2f6fa 100644
--- a/0006-set-omap4-to-use-extlinux.conf-by-default.patch
+++ b/0006-set-omap4-to-use-extlinux.conf-by-default.patch
@@ -1,7 +1,7 @@
 From 534d6c5a71f1b853d83b0e07ea9c1f272884998b 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/15] set omap4 to use extlinux.conf by default
+Subject: [PATCH 06/16] set omap4 to use extlinux.conf by default
 
 ---
  include/configs/omap4_common.h | 21 +++++++++++++++++++--
diff --git a/0007-remove-CONFIG_MENU_SHOW-from-distro-config.patch b/0007-remove-CONFIG_MENU_SHOW-from-distro-config.patch
index 4306ce9..d1bbfab 100644
--- a/0007-remove-CONFIG_MENU_SHOW-from-distro-config.patch
+++ b/0007-remove-CONFIG_MENU_SHOW-from-distro-config.patch
@@ -1,7 +1,7 @@
 From d1b689f0beec17c0531189fb15b076082f0f282e Mon Sep 17 00:00:00 2001
 From: Dennis Gilmore <dennis@ausil.us>
 Date: Thu, 17 Oct 2013 17:54:26 -0500
-Subject: [PATCH 07/15] remove CONFIG_MENU_SHOW from distro config
+Subject: [PATCH 07/16] remove CONFIG_MENU_SHOW from distro config
 
 ---
  include/config_distro_default.h | 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
index c0d0a27..584a270 100644
--- a/0008-disable-FIT-image-support-since-it-fails-to-build.patch
+++ b/0008-disable-FIT-image-support-since-it-fails-to-build.patch
@@ -1,7 +1,7 @@
 From 2394d596e963d5532f3ff00e097ebcf5c8338610 Mon Sep 17 00:00:00 2001
 From: Dennis Gilmore <dennis@ausil.us>
 Date: Thu, 17 Oct 2013 17:55:53 -0500
-Subject: [PATCH 08/15] disable FIT image support since it fails to build
+Subject: [PATCH 08/16] disable FIT image support since it fails to build
 
 ---
  include/config_distro_default.h | 1 -
diff --git a/0009-add-defualt-DHCP-config-options.patch b/0009-add-defualt-DHCP-config-options.patch
index d2e402d..72512a0 100644
--- a/0009-add-defualt-DHCP-config-options.patch
+++ b/0009-add-defualt-DHCP-config-options.patch
@@ -1,7 +1,7 @@
 From c50183e7caa3a26d90cc41b43fd705a9a6a7afdd 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/15] add defualt DHCP config options
+Subject: [PATCH 09/16] add defualt DHCP config options
 
 ---
  include/config_distro_default.h | 6 +++++-
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
index f11a54d..80ce8d0 100644
--- a/0010-remove-USB-from-distro-default-not-all-systems-suppo.patch
+++ b/0010-remove-USB-from-distro-default-not-all-systems-suppo.patch
@@ -1,7 +1,7 @@
 From a86c59b6fa841a1c59ecd6849367021c7283b49b 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/15] remove USB from distro default, not all systems support
+Subject: [PATCH 10/16] remove USB from distro default, not all systems support
  USB
 
 ---
diff --git a/0011-Setup-beagleboard-to-used-generic-distro-configs.patch b/0011-Setup-beagleboard-to-used-generic-distro-configs.patch
index 173efd9..33e0b85 100644
--- a/0011-Setup-beagleboard-to-used-generic-distro-configs.patch
+++ b/0011-Setup-beagleboard-to-used-generic-distro-configs.patch
@@ -1,7 +1,7 @@
 From 0893da22f56bda219e6437057a1145932a8311ac Mon Sep 17 00:00:00 2001
 From: Dennis Gilmore <dennis@ausil.us>
 Date: Mon, 2 Sep 2013 21:47:40 -0500
-Subject: [PATCH 11/15] Setup beagleboard to used generic distro configs
+Subject: [PATCH 11/16] Setup beagleboard to used generic distro configs
 
 ---
  include/configs/omap3_beagle.h | 13 ++++++++++---
diff --git a/0012-setup-beagleboard-to-load-extlinux.conf.patch b/0012-setup-beagleboard-to-load-extlinux.conf.patch
index edf8a49..ca4d531 100644
--- a/0012-setup-beagleboard-to-load-extlinux.conf.patch
+++ b/0012-setup-beagleboard-to-load-extlinux.conf.patch
@@ -1,7 +1,7 @@
 From b76a0828e3c62e74f59eda1d128dc9518c44f4ab Mon Sep 17 00:00:00 2001
 From: Dennis Gilmore <dennis@ausil.us>
 Date: Mon, 2 Sep 2013 21:55:37 -0500
-Subject: [PATCH 12/15] setup beagleboard to load extlinux.conf
+Subject: [PATCH 12/16] setup beagleboard to load extlinux.conf
 
 ---
  include/configs/omap3_beagle.h | 17 +++++++++++++++++
diff --git a/0013-setup-distro-common-variables-on-beaglebones.patch b/0013-setup-distro-common-variables-on-beaglebones.patch
index d2cf91a..3c79f33 100644
--- a/0013-setup-distro-common-variables-on-beaglebones.patch
+++ b/0013-setup-distro-common-variables-on-beaglebones.patch
@@ -1,7 +1,7 @@
 From c1ce44384122a284dad8efb084fe6f1c047633ea Mon Sep 17 00:00:00 2001
 From: Dennis Gilmore <dennis@ausil.us>
 Date: Thu, 17 Oct 2013 18:21:54 -0500
-Subject: [PATCH 13/15] setup distro common variables on beaglebones
+Subject: [PATCH 13/16] setup distro common variables on beaglebones
 
 ---
  include/configs/am335x_evm.h | 21 ++++++++++++---------
diff --git a/0014-Use-SPDX-header-in-distro-config.patch b/0014-Use-SPDX-header-in-distro-config.patch
index 47acd47..ddf31ec 100644
--- a/0014-Use-SPDX-header-in-distro-config.patch
+++ b/0014-Use-SPDX-header-in-distro-config.patch
@@ -1,7 +1,7 @@
 From f5c7ad35415218c20b904edf1981a33a47bcdf92 Mon Sep 17 00:00:00 2001
 From: Dennis Gilmore <dennis@ausil.us>
 Date: Thu, 17 Oct 2013 18:55:25 -0500
-Subject: [PATCH 14/15] Use SPDX header in distro config
+Subject: [PATCH 14/16] Use SPDX header in distro config
 
 ---
  include/config_distro_default.h | 4 +---
diff --git a/0015-WANDBOARD-adjust-addrs-to-work-with-calculated-value.patch b/0015-WANDBOARD-adjust-addrs-to-work-with-calculated-value.patch
index 543b0d6..369b82e 100644
--- a/0015-WANDBOARD-adjust-addrs-to-work-with-calculated-value.patch
+++ b/0015-WANDBOARD-adjust-addrs-to-work-with-calculated-value.patch
@@ -1,7 +1,7 @@
 From db994bffd3db0a6d02fa049eca0ff83720e22e73 Mon Sep 17 00:00:00 2001
 From: Dennis Gilmore <dennis@ausil.us>
 Date: Thu, 17 Oct 2013 19:12:52 -0500
-Subject: [PATCH 15/15] WANDBOARD: adjust addrs to work with calculated values.
+Subject: [PATCH 15/16] WANDBOARD: adjust addrs to work with calculated values.
  add scr_addr_r so the fall back to boot.scr has somewhere to be loaded have
  pxe boot load a fdt have sysboot load a fdt
 
diff --git a/uboot-tools.spec b/uboot-tools.spec
index 2b09dd8..2894556 100644
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@@ -2,7 +2,7 @@
 
 Name:           uboot-tools
 Version:        2013.10
-Release:        1%{?candidate:.%{candidate}}%{?dist}
+Release:        2%{?candidate:.%{candidate}}%{?dist}
 Summary:        U-Boot utilities
 
 Group:          Development/Tools
@@ -29,6 +29,7 @@ Patch21:        0012-setup-beagleboard-to-load-extlinux.conf.patch
 Patch22:        0013-setup-distro-common-variables-on-beaglebones.patch
 Patch23:        0014-Use-SPDX-header-in-distro-config.patch
 Patch24:        0015-WANDBOARD-adjust-addrs-to-work-with-calculated-value.patch
+Patch25:        0016-WANDBOARD-use-ext2load-to-load-dtbs.patch
 
 # Panda ES memory timing issue
 #Patch50: omap4-panda-memtiming.patch
@@ -175,6 +176,7 @@ u-boot bootloader binaries for Wandboard i.MX6 Solo
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p1
 #%patch50 -p1 -b .panda
 
 mkdir builds
@@ -423,6 +425,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat Oct 19 2013 Dennis Gilmore <dennis@ausil.us> - 2013.10-2
+- use ext2load for dtb loading
+- cleanup duplicate defines
+
 * Thu Oct 17 2013 Dennis Gilmore <dennis@ausil.us> - 2013.10-1
 - update to 2013.10 final
 - refactor where u-boot binaries are stored