From 2c521c5b7a4def7d51c0a8465ec326075934dd68 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Thu, 15 Sep 2016 11:02:08 +0100
Subject: [PATCH] Update to 2016.09 GA,  Add qemu elf binaries to new
 subpackage

---
 armv7-boards                                  |  1 +
 ...lite-to-distro-generic-boot-commands.patch | 52 ++++++++++--------
 sources                                       |  2 +-
 uboot-tools.spec                              | 53 +++++++++++++++++--
 4 files changed, 80 insertions(+), 28 deletions(-)

diff --git a/armv7-boards b/armv7-boards
index 3750018..04eb771 100644
--- a/armv7-boards
+++ b/armv7-boards
@@ -79,6 +79,7 @@ orangepi_one
 orangepi_pc
 orangepi_pc_plus
 orangepi_plus
+orangepi_plus2e
 origen
 paz00
 peach-pi
diff --git a/port-utilite-to-distro-generic-boot-commands.patch b/port-utilite-to-distro-generic-boot-commands.patch
index 4f0766f..b2fd480 100644
--- a/port-utilite-to-distro-generic-boot-commands.patch
+++ b/port-utilite-to-distro-generic-boot-commands.patch
@@ -1,14 +1,14 @@
-From ad8f78f7df2cbfd271d73afc5296941972b38119 Mon Sep 17 00:00:00 2001
+From af017eb82317dc88c1b23301d76466b389c2e007 Mon Sep 17 00:00:00 2001
 From: Peter Robinson <pbrobinson@gmail.com>
-Date: Tue, 4 Aug 2015 09:37:38 +0100
-Subject: [PATCH 3/5] port utilite to distro generic boot commands
+Date: Tue, 13 Sep 2016 08:47:34 +0100
+Subject: [PATCH] port utilite to distro generic boot commands
 
 ---
- include/configs/cm_fx6.h | 107 ++++++++++++-----------------------------------
- 1 file changed, 27 insertions(+), 80 deletions(-)
+ include/configs/cm_fx6.h | 115 ++++++++++++-----------------------------------
+ 1 file changed, 29 insertions(+), 86 deletions(-)
 
 diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
-index 12734a1..602c178 100644
+index c839b03..4dd501e 100644
 --- a/include/configs/cm_fx6.h
 +++ b/include/configs/cm_fx6.h
 @@ -11,6 +11,7 @@
@@ -19,7 +19,7 @@ index 12734a1..602c178 100644
  #include "mx6_common.h"
  
  /* Machine config */
-@@ -64,97 +65,43 @@
+@@ -78,101 +79,43 @@
  #define CONFIG_ENV_SIZE			(8 * 1024)
  #define CONFIG_ENV_OFFSET		(768 * 1024)
  
@@ -45,28 +45,33 @@ index 12734a1..602c178 100644
  	"stderr=serial,vga\0" \
  	"panel=HDMI\0" \
 -	"autoload=no\0" \
+-	"uImage=uImage-cm-fx6\0" \
+-	"zImage=zImage-cm-fx6\0" \
 -	"kernel=uImage-cm-fx6\0" \
 -	"script=boot.scr\0" \
- 	"dtb=cm-fx6.dtb\0" \
+-	"dtb=cm-fx6.dtb\0" \
 -	"bootm_low=18000000\0" \
++	"dtb=imx6q-utilite-pro.dts\0" \
  	"loadaddr=0x10800000\0" \
  	"fdtaddr=0x11000000\0" \
-+        "fdt_addr_r=0x18000000\0" \
-+        "pxefile_addr_r=0x17f00000\0" \
-+        "scriptaddr=0x17e00000\0" \
-+        "kernel_addr_r=0x11000000\0" \
-+        "ramdisk_addr_r=0x18100000\0" \
-+        "bootm_size=0x20000000\0" \
++	"fdt_addr_r=0x18000000\0" \
++	"pxefile_addr_r=0x17f00000\0" \
++	"scriptaddr=0x17e00000\0" \
++	"kernel_addr_r=0x11000000\0" \
++	"ramdisk_addr_r=0x18100000\0" \
++	"bootm_size=0x20000000\0" \
  	"console=ttymxc3,115200\0" \
  	"ethprime=FEC0\0" \
 -	"video_hdmi=mxcfb0:dev=hdmi,1920x1080M-32@50,if=RGB32\0" \
 -	"video_dvi=mxcfb0:dev=dvi,1280x800M-32@50,if=RGB32\0" \
 -	"doboot=bootm ${loadaddr}\0" \
 -	"doloadfdt=false\0" \
--	"setboottypez=setenv kernel zImage-cm-fx6;" \
+-	"mtdids=" MTDIDS_DEFAULT "\0" \
+-	"mtdparts=" MTDPARTS_DEFAULT "\0" \
+-	"setboottypez=setenv kernel ${zImage};" \
 -		"setenv doboot bootz ${loadaddr} - ${fdtaddr};" \
 -		"setenv doloadfdt true;\0" \
--	"setboottypem=setenv kernel uImage-cm-fx6;" \
+-	"setboottypem=setenv kernel ${uImage};" \
 -		"setenv doboot bootm ${loadaddr};" \
 -		"setenv doloadfdt false;\0"\
 -	"mmcroot=/dev/mmcblk0p2 rw rootwait\0" \
@@ -74,13 +79,13 @@ index 12734a1..602c178 100644
 -	"nandroot=/dev/mtdblock4 rw\0" \
 -	"nandrootfstype=ubifs\0" \
 -	"mmcargs=setenv bootargs console=${console} root=${mmcroot} " \
