From 1b14295881a53bc450f3ec4e8a17c54041ba03bb Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sun, 21 Apr 2013 15:06:13 +0100
Subject: [PATCH] Update to 2013.04 release, Build i.MX6 Wandboard Dual Lite
 and Solo Boards

---
 .gitignore       | 15 +--------------
 sources          |  2 +-
 uboot-tools.spec | 46 +++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5f1a4aa..1ec9f3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1 @@
-u-boot-2010.03.tar.bz2
-/u-boot-2011.03.tar.bz2
-/u-boot-2011.12.tar.bz2
-/u-boot-2012.04-rc3.tar.bz2
-/u-boot-2012.04.tar.bz2
-/u-boot-2012.04.01.tar.bz2
-/u-boot-2012.07-rc1.tar.bz2
-/u-boot-2012.07.tar.bz2
-/u-boot-2012.10-rc3.tar.bz2
-/u-boot-2012.10.tar.bz2
-/u-boot-2013.01.tar.bz2
-/u-boot-2013.01.01.tar.bz2
-/u-boot-2013.04-rc1.tar.bz2
-/u-boot-2013.04-rc2.tar.bz2
+/u-boot-*.tar.bz2
diff --git a/sources b/sources
index 2b55579..685adfd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-67e9aced68aa92006b7c9ba7e9d1ce50  u-boot-2013.04-rc2.tar.bz2
+21bf962d69938ed4ed783b792b2b074e  u-boot-2013.04.tar.bz2
diff --git a/uboot-tools.spec b/uboot-tools.spec
index b6ec501..f3c42c6 100644
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@@ -1,8 +1,8 @@
-%global candidate rc2
+#%global candidate
 
 Name:           uboot-tools
 Version:        2013.04
-Release:        0.1%{?candidate:.%{candidate}}%{?dist}
+Release:        1%{?candidate:.%{candidate}}%{?dist}
 Summary:        U-Boot utilities
 
 Group:          Development/Tools
@@ -60,6 +60,20 @@ Requires:    uboot-tools
 %description -n uboot-smdkv310
 u-boot bootloader binaries for smdk310 board
 
+%package     -n uboot-wandboard_dl
+Summary:     u-boot bootloader binaries for Wandboard i.MX6 Dual Lite
+Requires:    uboot-tools
+
+%description -n uboot-wandboard_dl
+u-boot bootloader binaries for Wandboard i.MX6 Dual Lite
+
+%package     -n uboot-wandboard_solo
+Summary:     u-boot bootloader binaries for Wandboard i.MX6 Solo
+Requires:    uboot-tools
+
+%description -n uboot-wandboard_solo
+u-boot bootloader binaries for Wandboard i.MX6 Solo
+
 %endif
 
 %prep
@@ -102,6 +116,16 @@ make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE=""
 cp -p spl/smdkv310-spl.bin builds/smdkv310-spl.bin.smdkv310
 cp -p u-boot.bin builds/u-boot.bin.smdkv310
 make distclean
+
+make CROSS_COMPILE="" wandboard_dl_config
+make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE=""
+cp -p u-boot.imx builds/u-boot.imx.dl
+make distclean
+
+make CROSS_COMPILE="" wandboard_solo_config
+make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE=""
+cp -p u-boot.imx builds/u-boot.imx.solo
+make distclean
 %endif
 
 make tools HOSTCC="gcc $RPM_OPT_FLAGS" HOSTSTRIP=/bin/true CROSS_COMPILE=""
@@ -123,6 +147,8 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot-beagle/
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot-beaglebone/
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot-origen/
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot-smdkv310/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot-imx6dl/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot-imx6solo/
 
 for board in beaglebone beagle panda
 do
@@ -136,6 +162,8 @@ install -p -m 0644 builds/u-boot.bin.origen $RPM_BUILD_ROOT%{_datadir}/uboot-ori
 install -p -m 0644 builds/smdkv310-spl.bin.smdkv310 $RPM_BUILD_ROOT%{_datadir}/uboot-smdkv310/smdkv310-spl.bin
 install -p -m 0644 builds/u-boot.bin.smdkv310 $RPM_BUILD_ROOT%{_datadir}/uboot-smdkv310/u-boot.bin
 
+install -p -m 0644 builds/u-boot.imx.dl $RPM_BUILD_ROOT%{_datadir}/uboot-imx6dl/u-boot.bin
+install -p -m 0644 builds/u-boot.imx.solo $RPM_BUILD_ROOT%{_datadir}/uboot-imx6solo/u-boot.bin
 %endif
 
 install -p -m 0755 tools/mkimage $RPM_BUILD_ROOT%{_bindir}
@@ -181,9 +209,21 @@ rm -rf $RPM_BUILD_ROOT
 %files -n uboot-smdkv310
 %defattr(-,root,root,-)
 %{_datadir}/uboot-smdkv310/
+
+%files -n uboot-wandboard_dl
+%defattr(-,root,root,-)
+%{_datadir}/uboot-imx6dl/
+
+%files -n uboot-wandboard_solo
+%defattr(-,root,root,-)
+%{_datadir}/uboot-imx6solo/
 %endif
 
 %changelog
+* Sun Apr 21 2013 Peter Robinson <pbrobinson@fedoraproject.org> 2013.04-1
+- Update to 2013.04 release
+- Build i.MX6 Wandboard Dual Lite and Solo Boards
+
 * Sun Mar 31 2013 Dennis Gilmore <dennis@ausil.us> - 2013.04-0.1.rc1
 - update to 2013.04-rc2
 
@@ -194,7 +234,7 @@ rm -rf $RPM_BUILD_ROOT
 - update to 2013.01 release
 
 * Wed Oct 17 2012 Dennis Gilmore <dennis@ausil.us> - 2012.10-1
-update to final 2012.10 release
+- update to final 2012.10 release
 
 * Thu Oct 11 2012 Mauro Carvalho Chehab <mchehab@redhat.com>
 - Also generate uboot for SMDK310