--		"${video}\0" \
+-		"${video} ${extrabootargs}\0" \
 -	"sataargs=setenv bootargs console=${console} root=${sataroot} " \
--		"${video}\0" \
+-		"${video} ${extrabootargs}\0" \
 -	"nandargs=setenv bootargs console=${console} " \
 -		"root=${nandroot} " \
 -		"rootfstype=${nandrootfstype} " \
--		"${video}\0" \
+-		"${video} ${extrabootargs}\0" \
 -	"nandboot=if run nandloadkernel; then " \
 -			"run nandloadfdt;" \
 -			"run setboottypem;" \
@@ -117,8 +122,7 @@ index 12734a1..602c178 100644
 -		"run trybootk;" \
 -		"run setboottypez;" \
 -		"run trybootk;\0"
-+	BOOTENV
- 
+-
 -#define CONFIG_BOOTCOMMAND \
 -	"run setupmmcboot;" \
 -	"mmc dev ${storagedev};" \
@@ -137,12 +141,14 @@ index 12734a1..602c178 100644
 -	"fi;" \
 -	"run setupnandboot;" \
 -	"run nandboot;"
++	BOOTENV
++
 +#else /* ifndef CONFIG_SPL_BUILD */
 +#define CONFIG_EXTRA_ENV_SETTINGS
 +#endif
  
- #define CONFIG_PREBOOT		"usb start"
+ #define CONFIG_PREBOOT		"usb start;sf probe"
  
 -- 
-2.5.0
+2.9.3
 
diff --git a/sources b/sources
index 3bce9da..470a608 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-033c2bf6403e17785bf104877abe691b  u-boot-2016.09-rc2.tar.bz2
+2e69dda70eb28f8042d2f9fbeb1feaa1  u-boot-2016.09.tar.bz2
diff --git a/uboot-tools.spec b/uboot-tools.spec
index 684fba5..4633426 100644
--- a/uboot-tools.spec
+++ b/uboot-tools.spec
@@ -1,8 +1,8 @@
-%global candidate rc2
+#global candidate rc2
 
 Name:      uboot-tools
 Version:   2016.09
-Release:   2%{?candidate:.%{candidate}}%{?dist}
+Release:   3%{?candidate:.%{candidate}}%{?dist}
 Summary:   U-Boot utilities
 
 Group:     Development/Tools
@@ -13,7 +13,7 @@ Source1:   armv7-boards
 Source2:   armv8-boards
 
 Patch1:    add-BOOTENV_INIT_COMMAND-for-commands-that-may-be-ne.patch
-#Patch2:    port-utilite-to-distro-generic-boot-commands.patch
+Patch2:    port-utilite-to-distro-generic-boot-commands.patch
 Patch3:    mvebu-enable-generic-distro-boot-config.patch
 
 BuildRequires:  bc
@@ -37,7 +37,6 @@ BuildArch:   noarch
 
 %description -n uboot-images-armv8
 u-boot bootloader binaries for the aarch64 vexpress_aemv8a
-
 %endif
 
 %ifarch %{arm}
@@ -48,7 +47,15 @@ BuildArch:   noarch
 
 %description -n uboot-images-armv7
 u-boot bootloader binaries for armv7 boards
+%endif
 
+%ifarch %{arm} aarch64
+%package     -n uboot-images-qemu
+Summary:     u-boot bootloader images for armv7 boards
+Requires:    uboot-tools
+
+%description -n uboot-images-qemu
+u-boot bootloader ELF binaries for use with qemu
 %endif
 
 %prep
@@ -160,6 +167,33 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/
 done
 %endif
 
+# QEMU ELF binaries
+%ifarch %{arm}
+for board in vexpress_ca15_tc2 vexpress_ca9x4
+do
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/qemu/$(echo $board)/
+ for file in u-boot
+ do
+  if [ -f builds/$(echo $board)/$(echo $file) ]; then
+    install -p -m 0644 builds/$(echo $board)/$(echo $file) $RPM_BUILD_ROOT%{_datadir}/uboot/qemu/$(echo $board)/
+  fi
+ done
+done
+%endif
+
+%ifarch aarch64
+for board in vexpress_aemv8a_semi
+do
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/qemu/$(echo $board)/
+ for file in u-boot
+ do
+  if [ -f builds/$(echo $board)/$(echo $file) ]; then
+    install -p -m 0644 builds/$(echo $board)/$(echo $file) $RPM_BUILD_ROOT%{_datadir}/uboot/qemu/$(echo $board)/
+  fi
+ done
+done
+%endif
+
 for tool in bmp_logo dumpimage easylogo/easylogo env/fw_printenv fit_check_sign fit_info gdb/gdbcont gdb/gdbsend gen_eth_addr img2srec mkenvimage mkimage ncb proftool ubsha1 xway-swap-bytes
 do
 install -p -m 0755 builds/tools/$tool $RPM_BUILD_ROOT%{_bindir}
@@ -196,14 +230,25 @@ cp -p board/amlogic/odroid-c2/README doc/README.odroid-c2
 %ifarch aarch64
 %files -n uboot-images-armv8
 %{_datadir}/uboot/*
+%exclude %{_datadir}/uboot/qemu
 %endif
 
 %ifarch %{arm}
 %files -n uboot-images-armv7
 %{_datadir}/uboot/*
+%exclude %{_datadir}/uboot/qemu
+%endif
+
+%ifarch %{arm} aarch64
+%files -n uboot-images-qemu
+%{_datadir}/uboot/qemu
 %endif
 
 %changelog
+* Mon Sep 12 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.09-3
+- Update to 2016.09 GA
+- Add qemu elf binaries to new subpackage
+
 * Tue Aug 23 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.09-2rc2
 - 2016.09 RC2