Hello community,

here is the log from the commit of package u-boot for openSUSE:Factory checked 
in at 2018-05-16 11:41:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/u-boot (Old)
 and      /work/SRC/openSUSE:Factory/.u-boot.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "u-boot"

Wed May 16 11:41:08 2018 rev:98 rq:607430 version:2018.05

Changes:
--------
--- /work/SRC/openSUSE:Factory/u-boot/u-boot-a10-olinuxino-lime.changes 
2018-04-13 12:51:51.779003106 +0200
+++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-a10-olinuxino-lime.changes    
2018-05-16 11:42:45.233765101 +0200
@@ -1,0 +2,90 @@
+Thu May 10 17:32:58 UTC 2018 - afaer...@suse.de
+
+- Conditionalize pine64plus ATF support on uboot_atf_pine64
+- u-boot-board.spec.in: Update license
+
+-------------------------------------------------------------------
+Thu May 10 16:17:39 UTC 2018 - afaer...@suse.de
+
+- Add poplar
+
+-------------------------------------------------------------------
+Wed May  9 07:24:31 UTC 2018 - guillaume.gar...@opensuse.org
+
+- Update to 2018.05
+
+-------------------------------------------------------------------
+Wed May  2 09:43:24 UTC 2018 - ag...@suse.com
+
+- Update to 2018.05-rc3
+
+-------------------------------------------------------------------
+Thu Apr 26 12:38:31 UTC 2018 - ag...@suse.com
+
+- Include u-boot.spec in autogeneration logic
+
+-------------------------------------------------------------------
+Thu Apr 26 11:40:19 UTC 2018 - ag...@suse.com
+
+- Add support for .bif generation in mkimage
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches added:
+  0006-tools-zynqmpimage-Add-partition-rea.patch
+  0007-tools-zynqmpimage-Move-defines-to-h.patch
+  0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
+  0009-tools-zynqmpimage-Add-bif-support.patch
+  0010-tools-zynqmpbif-Add-support-for-loa.patch
+
+-------------------------------------------------------------------
+Tue Apr 24 19:32:04 UTC 2018 - ag...@suse.com
+
+- Add generic ZynqMP support
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches added:
+  0005-zynqmp-Add-generic-target.patch
+
+-------------------------------------------------------------------
+Tue Apr 17 08:57:21 UTC 2018 - guillaume.gar...@opensuse.org
+
+- Update to 2018.05-rc2
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches dropped:
+  0004-rpi3-Enable-lan78xx-driver.patch
+  0005-rpi-Add-identifier-for-the-new-RPi3.patch
+  0006-efi_loader-Fix-network-DP-with-DM_E.patch
+  0007-mkimage-do-not-fail-if-there-is-no-.patch
+  0008-rpi-Allow-to-boot-without-serial.patch
+  0009-mmc-use-core-clock-frequency-in-bcm.patch
+  0010-Temp-workaround-for-Chromebook-snow.patch
+* Patches added:
+  0004-Temp-workaround-for-Chromebook-snow.patch
+
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches added:
+  0010-Temp-workaround-for-Chromebook-snow.patch
+  
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches dropped:
+  0009-rpi-Allow-to-boot-without-serial.patch
+  0010-mmc-use-core-clock-frequency-in-bcm.patch
+* Patches added:
+  0008-rpi-Allow-to-boot-without-serial.patch
+  0009-mmc-use-core-clock-frequency-in-bcm.patch
+    
+- Update to 2018.05-rc1
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches dropped:
+  0003-Revert-rockchip-mkimage-remove-plac.patch
+  0004-rpi-Use-firmware-provided-device-tr.patch
+  0005-rpi3-Enable-lan78xx-driver.patch
+  0006-net-Only-access-network-devices-aft.patch
+  0007-rpi-Add-identifier-for-the-new-RPi3.patch
+  0008-efi_loader-Fix-network-DP-with-DM_E.patch
+* Patches added:
+  0003-rpi-Use-firmware-provided-device-tr.patch
+  0004-rpi3-Enable-lan78xx-driver.patch
+  0005-rpi-Add-identifier-for-the-new-RPi3.patch
+  0006-efi_loader-Fix-network-DP-with-DM_E.patch
+  0007-mkimage-do-not-fail-if-there-is-no-.patch
+
+-------------------------------------------------------------------
u-boot-a13-olinuxino.changes: same change
u-boot-a13-olinuxinom.changes: same change
u-boot-a20-olinuxino-lime.changes: same change
u-boot-a20-olinuxino-lime2.changes: same change
u-boot-a20-olinuxinomicro.changes: same change
u-boot-am335xboneblack.changes: same change
u-boot-am335xevm.changes: same change
u-boot-am57xxevm.changes: same change
u-boot-arndale.changes: same change
u-boot-bananapi.changes: same change
u-boot-clearfog.changes: same change
u-boot-colibrit20.changes: same change
u-boot-cubieboard.changes: same change
u-boot-cubieboard2.changes: same change
u-boot-cubietruck.changes: same change
u-boot-dragonboard410c.changes: same change
u-boot-evb-rk3399.changes: same change
u-boot-firefly-rk3288.changes: same change
u-boot-firefly-rk3399.changes: same change
u-boot-geekbox.changes: same change
u-boot-highbank.changes: same change
u-boot-hikey.changes: same change
u-boot-hyundaia7hd.changes: same change
u-boot-jetson-tk1.changes: same change
u-boot-lamobor1.changes: same change
u-boot-ls1012afrdmqspi.changes: same change
u-boot-melea1000.changes: same change
u-boot-merriia80optimus.changes: same change
u-boot-mvebudb-88f3720.changes: same change
u-boot-mvebudbarmada8k.changes: same change
u-boot-mvebuespressobin-88f3720.changes: same change
u-boot-mvebumcbin-88f8040.changes: same change
u-boot-mx53loco.changes: same change
u-boot-mx6cuboxi.changes: same change
u-boot-mx6qsabrelite.changes: same change
u-boot-nanopia64.changes: same change
u-boot-nanopineo.changes: same change
u-boot-nanopineoair.changes: same change
u-boot-odroid-c2.changes: same change
u-boot-odroid-xu3.changes: same change
u-boot-odroid.changes: same change
u-boot-omap3beagle.changes: same change
u-boot-omap4panda.changes: same change
u-boot-orangepipc.changes: same change
u-boot-orangepipc2.changes: same change
u-boot-p2371-2180.changes: same change
u-boot-paz00.changes: same change
u-boot-pcm051rev3.changes: same change
u-boot-pine64plus.changes: same change
New Changes file:

--- /dev/null   2018-04-25 19:14:53.472341877 +0200
+++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-poplar.changes        
2018-05-16 11:43:19.928502304 +0200
@@ -0,0 +1,1907 @@
+-------------------------------------------------------------------
+Thu May 10 17:32:58 UTC 2018 - afaer...@suse.de
+
+- Conditionalize pine64plus ATF support on uboot_atf_pine64
+- u-boot-board.spec.in: Update license
+
+-------------------------------------------------------------------
+Thu May 10 16:17:39 UTC 2018 - afaer...@suse.de
+
+- Add poplar
+
+-------------------------------------------------------------------
+Wed May  9 07:24:31 UTC 2018 - guillaume.gar...@opensuse.org
+
+- Update to 2018.05
+
+-------------------------------------------------------------------
+Wed May  2 09:43:24 UTC 2018 - ag...@suse.com
+
+- Update to 2018.05-rc3
+
+-------------------------------------------------------------------
+Thu Apr 26 12:38:31 UTC 2018 - ag...@suse.com
+
+- Include u-boot.spec in autogeneration logic
+
+-------------------------------------------------------------------
+Thu Apr 26 11:40:19 UTC 2018 - ag...@suse.com
+
+- Add support for .bif generation in mkimage
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches added:
+  0006-tools-zynqmpimage-Add-partition-rea.patch
+  0007-tools-zynqmpimage-Move-defines-to-h.patch
+  0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
+  0009-tools-zynqmpimage-Add-bif-support.patch
+  0010-tools-zynqmpbif-Add-support-for-loa.patch
+
+-------------------------------------------------------------------
+Tue Apr 24 19:32:04 UTC 2018 - ag...@suse.com
+
+- Add generic ZynqMP support
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches added:
+  0005-zynqmp-Add-generic-target.patch
+
+-------------------------------------------------------------------
+Tue Apr 17 08:57:21 UTC 2018 - guillaume.gar...@opensuse.org
+
+- Update to 2018.05-rc2
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches dropped:
+  0004-rpi3-Enable-lan78xx-driver.patch
+  0005-rpi-Add-identifier-for-the-new-RPi3.patch
+  0006-efi_loader-Fix-network-DP-with-DM_E.patch
+  0007-mkimage-do-not-fail-if-there-is-no-.patch
+  0008-rpi-Allow-to-boot-without-serial.patch
+  0009-mmc-use-core-clock-frequency-in-bcm.patch
+  0010-Temp-workaround-for-Chromebook-snow.patch
+* Patches added:
+  0004-Temp-workaround-for-Chromebook-snow.patch
+
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches added:
+  0010-Temp-workaround-for-Chromebook-snow.patch
+  
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches dropped:
+  0009-rpi-Allow-to-boot-without-serial.patch
+  0010-mmc-use-core-clock-frequency-in-bcm.patch
+* Patches added:
+  0008-rpi-Allow-to-boot-without-serial.patch
+  0009-mmc-use-core-clock-frequency-in-bcm.patch
+    
+- Update to 2018.05-rc1
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches dropped:
+  0003-Revert-rockchip-mkimage-remove-plac.patch
+  0004-rpi-Use-firmware-provided-device-tr.patch
+  0005-rpi3-Enable-lan78xx-driver.patch
+  0006-net-Only-access-network-devices-aft.patch
+  0007-rpi-Add-identifier-for-the-new-RPi3.patch
+  0008-efi_loader-Fix-network-DP-with-DM_E.patch
+* Patches added:
+  0003-rpi-Use-firmware-provided-device-tr.patch
+  0004-rpi3-Enable-lan78xx-driver.patch
+  0005-rpi-Add-identifier-for-the-new-RPi3.patch
+  0006-efi_loader-Fix-network-DP-with-DM_E.patch
+  0007-mkimage-do-not-fail-if-there-is-no-.patch
+
+-------------------------------------------------------------------
+Thu Apr 12 15:19:29 UTC 2018 - ag...@suse.com
+
+- Package u-boot.elf on Xilinx systems
+
+-------------------------------------------------------------------
+Mon Apr  9 09:09:00 UTC 2018 - guillaume.gar...@opensuse.org
+
+- Workaround to boot on Chromebook (snow)
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.03
+* Patches added:
+  0011-Temp-workaround-for-Chromebook-snow.patch
+
+-------------------------------------------------------------------
+Thu Apr  5 11:25:47 UTC 2018 - ag...@suse.com
+
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.03
+* Patches added:
+  0010-mmc-use-core-clock-frequency-in-bcm.patch
+
+-------------------------------------------------------------------
+Thu Apr  5 09:54:56 UTC 2018 - ag...@suse.com
+
+- Fix rainbow screen on 32bit RPis (boo#1086757)
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.03
+* Patches added:
+  0009-rpi-Allow-to-boot-without-serial.patch
+
+-------------------------------------------------------------------
+Thu Mar 15 23:44:18 UTC 2018 - ag...@suse.com
+
+- Add Xilinx ZynqMP ZCU 102 target
+
+-------------------------------------------------------------------
+Thu Mar 15 16:34:22 UTC 2018 - ag...@suse.com
+
+- Enable new RPi3 B+ (bsc#1085262)
+- Fix network boot (bsc#1070775)
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.03
+* Patches added:
+  0005-rpi3-Enable-lan78xx-driver.patch
+  0006-net-Only-access-network-devices-aft.patch
+  0007-rpi-Add-identifier-for-the-new-RPi3.patch
+  0008-efi_loader-Fix-network-DP-with-DM_E.patch
+
+-------------------------------------------------------------------
+Wed Mar 14 15:13:44 UTC 2018 - guillaume.gar...@opensuse.org
+
+- Updated to 2018.03
+
+-------------------------------------------------------------------
+Tue Mar  6 13:26:21 UTC 2018 - guilla...@opensuse.org
+
+- Updated to 2018.03-rc4
+
+-------------------------------------------------------------------
+Thu Feb 22 08:43:30 UTC 2018 - guilla...@opensuse.org
+
+- Updated to 2018.03-rc3
+
+-------------------------------------------------------------------
+Wed Feb 21 16:48:20 UTC 2018 - ag...@suse.com
+
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.03
+* Patches added:
+  0004-rpi-Use-firmware-provided-device-tr.patch
+
+-------------------------------------------------------------------
+Tue Feb 13 12:26:59 UTC 2018 - guilla...@opensuse.org
+
+- Updated to 2018.03-rc2
+
+-------------------------------------------------------------------
+Tue Jan 30 07:48:10 UTC 2018 - guilla...@opensuse.org
+
+- Updated to 2018.03-rc1
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.03
+* Patches dropped:
+  0004-Fix-MMC1-external-SD-slot-on-Samsun.patch (Fixed upstream)
+
+-------------------------------------------------------------------
+Wed Jan 17 17:11:04 UTC 2018 - afaer...@suse.de
+
+- Add turrisomnia
+
+-------------------------------------------------------------------
+Wed Jan 17 09:51:41 UTC 2018 - guilla...@opensuse.org
+
+- Updated to 2018.01
+
+-------------------------------------------------------------------
+Mon Jan  8 09:02:47 UTC 2018 - guilla...@opensuse.org
+
+- Updated to 2018.01-rc3
+
+-------------------------------------------------------------------
+Tue Dec 19 13:59:57 UTC 2017 - guilla...@opensuse.org
+
+- Updated to 2018.01-rc2
+
+-------------------------------------------------------------------
+Fri Dec  8 07:50:19 UTC 2017 - guilla...@opensuse.org
+
+- Updated to 2018.01-rc1
+- Remove am57xx_evm_nodt since it has been removed upstream
+
+-------------------------------------------------------------------
++++ 1710 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-poplar.changes
--- /work/SRC/openSUSE:Factory/u-boot/u-boot-qemu-ppce500.changes       
2018-04-13 12:52:00.994669224 +0200
+++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-qemu-ppce500.changes  
2018-05-16 11:43:21.200456007 +0200
@@ -1,0 +2,90 @@
+Thu May 10 17:32:58 UTC 2018 - afaer...@suse.de
+
+- Conditionalize pine64plus ATF support on uboot_atf_pine64
+- u-boot-board.spec.in: Update license
+
+-------------------------------------------------------------------
+Thu May 10 16:17:39 UTC 2018 - afaer...@suse.de
+
+- Add poplar
+
+-------------------------------------------------------------------
+Wed May  9 07:24:31 UTC 2018 - guillaume.gar...@opensuse.org
+
+- Update to 2018.05
+
+-------------------------------------------------------------------
+Wed May  2 09:43:24 UTC 2018 - ag...@suse.com
+
+- Update to 2018.05-rc3
+
+-------------------------------------------------------------------
+Thu Apr 26 12:38:31 UTC 2018 - ag...@suse.com
+
+- Include u-boot.spec in autogeneration logic
+
+-------------------------------------------------------------------
+Thu Apr 26 11:40:19 UTC 2018 - ag...@suse.com
+
+- Add support for .bif generation in mkimage
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches added:
+  0006-tools-zynqmpimage-Add-partition-rea.patch
+  0007-tools-zynqmpimage-Move-defines-to-h.patch
+  0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
+  0009-tools-zynqmpimage-Add-bif-support.patch
+  0010-tools-zynqmpbif-Add-support-for-loa.patch
+
+-------------------------------------------------------------------
+Tue Apr 24 19:32:04 UTC 2018 - ag...@suse.com
+
+- Add generic ZynqMP support
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches added:
+  0005-zynqmp-Add-generic-target.patch
+
+-------------------------------------------------------------------
+Tue Apr 17 08:57:21 UTC 2018 - guillaume.gar...@opensuse.org
+
+- Update to 2018.05-rc2
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches dropped:
+  0004-rpi3-Enable-lan78xx-driver.patch
+  0005-rpi-Add-identifier-for-the-new-RPi3.patch
+  0006-efi_loader-Fix-network-DP-with-DM_E.patch
+  0007-mkimage-do-not-fail-if-there-is-no-.patch
+  0008-rpi-Allow-to-boot-without-serial.patch
+  0009-mmc-use-core-clock-frequency-in-bcm.patch
+  0010-Temp-workaround-for-Chromebook-snow.patch
+* Patches added:
+  0004-Temp-workaround-for-Chromebook-snow.patch
+
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches added:
+  0010-Temp-workaround-for-Chromebook-snow.patch
+  
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches dropped:
+  0009-rpi-Allow-to-boot-without-serial.patch
+  0010-mmc-use-core-clock-frequency-in-bcm.patch
+* Patches added:
+  0008-rpi-Allow-to-boot-without-serial.patch
+  0009-mmc-use-core-clock-frequency-in-bcm.patch
+    
+- Update to 2018.05-rc1
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches dropped:
+  0003-Revert-rockchip-mkimage-remove-plac.patch
+  0004-rpi-Use-firmware-provided-device-tr.patch
+  0005-rpi3-Enable-lan78xx-driver.patch
+  0006-net-Only-access-network-devices-aft.patch
+  0007-rpi-Add-identifier-for-the-new-RPi3.patch
+  0008-efi_loader-Fix-network-DP-with-DM_E.patch
+* Patches added:
+  0003-rpi-Use-firmware-provided-device-tr.patch
+  0004-rpi3-Enable-lan78xx-driver.patch
+  0005-rpi-Add-identifier-for-the-new-RPi3.patch
+  0006-efi_loader-Fix-network-DP-with-DM_E.patch
+  0007-mkimage-do-not-fail-if-there-is-no-.patch
+
+-------------------------------------------------------------------
u-boot-rpi.changes: same change
u-boot-rpi2.changes: same change
u-boot-rpi3.changes: same change
u-boot-rpi332b.changes: same change
u-boot-sinovoipbpim2plus.changes: same change
u-boot-snow.changes: same change
u-boot-socfpgade0nanosoc.changes: same change
u-boot-spring.changes: same change
u-boot-tinker-rk3288.changes: same change
u-boot-turrisomnia.changes: same change
u-boot-udoo.changes: same change
u-boot-udooneo.changes: same change
New Changes file:

--- /dev/null   2018-04-25 19:14:53.472341877 +0200
+++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-xilinxzynqmpgeneric.changes   
2018-05-16 11:43:27.820215057 +0200
@@ -0,0 +1,1907 @@
+-------------------------------------------------------------------
+Thu May 10 17:32:58 UTC 2018 - afaer...@suse.de
+
+- Conditionalize pine64plus ATF support on uboot_atf_pine64
+- u-boot-board.spec.in: Update license
+
+-------------------------------------------------------------------
+Thu May 10 16:17:39 UTC 2018 - afaer...@suse.de
+
+- Add poplar
+
+-------------------------------------------------------------------
+Wed May  9 07:24:31 UTC 2018 - guillaume.gar...@opensuse.org
+
+- Update to 2018.05
+
+-------------------------------------------------------------------
+Wed May  2 09:43:24 UTC 2018 - ag...@suse.com
+
+- Update to 2018.05-rc3
+
+-------------------------------------------------------------------
+Thu Apr 26 12:38:31 UTC 2018 - ag...@suse.com
+
+- Include u-boot.spec in autogeneration logic
+
+-------------------------------------------------------------------
+Thu Apr 26 11:40:19 UTC 2018 - ag...@suse.com
+
+- Add support for .bif generation in mkimage
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches added:
+  0006-tools-zynqmpimage-Add-partition-rea.patch
+  0007-tools-zynqmpimage-Move-defines-to-h.patch
+  0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
+  0009-tools-zynqmpimage-Add-bif-support.patch
+  0010-tools-zynqmpbif-Add-support-for-loa.patch
+
+-------------------------------------------------------------------
+Tue Apr 24 19:32:04 UTC 2018 - ag...@suse.com
+
+- Add generic ZynqMP support
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches added:
+  0005-zynqmp-Add-generic-target.patch
+
+-------------------------------------------------------------------
+Tue Apr 17 08:57:21 UTC 2018 - guillaume.gar...@opensuse.org
+
+- Update to 2018.05-rc2
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches dropped:
+  0004-rpi3-Enable-lan78xx-driver.patch
+  0005-rpi-Add-identifier-for-the-new-RPi3.patch
+  0006-efi_loader-Fix-network-DP-with-DM_E.patch
+  0007-mkimage-do-not-fail-if-there-is-no-.patch
+  0008-rpi-Allow-to-boot-without-serial.patch
+  0009-mmc-use-core-clock-frequency-in-bcm.patch
+  0010-Temp-workaround-for-Chromebook-snow.patch
+* Patches added:
+  0004-Temp-workaround-for-Chromebook-snow.patch
+
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches added:
+  0010-Temp-workaround-for-Chromebook-snow.patch
+  
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches dropped:
+  0009-rpi-Allow-to-boot-without-serial.patch
+  0010-mmc-use-core-clock-frequency-in-bcm.patch
+* Patches added:
+  0008-rpi-Allow-to-boot-without-serial.patch
+  0009-mmc-use-core-clock-frequency-in-bcm.patch
+    
+- Update to 2018.05-rc1
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches dropped:
+  0003-Revert-rockchip-mkimage-remove-plac.patch
+  0004-rpi-Use-firmware-provided-device-tr.patch
+  0005-rpi3-Enable-lan78xx-driver.patch
+  0006-net-Only-access-network-devices-aft.patch
+  0007-rpi-Add-identifier-for-the-new-RPi3.patch
+  0008-efi_loader-Fix-network-DP-with-DM_E.patch
+* Patches added:
+  0003-rpi-Use-firmware-provided-device-tr.patch
+  0004-rpi3-Enable-lan78xx-driver.patch
+  0005-rpi-Add-identifier-for-the-new-RPi3.patch
+  0006-efi_loader-Fix-network-DP-with-DM_E.patch
+  0007-mkimage-do-not-fail-if-there-is-no-.patch
+
+-------------------------------------------------------------------
+Thu Apr 12 15:19:29 UTC 2018 - ag...@suse.com
+
+- Package u-boot.elf on Xilinx systems
+
+-------------------------------------------------------------------
+Mon Apr  9 09:09:00 UTC 2018 - guillaume.gar...@opensuse.org
+
+- Workaround to boot on Chromebook (snow)
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.03
+* Patches added:
+  0011-Temp-workaround-for-Chromebook-snow.patch
+
+-------------------------------------------------------------------
+Thu Apr  5 11:25:47 UTC 2018 - ag...@suse.com
+
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.03
+* Patches added:
+  0010-mmc-use-core-clock-frequency-in-bcm.patch
+
+-------------------------------------------------------------------
+Thu Apr  5 09:54:56 UTC 2018 - ag...@suse.com
+
+- Fix rainbow screen on 32bit RPis (boo#1086757)
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.03
+* Patches added:
+  0009-rpi-Allow-to-boot-without-serial.patch
+
+-------------------------------------------------------------------
+Thu Mar 15 23:44:18 UTC 2018 - ag...@suse.com
+
+- Add Xilinx ZynqMP ZCU 102 target
+
+-------------------------------------------------------------------
+Thu Mar 15 16:34:22 UTC 2018 - ag...@suse.com
+
+- Enable new RPi3 B+ (bsc#1085262)
+- Fix network boot (bsc#1070775)
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.03
+* Patches added:
+  0005-rpi3-Enable-lan78xx-driver.patch
+  0006-net-Only-access-network-devices-aft.patch
+  0007-rpi-Add-identifier-for-the-new-RPi3.patch
+  0008-efi_loader-Fix-network-DP-with-DM_E.patch
+
+-------------------------------------------------------------------
+Wed Mar 14 15:13:44 UTC 2018 - guillaume.gar...@opensuse.org
+
+- Updated to 2018.03
+
+-------------------------------------------------------------------
+Tue Mar  6 13:26:21 UTC 2018 - guilla...@opensuse.org
+
+- Updated to 2018.03-rc4
+
+-------------------------------------------------------------------
+Thu Feb 22 08:43:30 UTC 2018 - guilla...@opensuse.org
+
+- Updated to 2018.03-rc3
+
+-------------------------------------------------------------------
+Wed Feb 21 16:48:20 UTC 2018 - ag...@suse.com
+
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.03
+* Patches added:
+  0004-rpi-Use-firmware-provided-device-tr.patch
+
+-------------------------------------------------------------------
+Tue Feb 13 12:26:59 UTC 2018 - guilla...@opensuse.org
+
+- Updated to 2018.03-rc2
+
+-------------------------------------------------------------------
+Tue Jan 30 07:48:10 UTC 2018 - guilla...@opensuse.org
+
+- Updated to 2018.03-rc1
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.03
+* Patches dropped:
+  0004-Fix-MMC1-external-SD-slot-on-Samsun.patch (Fixed upstream)
+
+-------------------------------------------------------------------
+Wed Jan 17 17:11:04 UTC 2018 - afaer...@suse.de
+
+- Add turrisomnia
+
+-------------------------------------------------------------------
+Wed Jan 17 09:51:41 UTC 2018 - guilla...@opensuse.org
+
+- Updated to 2018.01
+
+-------------------------------------------------------------------
+Mon Jan  8 09:02:47 UTC 2018 - guilla...@opensuse.org
+
+- Updated to 2018.01-rc3
+
+-------------------------------------------------------------------
+Tue Dec 19 13:59:57 UTC 2017 - guilla...@opensuse.org
+
+- Updated to 2018.01-rc2
+
+-------------------------------------------------------------------
+Fri Dec  8 07:50:19 UTC 2017 - guilla...@opensuse.org
+
+- Updated to 2018.01-rc1
+- Remove am57xx_evm_nodt since it has been removed upstream
+
+-------------------------------------------------------------------
++++ 1710 more lines (skipped)
++++ between /dev/null
++++ and 
/work/SRC/openSUSE:Factory/.u-boot.new/u-boot-xilinxzynqmpgeneric.changes
--- /work/SRC/openSUSE:Factory/u-boot/u-boot-xilinxzynqmpzcu102rev10.changes    
2018-04-13 12:52:02.882600824 +0200
+++ 
/work/SRC/openSUSE:Factory/.u-boot.new/u-boot-xilinxzynqmpzcu102rev10.changes   
    2018-05-16 11:43:29.556151871 +0200
@@ -1,0 +2,90 @@
+Thu May 10 17:32:58 UTC 2018 - afaer...@suse.de
+
+- Conditionalize pine64plus ATF support on uboot_atf_pine64
+- u-boot-board.spec.in: Update license
+
+-------------------------------------------------------------------
+Thu May 10 16:17:39 UTC 2018 - afaer...@suse.de
+
+- Add poplar
+
+-------------------------------------------------------------------
+Wed May  9 07:24:31 UTC 2018 - guillaume.gar...@opensuse.org
+
+- Update to 2018.05
+
+-------------------------------------------------------------------
+Wed May  2 09:43:24 UTC 2018 - ag...@suse.com
+
+- Update to 2018.05-rc3
+
+-------------------------------------------------------------------
+Thu Apr 26 12:38:31 UTC 2018 - ag...@suse.com
+
+- Include u-boot.spec in autogeneration logic
+
+-------------------------------------------------------------------
+Thu Apr 26 11:40:19 UTC 2018 - ag...@suse.com
+
+- Add support for .bif generation in mkimage
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches added:
+  0006-tools-zynqmpimage-Add-partition-rea.patch
+  0007-tools-zynqmpimage-Move-defines-to-h.patch
+  0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
+  0009-tools-zynqmpimage-Add-bif-support.patch
+  0010-tools-zynqmpbif-Add-support-for-loa.patch
+
+-------------------------------------------------------------------
+Tue Apr 24 19:32:04 UTC 2018 - ag...@suse.com
+
+- Add generic ZynqMP support
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches added:
+  0005-zynqmp-Add-generic-target.patch
+
+-------------------------------------------------------------------
+Tue Apr 17 08:57:21 UTC 2018 - guillaume.gar...@opensuse.org
+
+- Update to 2018.05-rc2
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches dropped:
+  0004-rpi3-Enable-lan78xx-driver.patch
+  0005-rpi-Add-identifier-for-the-new-RPi3.patch
+  0006-efi_loader-Fix-network-DP-with-DM_E.patch
+  0007-mkimage-do-not-fail-if-there-is-no-.patch
+  0008-rpi-Allow-to-boot-without-serial.patch
+  0009-mmc-use-core-clock-frequency-in-bcm.patch
+  0010-Temp-workaround-for-Chromebook-snow.patch
+* Patches added:
+  0004-Temp-workaround-for-Chromebook-snow.patch
+
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches added:
+  0010-Temp-workaround-for-Chromebook-snow.patch
+  
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches dropped:
+  0009-rpi-Allow-to-boot-without-serial.patch
+  0010-mmc-use-core-clock-frequency-in-bcm.patch
+* Patches added:
+  0008-rpi-Allow-to-boot-without-serial.patch
+  0009-mmc-use-core-clock-frequency-in-bcm.patch
+    
+- Update to 2018.05-rc1
+- Patch queue updated from git://github.com/openSUSE/u-boot.git 
tumbleweed-2018.05
+* Patches dropped:
+  0003-Revert-rockchip-mkimage-remove-plac.patch
+  0004-rpi-Use-firmware-provided-device-tr.patch
+  0005-rpi3-Enable-lan78xx-driver.patch
+  0006-net-Only-access-network-devices-aft.patch
+  0007-rpi-Add-identifier-for-the-new-RPi3.patch
+  0008-efi_loader-Fix-network-DP-with-DM_E.patch
+* Patches added:
+  0003-rpi-Use-firmware-provided-device-tr.patch
+  0004-rpi3-Enable-lan78xx-driver.patch
+  0005-rpi-Add-identifier-for-the-new-RPi3.patch
+  0006-efi_loader-Fix-network-DP-with-DM_E.patch
+  0007-mkimage-do-not-fail-if-there-is-no-.patch
+
+-------------------------------------------------------------------
u-boot.changes: same change

Old:
----
  0003-Revert-rockchip-mkimage-remove-plac.patch
  0004-rpi-Use-firmware-provided-device-tr.patch
  0005-rpi3-Enable-lan78xx-driver.patch
  0006-net-Only-access-network-devices-aft.patch
  0007-rpi-Add-identifier-for-the-new-RPi3.patch
  0008-efi_loader-Fix-network-DP-with-DM_E.patch
  0009-rpi-Allow-to-boot-without-serial.patch
  0010-mmc-use-core-clock-frequency-in-bcm.patch
  0011-Temp-workaround-for-Chromebook-snow.patch
  u-boot-2018.03.tar.bz2
  u-boot-2018.03.tar.bz2.sig

New:
----
  0003-rpi-Use-firmware-provided-device-tr.patch
  0004-Temp-workaround-for-Chromebook-snow.patch
  0005-zynqmp-Add-generic-target.patch
  0006-tools-zynqmpimage-Add-partition-rea.patch
  0007-tools-zynqmpimage-Move-defines-to-h.patch
  0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
  0009-tools-zynqmpimage-Add-bif-support.patch
  0010-tools-zynqmpbif-Add-support-for-loa.patch
  u-boot-2018.05.tar.bz2
  u-boot-2018.05.tar.bz2.sig
  u-boot-board.spec.in
  u-boot-poplar.changes
  u-boot-poplar.spec
  u-boot-xilinxzynqmpgeneric.changes
  u-boot-xilinxzynqmpgeneric.spec

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ u-boot-a10-olinuxino-lime.spec ++++++
--- /var/tmp/diff_new_pack.MQOfib/_old  2018-05-16 11:43:38.623821816 +0200
+++ /var/tmp/diff_new_pack.MQOfib/_new  2018-05-16 11:43:38.627821670 +0200
@@ -18,6 +18,8 @@
 #
 
 
+%bcond_with uboot_atf_pine64
+
 %define mvebu_spl 0
 %define x_loader 0
 %define rockchip_spl 0
@@ -32,10 +34,10 @@
 %endif
 
 # archive_version differs from version for RC version only
-%define archive_version 2018.03
+%define archive_version 2018.05
 
 Name:           u-boot-a10-olinuxino-lime
-Version:        2018.03
+Version:        2018.05
 Release:        0
 Summary:        The U-Boot firmware for the a10-olinuxino-lime platform
 License:        GPL-2.0-only
@@ -48,17 +50,16 @@
 Source300:      u-boot-rpmlintrc
 Patch0001:      0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch
 Patch0002:      0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch
-Patch0003:      0003-Revert-rockchip-mkimage-remove-plac.patch
-Patch0004:      0004-rpi-Use-firmware-provided-device-tr.patch
-Patch0005:      0005-rpi3-Enable-lan78xx-driver.patch
-Patch0006:      0006-net-Only-access-network-devices-aft.patch
-Patch0007:      0007-rpi-Add-identifier-for-the-new-RPi3.patch
-Patch0008:      0008-efi_loader-Fix-network-DP-with-DM_E.patch
-Patch0009:      0009-rpi-Allow-to-boot-without-serial.patch
-Patch0010:      0010-mmc-use-core-clock-frequency-in-bcm.patch
-Patch0011:      0011-Temp-workaround-for-Chromebook-snow.patch
+Patch0003:      0003-rpi-Use-firmware-provided-device-tr.patch
+Patch0004:      0004-Temp-workaround-for-Chromebook-snow.patch
+Patch0005:      0005-zynqmp-Add-generic-target.patch
+Patch0006:      0006-tools-zynqmpimage-Add-partition-rea.patch
+Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
+Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
+Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
+Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0
+%if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
 BuildRequires:  bc
@@ -73,6 +74,9 @@
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if "%{name}" == "u-boot-zynqmp"
+BuildRequires:  zynqmp-dts
+%endif
 %if 0%{?is_rpi}
 # Owns /boot/vc directory
 BuildRequires:  raspberrypi-firmware
@@ -111,7 +115,6 @@
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
-%patch0011 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes 
| tail -n 1 | cut -d- -f1 )" +%s)

u-boot-a13-olinuxino.spec: same change
u-boot-a13-olinuxinom.spec: same change
u-boot-a20-olinuxino-lime.spec: same change
u-boot-a20-olinuxino-lime2.spec: same change
u-boot-a20-olinuxinomicro.spec: same change
++++++ u-boot-am335xboneblack.spec ++++++
--- /var/tmp/diff_new_pack.MQOfib/_old  2018-05-16 11:43:38.771816429 +0200
+++ /var/tmp/diff_new_pack.MQOfib/_new  2018-05-16 11:43:38.775816284 +0200
@@ -18,6 +18,8 @@
 #
 
 
+%bcond_with uboot_atf_pine64
+
 %define mvebu_spl 0
 %define x_loader 1
 %define rockchip_spl 0
@@ -32,10 +34,10 @@
 %endif
 
 # archive_version differs from version for RC version only
-%define archive_version 2018.03
+%define archive_version 2018.05
 
 Name:           u-boot-am335xboneblack
-Version:        2018.03
+Version:        2018.05
 Release:        0
 Summary:        The U-Boot firmware for the am335xboneblack platform
 License:        GPL-2.0-only
@@ -48,17 +50,16 @@
 Source300:      u-boot-rpmlintrc
 Patch0001:      0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch
 Patch0002:      0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch
-Patch0003:      0003-Revert-rockchip-mkimage-remove-plac.patch
-Patch0004:      0004-rpi-Use-firmware-provided-device-tr.patch
-Patch0005:      0005-rpi3-Enable-lan78xx-driver.patch
-Patch0006:      0006-net-Only-access-network-devices-aft.patch
-Patch0007:      0007-rpi-Add-identifier-for-the-new-RPi3.patch
-Patch0008:      0008-efi_loader-Fix-network-DP-with-DM_E.patch
-Patch0009:      0009-rpi-Allow-to-boot-without-serial.patch
-Patch0010:      0010-mmc-use-core-clock-frequency-in-bcm.patch
-Patch0011:      0011-Temp-workaround-for-Chromebook-snow.patch
+Patch0003:      0003-rpi-Use-firmware-provided-device-tr.patch
+Patch0004:      0004-Temp-workaround-for-Chromebook-snow.patch
+Patch0005:      0005-zynqmp-Add-generic-target.patch
+Patch0006:      0006-tools-zynqmpimage-Add-partition-rea.patch
+Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
+Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
+Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
+Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0
+%if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
 BuildRequires:  bc
@@ -73,6 +74,9 @@
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if "%{name}" == "u-boot-zynqmp"
+BuildRequires:  zynqmp-dts
+%endif
 %if 0%{?is_rpi}
 # Owns /boot/vc directory
 BuildRequires:  raspberrypi-firmware
@@ -111,7 +115,6 @@
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
-%patch0011 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes 
| tail -n 1 | cut -d- -f1 )" +%s)

u-boot-am335xevm.spec: same change
++++++ u-boot-am57xxevm.spec ++++++
--- /var/tmp/diff_new_pack.MQOfib/_old  2018-05-16 11:43:38.815814827 +0200
+++ /var/tmp/diff_new_pack.MQOfib/_new  2018-05-16 11:43:38.819814682 +0200
@@ -18,6 +18,8 @@
 #
 
 
+%bcond_with uboot_atf_pine64
+
 %define mvebu_spl 0
 %define x_loader 0
 %define rockchip_spl 0
@@ -32,10 +34,10 @@
 %endif
 
 # archive_version differs from version for RC version only
-%define archive_version 2018.03
+%define archive_version 2018.05
 
 Name:           u-boot-am57xxevm
-Version:        2018.03
+Version:        2018.05
 Release:        0
 Summary:        The U-Boot firmware for the am57xxevm platform
 License:        GPL-2.0-only
@@ -48,17 +50,16 @@
 Source300:      u-boot-rpmlintrc
 Patch0001:      0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch
 Patch0002:      0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch
-Patch0003:      0003-Revert-rockchip-mkimage-remove-plac.patch
-Patch0004:      0004-rpi-Use-firmware-provided-device-tr.patch
-Patch0005:      0005-rpi3-Enable-lan78xx-driver.patch
-Patch0006:      0006-net-Only-access-network-devices-aft.patch
-Patch0007:      0007-rpi-Add-identifier-for-the-new-RPi3.patch
-Patch0008:      0008-efi_loader-Fix-network-DP-with-DM_E.patch
-Patch0009:      0009-rpi-Allow-to-boot-without-serial.patch
-Patch0010:      0010-mmc-use-core-clock-frequency-in-bcm.patch
-Patch0011:      0011-Temp-workaround-for-Chromebook-snow.patch
+Patch0003:      0003-rpi-Use-firmware-provided-device-tr.patch
+Patch0004:      0004-Temp-workaround-for-Chromebook-snow.patch
+Patch0005:      0005-zynqmp-Add-generic-target.patch
+Patch0006:      0006-tools-zynqmpimage-Add-partition-rea.patch
+Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
+Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
+Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
+Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0
+%if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
 BuildRequires:  bc
@@ -73,6 +74,9 @@
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if "%{name}" == "u-boot-zynqmp"
+BuildRequires:  zynqmp-dts
+%endif
 %if 0%{?is_rpi}
 # Owns /boot/vc directory
 BuildRequires:  raspberrypi-firmware
@@ -111,7 +115,6 @@
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
-%patch0011 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes 
| tail -n 1 | cut -d- -f1 )" +%s)

u-boot-arndale.spec: same change
u-boot-bananapi.spec: same change
++++++ u-boot-clearfog.spec ++++++
--- /var/tmp/diff_new_pack.MQOfib/_old  2018-05-16 11:43:38.883812353 +0200
+++ /var/tmp/diff_new_pack.MQOfib/_new  2018-05-16 11:43:38.883812353 +0200
@@ -18,6 +18,8 @@
 #
 
 
+%bcond_with uboot_atf_pine64
+
 %define mvebu_spl 1
 %define x_loader 0
 %define rockchip_spl 0
@@ -32,10 +34,10 @@
 %endif
 
 # archive_version differs from version for RC version only
-%define archive_version 2018.03
+%define archive_version 2018.05
 
 Name:           u-boot-clearfog
-Version:        2018.03
+Version:        2018.05
 Release:        0
 Summary:        The U-Boot firmware for the clearfog platform
 License:        GPL-2.0-only
@@ -48,17 +50,16 @@
 Source300:      u-boot-rpmlintrc
 Patch0001:      0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch
 Patch0002:      0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch
-Patch0003:      0003-Revert-rockchip-mkimage-remove-plac.patch
-Patch0004:      0004-rpi-Use-firmware-provided-device-tr.patch
-Patch0005:      0005-rpi3-Enable-lan78xx-driver.patch
-Patch0006:      0006-net-Only-access-network-devices-aft.patch
-Patch0007:      0007-rpi-Add-identifier-for-the-new-RPi3.patch
-Patch0008:      0008-efi_loader-Fix-network-DP-with-DM_E.patch
-Patch0009:      0009-rpi-Allow-to-boot-without-serial.patch
-Patch0010:      0010-mmc-use-core-clock-frequency-in-bcm.patch
-Patch0011:      0011-Temp-workaround-for-Chromebook-snow.patch
+Patch0003:      0003-rpi-Use-firmware-provided-device-tr.patch
+Patch0004:      0004-Temp-workaround-for-Chromebook-snow.patch
+Patch0005:      0005-zynqmp-Add-generic-target.patch
+Patch0006:      0006-tools-zynqmpimage-Add-partition-rea.patch
+Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
+Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
+Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
+Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0
+%if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
 BuildRequires:  bc
@@ -73,6 +74,9 @@
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if "%{name}" == "u-boot-zynqmp"
+BuildRequires:  zynqmp-dts
+%endif
 %if 0%{?is_rpi}
 # Owns /boot/vc directory
 BuildRequires:  raspberrypi-firmware
@@ -111,7 +115,6 @@
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
-%patch0011 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes 
| tail -n 1 | cut -d- -f1 )" +%s)

++++++ u-boot-colibrit20.spec ++++++
--- /var/tmp/diff_new_pack.MQOfib/_old  2018-05-16 11:43:38.903811624 +0200
+++ /var/tmp/diff_new_pack.MQOfib/_new  2018-05-16 11:43:38.907811479 +0200
@@ -18,6 +18,8 @@
 #
 
 
+%bcond_with uboot_atf_pine64
+
 %define mvebu_spl 0
 %define x_loader 0
 %define rockchip_spl 0
@@ -32,10 +34,10 @@
 %endif
 
 # archive_version differs from version for RC version only
-%define archive_version 2018.03
+%define archive_version 2018.05
 
 Name:           u-boot-colibrit20
-Version:        2018.03
+Version:        2018.05
 Release:        0
 Summary:        The U-Boot firmware for the colibrit20 platform
 License:        GPL-2.0-only
@@ -48,17 +50,16 @@
 Source300:      u-boot-rpmlintrc
 Patch0001:      0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch
 Patch0002:      0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch
-Patch0003:      0003-Revert-rockchip-mkimage-remove-plac.patch
-Patch0004:      0004-rpi-Use-firmware-provided-device-tr.patch
-Patch0005:      0005-rpi3-Enable-lan78xx-driver.patch
-Patch0006:      0006-net-Only-access-network-devices-aft.patch
-Patch0007:      0007-rpi-Add-identifier-for-the-new-RPi3.patch
-Patch0008:      0008-efi_loader-Fix-network-DP-with-DM_E.patch
-Patch0009:      0009-rpi-Allow-to-boot-without-serial.patch
-Patch0010:      0010-mmc-use-core-clock-frequency-in-bcm.patch
-Patch0011:      0011-Temp-workaround-for-Chromebook-snow.patch
+Patch0003:      0003-rpi-Use-firmware-provided-device-tr.patch
+Patch0004:      0004-Temp-workaround-for-Chromebook-snow.patch
+Patch0005:      0005-zynqmp-Add-generic-target.patch
+Patch0006:      0006-tools-zynqmpimage-Add-partition-rea.patch
+Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
+Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
+Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
+Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0
+%if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
 BuildRequires:  bc
@@ -73,6 +74,9 @@
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if "%{name}" == "u-boot-zynqmp"
+BuildRequires:  zynqmp-dts
+%endif
 %if 0%{?is_rpi}
 # Owns /boot/vc directory
 BuildRequires:  raspberrypi-firmware
@@ -111,7 +115,6 @@
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
-%patch0011 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes 
| tail -n 1 | cut -d- -f1 )" +%s)

u-boot-cubieboard.spec: same change
u-boot-cubieboard2.spec: same change
u-boot-cubietruck.spec: same change
u-boot-dragonboard410c.spec: same change
u-boot-evb-rk3399.spec: same change
++++++ u-boot-firefly-rk3288.spec ++++++
--- /var/tmp/diff_new_pack.MQOfib/_old  2018-05-16 11:43:39.043806528 +0200
+++ /var/tmp/diff_new_pack.MQOfib/_new  2018-05-16 11:43:39.047806383 +0200
@@ -18,6 +18,8 @@
 #
 
 
+%bcond_with uboot_atf_pine64
+
 %define mvebu_spl 0
 %define x_loader 0
 %define rockchip_spl 1
@@ -32,10 +34,10 @@
 %endif
 
 # archive_version differs from version for RC version only
-%define archive_version 2018.03
+%define archive_version 2018.05
 
 Name:           u-boot-firefly-rk3288
-Version:        2018.03
+Version:        2018.05
 Release:        0
 Summary:        The U-Boot firmware for the firefly-rk3288 platform
 License:        GPL-2.0-only
@@ -48,17 +50,16 @@
 Source300:      u-boot-rpmlintrc
 Patch0001:      0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch
 Patch0002:      0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch
-Patch0003:      0003-Revert-rockchip-mkimage-remove-plac.patch
-Patch0004:      0004-rpi-Use-firmware-provided-device-tr.patch
-Patch0005:      0005-rpi3-Enable-lan78xx-driver.patch
-Patch0006:      0006-net-Only-access-network-devices-aft.patch
-Patch0007:      0007-rpi-Add-identifier-for-the-new-RPi3.patch
-Patch0008:      0008-efi_loader-Fix-network-DP-with-DM_E.patch
-Patch0009:      0009-rpi-Allow-to-boot-without-serial.patch
-Patch0010:      0010-mmc-use-core-clock-frequency-in-bcm.patch
-Patch0011:      0011-Temp-workaround-for-Chromebook-snow.patch
+Patch0003:      0003-rpi-Use-firmware-provided-device-tr.patch
+Patch0004:      0004-Temp-workaround-for-Chromebook-snow.patch
+Patch0005:      0005-zynqmp-Add-generic-target.patch
+Patch0006:      0006-tools-zynqmpimage-Add-partition-rea.patch
+Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
+Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
+Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
+Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0
+%if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
 BuildRequires:  bc
@@ -73,6 +74,9 @@
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if "%{name}" == "u-boot-zynqmp"
+BuildRequires:  zynqmp-dts
+%endif
 %if 0%{?is_rpi}
 # Owns /boot/vc directory
 BuildRequires:  raspberrypi-firmware
@@ -111,7 +115,6 @@
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
-%patch0011 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes 
| tail -n 1 | cut -d- -f1 )" +%s)

++++++ u-boot-firefly-rk3399.spec ++++++
--- /var/tmp/diff_new_pack.MQOfib/_old  2018-05-16 11:43:39.071805509 +0200
+++ /var/tmp/diff_new_pack.MQOfib/_new  2018-05-16 11:43:39.071805509 +0200
@@ -18,6 +18,8 @@
 #
 
 
+%bcond_with uboot_atf_pine64
+
 %define mvebu_spl 0
 %define x_loader 0
 %define rockchip_spl 0
@@ -32,10 +34,10 @@
 %endif
 
 # archive_version differs from version for RC version only
-%define archive_version 2018.03
+%define archive_version 2018.05
 
 Name:           u-boot-firefly-rk3399
-Version:        2018.03
+Version:        2018.05
 Release:        0
 Summary:        The U-Boot firmware for the firefly-rk3399 platform
 License:        GPL-2.0-only
@@ -48,17 +50,16 @@
 Source300:      u-boot-rpmlintrc
 Patch0001:      0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch
 Patch0002:      0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch
-Patch0003:      0003-Revert-rockchip-mkimage-remove-plac.patch
-Patch0004:      0004-rpi-Use-firmware-provided-device-tr.patch
-Patch0005:      0005-rpi3-Enable-lan78xx-driver.patch
-Patch0006:      0006-net-Only-access-network-devices-aft.patch
-Patch0007:      0007-rpi-Add-identifier-for-the-new-RPi3.patch
-Patch0008:      0008-efi_loader-Fix-network-DP-with-DM_E.patch
-Patch0009:      0009-rpi-Allow-to-boot-without-serial.patch
-Patch0010:      0010-mmc-use-core-clock-frequency-in-bcm.patch
-Patch0011:      0011-Temp-workaround-for-Chromebook-snow.patch
+Patch0003:      0003-rpi-Use-firmware-provided-device-tr.patch
+Patch0004:      0004-Temp-workaround-for-Chromebook-snow.patch
+Patch0005:      0005-zynqmp-Add-generic-target.patch
+Patch0006:      0006-tools-zynqmpimage-Add-partition-rea.patch
+Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
+Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
+Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
+Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0
+%if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
 BuildRequires:  bc
@@ -73,6 +74,9 @@
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if "%{name}" == "u-boot-zynqmp"
+BuildRequires:  zynqmp-dts
+%endif
 %if 0%{?is_rpi}
 # Owns /boot/vc directory
 BuildRequires:  raspberrypi-firmware
@@ -111,7 +115,6 @@
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
-%patch0011 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes 
| tail -n 1 | cut -d- -f1 )" +%s)

u-boot-geekbox.spec: same change
u-boot-highbank.spec: same change
u-boot-hikey.spec: same change
u-boot-hyundaia7hd.spec: same change
u-boot-jetson-tk1.spec: same change
u-boot-lamobor1.spec: same change
u-boot-ls1012afrdmqspi.spec: same change
u-boot-melea1000.spec: same change
u-boot-merriia80optimus.spec: same change
u-boot-mvebudb-88f3720.spec: same change
u-boot-mvebudbarmada8k.spec: same change
u-boot-mvebuespressobin-88f3720.spec: same change
u-boot-mvebumcbin-88f8040.spec: same change
u-boot-mx53loco.spec: same change
u-boot-mx6cuboxi.spec: same change
u-boot-mx6qsabrelite.spec: same change
u-boot-nanopia64.spec: same change
u-boot-nanopineo.spec: same change
u-boot-nanopineoair.spec: same change
u-boot-odroid-c2.spec: same change
u-boot-odroid-xu3.spec: same change
u-boot-odroid.spec: same change
++++++ u-boot-omap3beagle.spec ++++++
--- /var/tmp/diff_new_pack.MQOfib/_old  2018-05-16 11:43:39.667783816 +0200
+++ /var/tmp/diff_new_pack.MQOfib/_new  2018-05-16 11:43:39.671783671 +0200
@@ -18,6 +18,8 @@
 #
 
 
+%bcond_with uboot_atf_pine64
+
 %define mvebu_spl 0
 %define x_loader 1
 %define rockchip_spl 0
@@ -32,10 +34,10 @@
 %endif
 
 # archive_version differs from version for RC version only
-%define archive_version 2018.03
+%define archive_version 2018.05
 
 Name:           u-boot-omap3beagle
-Version:        2018.03
+Version:        2018.05
 Release:        0
 Summary:        The U-Boot firmware for the omap3beagle platform
 License:        GPL-2.0-only
@@ -48,17 +50,16 @@
 Source300:      u-boot-rpmlintrc
 Patch0001:      0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch
 Patch0002:      0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch
-Patch0003:      0003-Revert-rockchip-mkimage-remove-plac.patch
-Patch0004:      0004-rpi-Use-firmware-provided-device-tr.patch
-Patch0005:      0005-rpi3-Enable-lan78xx-driver.patch
-Patch0006:      0006-net-Only-access-network-devices-aft.patch
-Patch0007:      0007-rpi-Add-identifier-for-the-new-RPi3.patch
-Patch0008:      0008-efi_loader-Fix-network-DP-with-DM_E.patch
-Patch0009:      0009-rpi-Allow-to-boot-without-serial.patch
-Patch0010:      0010-mmc-use-core-clock-frequency-in-bcm.patch
-Patch0011:      0011-Temp-workaround-for-Chromebook-snow.patch
+Patch0003:      0003-rpi-Use-firmware-provided-device-tr.patch
+Patch0004:      0004-Temp-workaround-for-Chromebook-snow.patch
+Patch0005:      0005-zynqmp-Add-generic-target.patch
+Patch0006:      0006-tools-zynqmpimage-Add-partition-rea.patch
+Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
+Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
+Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
+Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0
+%if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
 BuildRequires:  bc
@@ -73,6 +74,9 @@
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if "%{name}" == "u-boot-zynqmp"
+BuildRequires:  zynqmp-dts
+%endif
 %if 0%{?is_rpi}
 # Owns /boot/vc directory
 BuildRequires:  raspberrypi-firmware
@@ -111,7 +115,6 @@
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
-%patch0011 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes 
| tail -n 1 | cut -d- -f1 )" +%s)

u-boot-omap4panda.spec: same change
++++++ u-boot-orangepipc.spec ++++++
--- /var/tmp/diff_new_pack.MQOfib/_old  2018-05-16 11:43:39.731781487 +0200
+++ /var/tmp/diff_new_pack.MQOfib/_new  2018-05-16 11:43:39.731781487 +0200
@@ -18,6 +18,8 @@
 #
 
 
+%bcond_with uboot_atf_pine64
+
 %define mvebu_spl 0
 %define x_loader 0
 %define rockchip_spl 0
@@ -32,10 +34,10 @@
 %endif
 
 # archive_version differs from version for RC version only
-%define archive_version 2018.03
+%define archive_version 2018.05
 
 Name:           u-boot-orangepipc
-Version:        2018.03
+Version:        2018.05
 Release:        0
 Summary:        The U-Boot firmware for the orangepipc platform
 License:        GPL-2.0-only
@@ -48,17 +50,16 @@
 Source300:      u-boot-rpmlintrc
 Patch0001:      0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch
 Patch0002:      0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch
-Patch0003:      0003-Revert-rockchip-mkimage-remove-plac.patch
-Patch0004:      0004-rpi-Use-firmware-provided-device-tr.patch
-Patch0005:      0005-rpi3-Enable-lan78xx-driver.patch
-Patch0006:      0006-net-Only-access-network-devices-aft.patch
-Patch0007:      0007-rpi-Add-identifier-for-the-new-RPi3.patch
-Patch0008:      0008-efi_loader-Fix-network-DP-with-DM_E.patch
-Patch0009:      0009-rpi-Allow-to-boot-without-serial.patch
-Patch0010:      0010-mmc-use-core-clock-frequency-in-bcm.patch
-Patch0011:      0011-Temp-workaround-for-Chromebook-snow.patch
+Patch0003:      0003-rpi-Use-firmware-provided-device-tr.patch
+Patch0004:      0004-Temp-workaround-for-Chromebook-snow.patch
+Patch0005:      0005-zynqmp-Add-generic-target.patch
+Patch0006:      0006-tools-zynqmpimage-Add-partition-rea.patch
+Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
+Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
+Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
+Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0
+%if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
 BuildRequires:  bc
@@ -73,6 +74,9 @@
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if "%{name}" == "u-boot-zynqmp"
+BuildRequires:  zynqmp-dts
+%endif
 %if 0%{?is_rpi}
 # Owns /boot/vc directory
 BuildRequires:  raspberrypi-firmware
@@ -111,7 +115,6 @@
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
-%patch0011 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes 
| tail -n 1 | cut -d- -f1 )" +%s)

u-boot-orangepipc2.spec: same change
u-boot-p2371-2180.spec: same change
u-boot-paz00.spec: same change
++++++ u-boot-pcm051rev3.spec ++++++
--- /var/tmp/diff_new_pack.MQOfib/_old  2018-05-16 11:43:39.839777556 +0200
+++ /var/tmp/diff_new_pack.MQOfib/_new  2018-05-16 11:43:39.843777410 +0200
@@ -18,6 +18,8 @@
 #
 
 
+%bcond_with uboot_atf_pine64
+
 %define mvebu_spl 0
 %define x_loader 1
 %define rockchip_spl 0
@@ -32,10 +34,10 @@
 %endif
 
 # archive_version differs from version for RC version only
-%define archive_version 2018.03
+%define archive_version 2018.05
 
 Name:           u-boot-pcm051rev3
-Version:        2018.03
+Version:        2018.05
 Release:        0
 Summary:        The U-Boot firmware for the pcm051rev3 platform
 License:        GPL-2.0-only
@@ -48,17 +50,16 @@
 Source300:      u-boot-rpmlintrc
 Patch0001:      0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch
 Patch0002:      0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch
-Patch0003:      0003-Revert-rockchip-mkimage-remove-plac.patch
-Patch0004:      0004-rpi-Use-firmware-provided-device-tr.patch
-Patch0005:      0005-rpi3-Enable-lan78xx-driver.patch
-Patch0006:      0006-net-Only-access-network-devices-aft.patch
-Patch0007:      0007-rpi-Add-identifier-for-the-new-RPi3.patch
-Patch0008:      0008-efi_loader-Fix-network-DP-with-DM_E.patch
-Patch0009:      0009-rpi-Allow-to-boot-without-serial.patch
-Patch0010:      0010-mmc-use-core-clock-frequency-in-bcm.patch
-Patch0011:      0011-Temp-workaround-for-Chromebook-snow.patch
+Patch0003:      0003-rpi-Use-firmware-provided-device-tr.patch
+Patch0004:      0004-Temp-workaround-for-Chromebook-snow.patch
+Patch0005:      0005-zynqmp-Add-generic-target.patch
+Patch0006:      0006-tools-zynqmpimage-Add-partition-rea.patch
+Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
+Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
+Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
+Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0
+%if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
 BuildRequires:  bc
@@ -73,6 +74,9 @@
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if "%{name}" == "u-boot-zynqmp"
+BuildRequires:  zynqmp-dts
+%endif
 %if 0%{?is_rpi}
 # Owns /boot/vc directory
 BuildRequires:  raspberrypi-firmware
@@ -111,7 +115,6 @@
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
-%patch0011 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes 
| tail -n 1 | cut -d- -f1 )" +%s)

++++++ u-boot-pine64plus.spec ++++++
--- /var/tmp/diff_new_pack.MQOfib/_old  2018-05-16 11:43:39.871776391 +0200
+++ /var/tmp/diff_new_pack.MQOfib/_new  2018-05-16 11:43:39.875776246 +0200
@@ -18,6 +18,8 @@
 #
 
 
+%bcond_with uboot_atf_pine64
+
 %define mvebu_spl 0
 %define x_loader 0
 %define rockchip_spl 0
@@ -32,10 +34,10 @@
 %endif
 
 # archive_version differs from version for RC version only
-%define archive_version 2018.03
+%define archive_version 2018.05
 
 Name:           u-boot-pine64plus
-Version:        2018.03
+Version:        2018.05
 Release:        0
 Summary:        The U-Boot firmware for the pine64plus platform
 License:        GPL-2.0-only
@@ -48,17 +50,16 @@
 Source300:      u-boot-rpmlintrc
 Patch0001:      0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch
 Patch0002:      0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch
-Patch0003:      0003-Revert-rockchip-mkimage-remove-plac.patch
-Patch0004:      0004-rpi-Use-firmware-provided-device-tr.patch
-Patch0005:      0005-rpi3-Enable-lan78xx-driver.patch
-Patch0006:      0006-net-Only-access-network-devices-aft.patch
-Patch0007:      0007-rpi-Add-identifier-for-the-new-RPi3.patch
-Patch0008:      0008-efi_loader-Fix-network-DP-with-DM_E.patch
-Patch0009:      0009-rpi-Allow-to-boot-without-serial.patch
-Patch0010:      0010-mmc-use-core-clock-frequency-in-bcm.patch
-Patch0011:      0011-Temp-workaround-for-Chromebook-snow.patch
+Patch0003:      0003-rpi-Use-firmware-provided-device-tr.patch
+Patch0004:      0004-Temp-workaround-for-Chromebook-snow.patch
+Patch0005:      0005-zynqmp-Add-generic-target.patch
+Patch0006:      0006-tools-zynqmpimage-Add-partition-rea.patch
+Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
+Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
+Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
+Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0
+%if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
 BuildRequires:  bc
@@ -73,6 +74,9 @@
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if "%{name}" == "u-boot-zynqmp"
+BuildRequires:  zynqmp-dts
+%endif
 %if 0%{?is_rpi}
 # Owns /boot/vc directory
 BuildRequires:  raspberrypi-firmware
@@ -111,7 +115,6 @@
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
-%patch0011 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes 
| tail -n 1 | cut -d- -f1 )" +%s)

++++++ u-boot-poplar.spec ++++++
#
# spec file for package u-boot-poplar
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon
# Copyright (c) 2007-2010 by Silvan Calarco <silvan.cala...@mambasoft.it>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#


%bcond_with uboot_atf_pine64

%define mvebu_spl 0
%define x_loader 0
%define rockchip_spl 0
%define sunxi_spl 0
%define arndale_spl 0
%define origen_spl 0
%define imx6_spl 0
%define socfpga_spl 0

%if "poplar" == "rpi" || "poplar" == "rpi2" || "poplar" == "rpi332b" || 
"poplar" == "rpi3"
%define is_rpi 1
%endif

# archive_version differs from version for RC version only
%define archive_version 2018.05

Name:           u-boot-poplar
Version:        2018.05
Release:        0
Summary:        The U-Boot firmware for the poplar platform
License:        GPL-2.0-only
Group:          System/Boot
Url:            http://www.denx.de/wiki/U-Boot
Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2
Source1:        
ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2.sig
Source2:        arndale-bl1.img
Source3:        update_git.sh
Source300:      u-boot-rpmlintrc
Patch0001:      0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch
Patch0002:      0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch
Patch0003:      0003-rpi-Use-firmware-provided-device-tr.patch
Patch0004:      0004-Temp-workaround-for-Chromebook-snow.patch
Patch0005:      0005-zynqmp-Add-generic-target.patch
Patch0006:      0006-tools-zynqmpimage-Add-partition-rea.patch
Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
%if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
BuildRequires:  arm-trusted-firmware-pine64
%endif
BuildRequires:  bc
# Arndale board needs DTC >= 1.4
BuildRequires:  dtc >= 1.4.0
# u-boot-clearfog (tools/kwbimage.c) needs openssl to build
BuildRequires:  libopenssl-devel
BuildRequires:  python-devel
BuildRequires:  swig
%if "%{name}" == "u-boot-qemu-ppce500"
# Owns /usr/share/qemu directory
BuildRequires:  qemu
Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
%endif
%if "%{name}" == "u-boot-zynqmp"
BuildRequires:  zynqmp-dts
%endif
%if 0%{?is_rpi}
# Owns /boot/vc directory
BuildRequires:  raspberrypi-firmware
# For mountpoint
Requires(post): util-linux
%endif
Provides:       u-boot-loader
Conflicts:      otherproviders(u-boot-loader)
%if %x_loader == 1
Obsoletes:      x-loader-poplar
Provides:       x-loader-poplar
%endif
ExclusiveArch:  aarch64

%description
Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded 
PowerPC, ARM, MIPS and x86 processors.
This package contains the firmware for the poplar platform.

%package doc
Summary:        Documentation for the U-Boot Firmware
Group:          Documentation/Other

%description doc
Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded 
PowerPC, ARM, MIPS and x86 processors.
This package contains documentation for U-Boot firmware.

%prep
%setup -q -n u-boot-%{archive_version}
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
%patch0004 -p1
%patch0005 -p1
%patch0006 -p1
%patch0007 -p1
%patch0008 -p1
%patch0009 -p1
%patch0010 -p1

%build
export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | 
tail -n 1 | cut -d- -f1 )" +%s)
%if "%{name}" == "u-boot-pine64plus"
export BL31=/boot/bl31.bin
%endif

make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" poplar_defconfig
echo "Attempting to enable fdt apply command (.dtbo) support."
echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" 
USE_PRIVATE_LIBGG=yes

%ifarch aarch64
%if %sunxi_spl == 1
cat spl/sunxi-spl.bin u-boot.itb > u-boot-sunxi-with-spl.bin
%endif
%endif

%if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring"
# Chromebook ARM (snow) and HP Chromebook 11 (spring) need a uImage format
export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map)
./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START 
-n uboot -d u-boot-dtb.bin u-boot.img
%endif

%if %rockchip_spl == 1
for t in ; do
    ./tools/mkimage -n  -d spl/u-boot-spl.bin -T $t u-boot-spl.$t
done
%endif

%install
export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | 
tail -n 1 | cut -d- -f1 )" +%s)
export NO_BRP_STRIP_DEBUG=true
export NO_DEBUGINFO_STRIP_DEBUG=true
%define uboot_dir /boot
%if 0%{?is_rpi}
%define uboot_dir /boot/vc
%endif
%if "%{name}" == "u-boot-qemu-ppce500"
%define uboot_dir %{_datadir}/qemu
%endif
%if "%{name}" == "u-boot-jetson-tk1"
# tegra-uboot-flasher needs several intermediate files, under their original 
name.
for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin 
spl/u-boot-spl; do
    install -D -m 0644 $f %{buildroot}%{uboot_dir}/$f
done
%else
%if "%{name}" == "u-boot-p2371-2180"
# Jetson TX1 Driver Pack flash.sh needs several intermediate files, under their 
original name.
for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
    install -D -m 0644 $f %{buildroot}%{uboot_dir}/$f
done
%else
install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin
%if "%{name}" == "u-boot-qemu-ppce500"
mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500
%endif
%endif
%endif
%if %x_loader == 1
install -D -m 0644 MLO %{buildroot}%{uboot_dir}/MLO
%endif
%if %origen_spl == 1
install -D -m 0644 spl/origen-spl.bin %{buildroot}%{uboot_dir}/origen-spl.bin
%endif
%if %arndale_spl == 1
install -D -m 0644 spl/arndale-spl.bin %{buildroot}%{uboot_dir}/arndale-spl.bin
install -D -m 0644 %{SOURCE2} %{buildroot}%{uboot_dir}/arndale-bl1.img
%endif
%if %mvebu_spl == 1
install -D -m 0644 u-boot-spl.kwb %{buildroot}%{uboot_dir}/u-boot-spl.kwb
%endif
%if %rockchip_spl == 1
install -D -m 0644 spl/u-boot-spl.bin %{buildroot}%{uboot_dir}/u-boot-spl.bin
for t in ; do
    install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t
done
%endif
%if %sunxi_spl == 1
install -D -m 0644 spl/sunxi-spl.bin %{buildroot}%{uboot_dir}/sunxi-spl.bin
install -D -m 0644 u-boot-sunxi-with-spl.bin 
%{buildroot}%{uboot_dir}/u-boot-sunxi-with-spl.bin
%endif
%if %imx6_spl == 1
install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
%endif
%if %socfpga_spl == 1
install -D -m 0644 u-boot-with-spl.sfp 
%{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
%endif

%if 0%{?is_rpi}
%post
# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt.
# It needs to be on the first FAT partition, wherever we mounted it.
# a) Unmounted, then do nothing.
# b) Mounted as /boot/vc, then they're in the right place already.
# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
if mountpoint -q /boot/efi; then
  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp 
%{uboot_dir}/u-boot.bin /boot/efi/
fi
%endif

%files
%defattr(-,root,root)
%{uboot_dir}/*
%doc Licenses/gpl-2.0.txt README

%files doc
%defattr(-,root,root)
# Generic documents
%doc doc/README.JFFS2 doc/README.JFFS2_NAND doc/README.commands
%doc doc/README.autoboot doc/README.commands doc/README.console doc/README.dns
%doc doc/README.hwconfig doc/README.nand doc/README.NetConsole 
doc/README.serial_multi
%doc doc/README.SNTP doc/README.standalone doc/README.update doc/README.usb
%doc doc/README.video doc/README.VLAN doc/README.silent doc/README.POST
# Copy some useful kermit scripts as well
%doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd 
tools/kermit/send_image
# Now any h/w dependent Documentation
%doc doc/README.ARM-memory-map

%changelog
++++++ u-boot-qemu-ppce500.spec ++++++
--- /var/tmp/diff_new_pack.MQOfib/_old  2018-05-16 11:43:39.919774644 +0200
+++ /var/tmp/diff_new_pack.MQOfib/_new  2018-05-16 11:43:39.923774498 +0200
@@ -18,6 +18,8 @@
 #
 
 
+%bcond_with uboot_atf_pine64
+
 %define mvebu_spl 0
 %define x_loader 0
 %define rockchip_spl 0
@@ -32,10 +34,10 @@
 %endif
 
 # archive_version differs from version for RC version only
-%define archive_version 2018.03
+%define archive_version 2018.05
 
 Name:           u-boot-qemu-ppce500
-Version:        2018.03
+Version:        2018.05
 Release:        0
 Summary:        The U-Boot firmware for the qemu-ppce500 platform
 License:        GPL-2.0-only
@@ -48,17 +50,16 @@
 Source300:      u-boot-rpmlintrc
 Patch0001:      0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch
 Patch0002:      0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch
-Patch0003:      0003-Revert-rockchip-mkimage-remove-plac.patch
-Patch0004:      0004-rpi-Use-firmware-provided-device-tr.patch
-Patch0005:      0005-rpi3-Enable-lan78xx-driver.patch
-Patch0006:      0006-net-Only-access-network-devices-aft.patch
-Patch0007:      0007-rpi-Add-identifier-for-the-new-RPi3.patch
-Patch0008:      0008-efi_loader-Fix-network-DP-with-DM_E.patch
-Patch0009:      0009-rpi-Allow-to-boot-without-serial.patch
-Patch0010:      0010-mmc-use-core-clock-frequency-in-bcm.patch
-Patch0011:      0011-Temp-workaround-for-Chromebook-snow.patch
+Patch0003:      0003-rpi-Use-firmware-provided-device-tr.patch
+Patch0004:      0004-Temp-workaround-for-Chromebook-snow.patch
+Patch0005:      0005-zynqmp-Add-generic-target.patch
+Patch0006:      0006-tools-zynqmpimage-Add-partition-rea.patch
+Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
+Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
+Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
+Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0
+%if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
 BuildRequires:  bc
@@ -73,6 +74,9 @@
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if "%{name}" == "u-boot-zynqmp"
+BuildRequires:  zynqmp-dts
+%endif
 %if 0%{?is_rpi}
 # Owns /boot/vc directory
 BuildRequires:  raspberrypi-firmware
@@ -111,7 +115,6 @@
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
-%patch0011 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes 
| tail -n 1 | cut -d- -f1 )" +%s)

u-boot-rpi.spec: same change
u-boot-rpi2.spec: same change
u-boot-rpi3.spec: same change
u-boot-rpi332b.spec: same change
u-boot-sinovoipbpim2plus.spec: same change
u-boot-snow.spec: same change
u-boot-socfpgade0nanosoc.spec: same change
u-boot-spring.spec: same change
++++++ u-boot-tinker-rk3288.spec ++++++
--- /var/tmp/diff_new_pack.MQOfib/_old  2018-05-16 11:43:40.171765471 +0200
+++ /var/tmp/diff_new_pack.MQOfib/_new  2018-05-16 11:43:40.175765326 +0200
@@ -18,6 +18,8 @@
 #
 
 
+%bcond_with uboot_atf_pine64
+
 %define mvebu_spl 0
 %define x_loader 0
 %define rockchip_spl 1
@@ -32,10 +34,10 @@
 %endif
 
 # archive_version differs from version for RC version only
-%define archive_version 2018.03
+%define archive_version 2018.05
 
 Name:           u-boot-tinker-rk3288
-Version:        2018.03
+Version:        2018.05
 Release:        0
 Summary:        The U-Boot firmware for the tinker-rk3288 platform
 License:        GPL-2.0-only
@@ -48,17 +50,16 @@
 Source300:      u-boot-rpmlintrc
 Patch0001:      0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch
 Patch0002:      0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch
-Patch0003:      0003-Revert-rockchip-mkimage-remove-plac.patch
-Patch0004:      0004-rpi-Use-firmware-provided-device-tr.patch
-Patch0005:      0005-rpi3-Enable-lan78xx-driver.patch
-Patch0006:      0006-net-Only-access-network-devices-aft.patch
-Patch0007:      0007-rpi-Add-identifier-for-the-new-RPi3.patch
-Patch0008:      0008-efi_loader-Fix-network-DP-with-DM_E.patch
-Patch0009:      0009-rpi-Allow-to-boot-without-serial.patch
-Patch0010:      0010-mmc-use-core-clock-frequency-in-bcm.patch
-Patch0011:      0011-Temp-workaround-for-Chromebook-snow.patch
+Patch0003:      0003-rpi-Use-firmware-provided-device-tr.patch
+Patch0004:      0004-Temp-workaround-for-Chromebook-snow.patch
+Patch0005:      0005-zynqmp-Add-generic-target.patch
+Patch0006:      0006-tools-zynqmpimage-Add-partition-rea.patch
+Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
+Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
+Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
+Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0
+%if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
 BuildRequires:  bc
@@ -73,6 +74,9 @@
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if "%{name}" == "u-boot-zynqmp"
+BuildRequires:  zynqmp-dts
+%endif
 %if 0%{?is_rpi}
 # Owns /boot/vc directory
 BuildRequires:  raspberrypi-firmware
@@ -111,7 +115,6 @@
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
-%patch0011 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes 
| tail -n 1 | cut -d- -f1 )" +%s)

++++++ u-boot-turrisomnia.spec ++++++
--- /var/tmp/diff_new_pack.MQOfib/_old  2018-05-16 11:43:40.203764307 +0200
+++ /var/tmp/diff_new_pack.MQOfib/_new  2018-05-16 11:43:40.207764161 +0200
@@ -18,6 +18,8 @@
 #
 
 
+%bcond_with uboot_atf_pine64
+
 %define mvebu_spl 1
 %define x_loader 0
 %define rockchip_spl 0
@@ -32,10 +34,10 @@
 %endif
 
 # archive_version differs from version for RC version only
-%define archive_version 2018.03
+%define archive_version 2018.05
 
 Name:           u-boot-turrisomnia
-Version:        2018.03
+Version:        2018.05
 Release:        0
 Summary:        The U-Boot firmware for the turrisomnia platform
 License:        GPL-2.0-only
@@ -48,17 +50,16 @@
 Source300:      u-boot-rpmlintrc
 Patch0001:      0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch
 Patch0002:      0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch
-Patch0003:      0003-Revert-rockchip-mkimage-remove-plac.patch
-Patch0004:      0004-rpi-Use-firmware-provided-device-tr.patch
-Patch0005:      0005-rpi3-Enable-lan78xx-driver.patch
-Patch0006:      0006-net-Only-access-network-devices-aft.patch
-Patch0007:      0007-rpi-Add-identifier-for-the-new-RPi3.patch
-Patch0008:      0008-efi_loader-Fix-network-DP-with-DM_E.patch
-Patch0009:      0009-rpi-Allow-to-boot-without-serial.patch
-Patch0010:      0010-mmc-use-core-clock-frequency-in-bcm.patch
-Patch0011:      0011-Temp-workaround-for-Chromebook-snow.patch
+Patch0003:      0003-rpi-Use-firmware-provided-device-tr.patch
+Patch0004:      0004-Temp-workaround-for-Chromebook-snow.patch
+Patch0005:      0005-zynqmp-Add-generic-target.patch
+Patch0006:      0006-tools-zynqmpimage-Add-partition-rea.patch
+Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
+Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
+Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
+Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0
+%if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
 BuildRequires:  bc
@@ -73,6 +74,9 @@
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if "%{name}" == "u-boot-zynqmp"
+BuildRequires:  zynqmp-dts
+%endif
 %if 0%{?is_rpi}
 # Owns /boot/vc directory
 BuildRequires:  raspberrypi-firmware
@@ -111,7 +115,6 @@
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
-%patch0011 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes 
| tail -n 1 | cut -d- -f1 )" +%s)

++++++ u-boot-udoo.spec ++++++
--- /var/tmp/diff_new_pack.MQOfib/_old  2018-05-16 11:43:40.235763142 +0200
+++ /var/tmp/diff_new_pack.MQOfib/_new  2018-05-16 11:43:40.235763142 +0200
@@ -18,6 +18,8 @@
 #
 
 
+%bcond_with uboot_atf_pine64
+
 %define mvebu_spl 0
 %define x_loader 0
 %define rockchip_spl 0
@@ -32,10 +34,10 @@
 %endif
 
 # archive_version differs from version for RC version only
-%define archive_version 2018.03
+%define archive_version 2018.05
 
 Name:           u-boot-udoo
-Version:        2018.03
+Version:        2018.05
 Release:        0
 Summary:        The U-Boot firmware for the udoo platform
 License:        GPL-2.0-only
@@ -48,17 +50,16 @@
 Source300:      u-boot-rpmlintrc
 Patch0001:      0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch
 Patch0002:      0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch
-Patch0003:      0003-Revert-rockchip-mkimage-remove-plac.patch
-Patch0004:      0004-rpi-Use-firmware-provided-device-tr.patch
-Patch0005:      0005-rpi3-Enable-lan78xx-driver.patch
-Patch0006:      0006-net-Only-access-network-devices-aft.patch
-Patch0007:      0007-rpi-Add-identifier-for-the-new-RPi3.patch
-Patch0008:      0008-efi_loader-Fix-network-DP-with-DM_E.patch
-Patch0009:      0009-rpi-Allow-to-boot-without-serial.patch
-Patch0010:      0010-mmc-use-core-clock-frequency-in-bcm.patch
-Patch0011:      0011-Temp-workaround-for-Chromebook-snow.patch
+Patch0003:      0003-rpi-Use-firmware-provided-device-tr.patch
+Patch0004:      0004-Temp-workaround-for-Chromebook-snow.patch
+Patch0005:      0005-zynqmp-Add-generic-target.patch
+Patch0006:      0006-tools-zynqmpimage-Add-partition-rea.patch
+Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
+Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
+Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
+Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0
+%if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
 BuildRequires:  bc
@@ -73,6 +74,9 @@
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if "%{name}" == "u-boot-zynqmp"
+BuildRequires:  zynqmp-dts
+%endif
 %if 0%{?is_rpi}
 # Owns /boot/vc directory
 BuildRequires:  raspberrypi-firmware
@@ -111,7 +115,6 @@
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
-%patch0011 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes 
| tail -n 1 | cut -d- -f1 )" +%s)

u-boot-udooneo.spec: same change
++++++ u-boot-xilinxzynqmpgeneric.spec ++++++
#
# spec file for package u-boot-xilinxzynqmpgeneric
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon
# Copyright (c) 2007-2010 by Silvan Calarco <silvan.cala...@mambasoft.it>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#


%bcond_with uboot_atf_pine64

%define mvebu_spl 0
%define x_loader 0
%define rockchip_spl 0
%define sunxi_spl 0
%define arndale_spl 0
%define origen_spl 0
%define imx6_spl 0
%define socfpga_spl 0

%if "xilinxzynqmpgeneric" == "rpi" || "xilinxzynqmpgeneric" == "rpi2" || 
"xilinxzynqmpgeneric" == "rpi332b" || "xilinxzynqmpgeneric" == "rpi3"
%define is_rpi 1
%endif

# archive_version differs from version for RC version only
%define archive_version 2018.05

Name:           u-boot-xilinxzynqmpgeneric
Version:        2018.05
Release:        0
Summary:        The U-Boot firmware for the xilinxzynqmpgeneric platform
License:        GPL-2.0-only
Group:          System/Boot
Url:            http://www.denx.de/wiki/U-Boot
Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2
Source1:        
ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2.sig
Source2:        arndale-bl1.img
Source3:        update_git.sh
Source300:      u-boot-rpmlintrc
Patch0001:      0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch
Patch0002:      0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch
Patch0003:      0003-rpi-Use-firmware-provided-device-tr.patch
Patch0004:      0004-Temp-workaround-for-Chromebook-snow.patch
Patch0005:      0005-zynqmp-Add-generic-target.patch
Patch0006:      0006-tools-zynqmpimage-Add-partition-rea.patch
Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
%if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
BuildRequires:  arm-trusted-firmware-pine64
%endif
BuildRequires:  bc
# Arndale board needs DTC >= 1.4
BuildRequires:  dtc >= 1.4.0
# u-boot-clearfog (tools/kwbimage.c) needs openssl to build
BuildRequires:  libopenssl-devel
BuildRequires:  python-devel
BuildRequires:  swig
%if "%{name}" == "u-boot-qemu-ppce500"
# Owns /usr/share/qemu directory
BuildRequires:  qemu
Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
%endif
%if "%{name}" == "u-boot-zynqmp"
BuildRequires:  zynqmp-dts
%endif
%if 0%{?is_rpi}
# Owns /boot/vc directory
BuildRequires:  raspberrypi-firmware
# For mountpoint
Requires(post): util-linux
%endif
Provides:       u-boot-loader
Conflicts:      otherproviders(u-boot-loader)
%if %x_loader == 1
Obsoletes:      x-loader-xilinxzynqmpgeneric
Provides:       x-loader-xilinxzynqmpgeneric
%endif
ExclusiveArch:  aarch64

%description
Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded 
PowerPC, ARM, MIPS and x86 processors.
This package contains the firmware for the xilinxzynqmpgeneric platform.

%package doc
Summary:        Documentation for the U-Boot Firmware
Group:          Documentation/Other

%description doc
Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded 
PowerPC, ARM, MIPS and x86 processors.
This package contains documentation for U-Boot firmware.

%prep
%setup -q -n u-boot-%{archive_version}
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
%patch0004 -p1
%patch0005 -p1
%patch0006 -p1
%patch0007 -p1
%patch0008 -p1
%patch0009 -p1
%patch0010 -p1

%build
export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | 
tail -n 1 | cut -d- -f1 )" +%s)
%if "%{name}" == "u-boot-pine64plus"
export BL31=/boot/bl31.bin
%endif

make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" 
xilinx_zynqmp_generic_defconfig
echo "Attempting to enable fdt apply command (.dtbo) support."
echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" 
USE_PRIVATE_LIBGG=yes

%ifarch aarch64
%if %sunxi_spl == 1
cat spl/sunxi-spl.bin u-boot.itb > u-boot-sunxi-with-spl.bin
%endif
%endif

%if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring"
# Chromebook ARM (snow) and HP Chromebook 11 (spring) need a uImage format
export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map)
./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START 
-n uboot -d u-boot-dtb.bin u-boot.img
%endif

%if %rockchip_spl == 1
for t in ; do
    ./tools/mkimage -n  -d spl/u-boot-spl.bin -T $t u-boot-spl.$t
done
%endif

%install
export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | 
tail -n 1 | cut -d- -f1 )" +%s)
export NO_BRP_STRIP_DEBUG=true
export NO_DEBUGINFO_STRIP_DEBUG=true
%define uboot_dir /boot
%if 0%{?is_rpi}
%define uboot_dir /boot/vc
%endif
%if "%{name}" == "u-boot-qemu-ppce500"
%define uboot_dir %{_datadir}/qemu
%endif
%if "%{name}" == "u-boot-jetson-tk1"
# tegra-uboot-flasher needs several intermediate files, under their original 
name.
for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin 
spl/u-boot-spl; do
    install -D -m 0644 $f %{buildroot}%{uboot_dir}/$f
done
%else
%if "%{name}" == "u-boot-p2371-2180"
# Jetson TX1 Driver Pack flash.sh needs several intermediate files, under their 
original name.
for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
    install -D -m 0644 $f %{buildroot}%{uboot_dir}/$f
done
%else
install -D -m 0644 u-boot.elf %{buildroot}%{uboot_dir}/u-boot.elf
%if "%{name}" == "u-boot-qemu-ppce500"
mv %{buildroot}%{uboot_dir}/u-boot.elf %{buildroot}%{uboot_dir}/u-boot.e500
%endif
%endif
%endif
%if %x_loader == 1
install -D -m 0644 MLO %{buildroot}%{uboot_dir}/MLO
%endif
%if %origen_spl == 1
install -D -m 0644 spl/origen-spl.bin %{buildroot}%{uboot_dir}/origen-spl.bin
%endif
%if %arndale_spl == 1
install -D -m 0644 spl/arndale-spl.bin %{buildroot}%{uboot_dir}/arndale-spl.bin
install -D -m 0644 %{SOURCE2} %{buildroot}%{uboot_dir}/arndale-bl1.img
%endif
%if %mvebu_spl == 1
install -D -m 0644 u-boot-spl.kwb %{buildroot}%{uboot_dir}/u-boot-spl.kwb
%endif
%if %rockchip_spl == 1
install -D -m 0644 spl/u-boot-spl.bin %{buildroot}%{uboot_dir}/u-boot-spl.bin
for t in ; do
    install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t
done
%endif
%if %sunxi_spl == 1
install -D -m 0644 spl/sunxi-spl.bin %{buildroot}%{uboot_dir}/sunxi-spl.bin
install -D -m 0644 u-boot-sunxi-with-spl.bin 
%{buildroot}%{uboot_dir}/u-boot-sunxi-with-spl.bin
%endif
%if %imx6_spl == 1
install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
%endif
%if %socfpga_spl == 1
install -D -m 0644 u-boot-with-spl.sfp 
%{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
%endif

%if 0%{?is_rpi}
%post
# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt.
# It needs to be on the first FAT partition, wherever we mounted it.
# a) Unmounted, then do nothing.
# b) Mounted as /boot/vc, then they're in the right place already.
# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
if mountpoint -q /boot/efi; then
  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp 
%{uboot_dir}/u-boot.elf /boot/efi/
fi
%endif

%files
%defattr(-,root,root)
%{uboot_dir}/*
%doc Licenses/gpl-2.0.txt README

%files doc
%defattr(-,root,root)
# Generic documents
%doc doc/README.JFFS2 doc/README.JFFS2_NAND doc/README.commands
%doc doc/README.autoboot doc/README.commands doc/README.console doc/README.dns
%doc doc/README.hwconfig doc/README.nand doc/README.NetConsole 
doc/README.serial_multi
%doc doc/README.SNTP doc/README.standalone doc/README.update doc/README.usb
%doc doc/README.video doc/README.VLAN doc/README.silent doc/README.POST
# Copy some useful kermit scripts as well
%doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd 
tools/kermit/send_image
# Now any h/w dependent Documentation
%doc doc/README.ARM-memory-map

%changelog
++++++ u-boot-xilinxzynqmpzcu102rev10.spec ++++++
--- /var/tmp/diff_new_pack.MQOfib/_old  2018-05-16 11:43:40.311760376 +0200
+++ /var/tmp/diff_new_pack.MQOfib/_new  2018-05-16 11:43:40.311760376 +0200
@@ -18,6 +18,8 @@
 #
 
 
+%bcond_with uboot_atf_pine64
+
 %define mvebu_spl 0
 %define x_loader 0
 %define rockchip_spl 0
@@ -32,10 +34,10 @@
 %endif
 
 # archive_version differs from version for RC version only
-%define archive_version 2018.03
+%define archive_version 2018.05
 
 Name:           u-boot-xilinxzynqmpzcu102rev10
-Version:        2018.03
+Version:        2018.05
 Release:        0
 Summary:        The U-Boot firmware for the xilinxzynqmpzcu102rev10 platform
 License:        GPL-2.0-only
@@ -48,17 +50,16 @@
 Source300:      u-boot-rpmlintrc
 Patch0001:      0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch
 Patch0002:      0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch
-Patch0003:      0003-Revert-rockchip-mkimage-remove-plac.patch
-Patch0004:      0004-rpi-Use-firmware-provided-device-tr.patch
-Patch0005:      0005-rpi3-Enable-lan78xx-driver.patch
-Patch0006:      0006-net-Only-access-network-devices-aft.patch
-Patch0007:      0007-rpi-Add-identifier-for-the-new-RPi3.patch
-Patch0008:      0008-efi_loader-Fix-network-DP-with-DM_E.patch
-Patch0009:      0009-rpi-Allow-to-boot-without-serial.patch
-Patch0010:      0010-mmc-use-core-clock-frequency-in-bcm.patch
-Patch0011:      0011-Temp-workaround-for-Chromebook-snow.patch
+Patch0003:      0003-rpi-Use-firmware-provided-device-tr.patch
+Patch0004:      0004-Temp-workaround-for-Chromebook-snow.patch
+Patch0005:      0005-zynqmp-Add-generic-target.patch
+Patch0006:      0006-tools-zynqmpimage-Add-partition-rea.patch
+Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
+Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
+Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
+Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0
+%if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
 BuildRequires:  arm-trusted-firmware-pine64
 %endif
 BuildRequires:  bc
@@ -73,6 +74,9 @@
 BuildRequires:  qemu
 Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
 %endif
+%if "%{name}" == "u-boot-zynqmp"
+BuildRequires:  zynqmp-dts
+%endif
 %if 0%{?is_rpi}
 # Owns /boot/vc directory
 BuildRequires:  raspberrypi-firmware
@@ -111,7 +115,6 @@
 %patch0008 -p1
 %patch0009 -p1
 %patch0010 -p1
-%patch0011 -p1
 
 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes 
| tail -n 1 | cut -d- -f1 )" +%s)

++++++ u-boot.spec ++++++
--- /var/tmp/diff_new_pack.MQOfib/_old  2018-05-16 11:43:40.339759357 +0200
+++ /var/tmp/diff_new_pack.MQOfib/_new  2018-05-16 11:43:40.343759211 +0200
@@ -19,10 +19,10 @@
 
 
 # 'archive_version' differs from 'version' for RC version only
-%define archive_version 2018.03
+%define archive_version 2018.05
 
 Name:           u-boot
-Version:        2018.03
+Version:        2018.05
 Release:        0
 Summary:        Tools for the U-Boot Firmware
 License:        GPL-2.0-only
@@ -30,6 +30,16 @@
 Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2
 Source1:        
ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2.sig
+Patch0001:      0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch
+Patch0002:      0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch
+Patch0003:      0003-rpi-Use-firmware-provided-device-tr.patch
+Patch0004:      0004-Temp-workaround-for-Chromebook-snow.patch
+Patch0005:      0005-zynqmp-Add-generic-target.patch
+Patch0006:      0006-tools-zynqmpimage-Add-partition-rea.patch
+Patch0007:      0007-tools-zynqmpimage-Move-defines-to-h.patch
+Patch0008:      0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch
+Patch0009:      0009-tools-zynqmpimage-Add-bif-support.patch
+Patch0010:      0010-tools-zynqmpbif-Add-support-for-loa.patch
 BuildRequires:  libopenssl-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -50,6 +60,16 @@
 
 %prep
 %setup -q -n u-boot-%{archive_version}
+%patch0001 -p1
+%patch0002 -p1
+%patch0003 -p1
+%patch0004 -p1
+%patch0005 -p1
+%patch0006 -p1
+%patch0007 -p1
+%patch0008 -p1
+%patch0009 -p1
+%patch0010 -p1
 
 %build
 # needed for include/config/auto.conf

++++++ 0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch ++++++
--- /var/tmp/diff_new_pack.MQOfib/_old  2018-05-16 11:43:40.367758337 +0200
+++ /var/tmp/diff_new_pack.MQOfib/_new  2018-05-16 11:43:40.367758337 +0200
@@ -1,4 +1,4 @@
-From f9856b798578670b682889a05a9e4df078a53dd6 Mon Sep 17 00:00:00 2001
+From db706bed3365f1c03e47cc7f46a0a23462f9ac17 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <ag...@suse.de>
 Date: Wed, 13 Apr 2016 13:44:29 +0200
 Subject: [PATCH] XXX openSUSE XXX: Load dtb from partition 2
@@ -16,10 +16,10 @@
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
-index f567cebd38..96b05aeeed 100644
+index 8d5feb3ac7..8ec95574ca 100644
 --- a/include/config_distro_bootcmd.h
 +++ b/include/config_distro_bootcmd.h
-@@ -135,16 +135,16 @@
+@@ -134,16 +134,16 @@
                "fi\0"                                                    \
        \
        "load_efi_dtb="                                                   \

++++++ 0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch ++++++
--- /var/tmp/diff_new_pack.MQOfib/_old  2018-05-16 11:43:40.383757755 +0200
+++ /var/tmp/diff_new_pack.MQOfib/_new  2018-05-16 11:43:40.383757755 +0200
@@ -1,4 +1,4 @@
-From ac419f82c82becdd6ee09bd3c5574a181deff939 Mon Sep 17 00:00:00 2001
+From 4daf6d83c59033e5b9ac84d7b97b1093ed0aa852 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <ag...@suse.de>
 Date: Mon, 2 May 2016 23:25:07 +0200
 Subject: [PATCH] Revert "Revert "omap3: Use raw SPL by default for mmc1""
@@ -9,10 +9,10 @@
  1 file changed, 2 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/boot-common.c 
b/arch/arm/mach-omap2/boot-common.c
-index db68a9d7e2..d246ebc12d 100644
+index 0e9fd03fef..7b1cdb2e68 100644
 --- a/arch/arm/mach-omap2/boot-common.c
 +++ b/arch/arm/mach-omap2/boot-common.c
-@@ -134,8 +134,6 @@ void save_omap_boot_params(void)
+@@ -133,8 +133,6 @@ void save_omap_boot_params(void)
            (boot_device <= MMC_BOOT_DEVICES_END)) {
                switch (boot_device) {
                case BOOT_DEVICE_MMC1:

++++++ 0004-rpi-Use-firmware-provided-device-tr.patch -> 
0003-rpi-Use-firmware-provided-device-tr.patch ++++++
--- 
/work/SRC/openSUSE:Factory/u-boot/0004-rpi-Use-firmware-provided-device-tr.patch
    2018-03-19 23:37:34.783081656 +0100
+++ 
/work/SRC/openSUSE:Factory/.u-boot.new/0003-rpi-Use-firmware-provided-device-tr.patch
       2018-05-16 11:42:34.858142734 +0200
@@ -1,4 +1,4 @@
-From 9bdcbebe4b666a372d86a9832db4aca036fa6423 Mon Sep 17 00:00:00 2001
+From 9f72e6e9b9a69eaec7e1ea2e70c63ad04ce755ba Mon Sep 17 00:00:00 2001
 From: Alexander Graf <ag...@suse.de>
 Date: Wed, 21 Feb 2018 17:41:13 +0100
 Subject: [PATCH] rpi: Use firmware provided device tree
@@ -28,7 +28,7 @@
  6 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
-index 04717d5e50..3b7e4f7ad9 100644
+index fcc2ae68c9..48b656cdb2 100644
 --- a/configs/rpi_0_w_defconfig
 +++ b/configs/rpi_0_w_defconfig
 @@ -12,7 +12,7 @@ CONFIG_SYS_PROMPT="U-Boot> "
@@ -39,9 +39,9 @@
 +CONFIG_OF_BOARD=y
  CONFIG_ENV_FAT_INTERFACE="mmc"
  CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
- CONFIG_DM_KEYBOARD=y
+ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
-index f8203c9d47..de9c0e1937 100644
+index 204af74239..ed60fd96d8 100644
 --- a/configs/rpi_2_defconfig
 +++ b/configs/rpi_2_defconfig
 @@ -12,7 +12,7 @@ CONFIG_SYS_PROMPT="U-Boot> "
@@ -52,9 +52,9 @@
 +CONFIG_OF_BOARD=y
  CONFIG_ENV_FAT_INTERFACE="mmc"
  CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
- CONFIG_DM_KEYBOARD=y
+ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
-index 317fc28f71..2bbe687359 100644
+index 9e142cae63..465e97b662 100644
 --- a/configs/rpi_3_32b_defconfig
 +++ b/configs/rpi_3_32b_defconfig
 @@ -13,7 +13,7 @@ CONFIG_SYS_PROMPT="U-Boot> "
@@ -65,9 +65,9 @@
 +CONFIG_OF_BOARD=y
  CONFIG_ENV_FAT_INTERFACE="mmc"
  CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
- CONFIG_DM_KEYBOARD=y
+ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
-index 0f3a54ec9a..ca55f8dc66 100644
+index f46e504497..cbae3d198b 100644
 --- a/configs/rpi_3_defconfig
 +++ b/configs/rpi_3_defconfig
 @@ -13,7 +13,7 @@ CONFIG_SYS_PROMPT="U-Boot> "
@@ -78,9 +78,9 @@
 +CONFIG_OF_BOARD=y
  CONFIG_ENV_FAT_INTERFACE="mmc"
  CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
- CONFIG_DM_KEYBOARD=y
+ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
-index d13d3d3e2e..d75032c420 100644
+index 82c90d40e1..916b6df5a6 100644
 --- a/configs/rpi_defconfig
 +++ b/configs/rpi_defconfig
 @@ -12,7 +12,7 @@ CONFIG_SYS_PROMPT="U-Boot> "
@@ -91,12 +91,12 @@
 +CONFIG_OF_BOARD=y
  CONFIG_ENV_FAT_INTERFACE="mmc"
  CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
- CONFIG_DM_KEYBOARD=y
+ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 diff --git a/include/configs/rpi.h b/include/configs/rpi.h
-index 17cdecd1c3..bea4ab1b9a 100644
+index 69a22e1700..8b21453d78 100644
 --- a/include/configs/rpi.h
 +++ b/include/configs/rpi.h
-@@ -125,7 +125,7 @@
+@@ -123,7 +123,7 @@
  #define ENV_MEM_LAYOUT_SETTINGS \
        "fdt_high=ffffffff\0" \
        "initrd_high=ffffffff\0" \

++++++ 0011-Temp-workaround-for-Chromebook-snow.patch -> 
0004-Temp-workaround-for-Chromebook-snow.patch ++++++
--- 
/work/SRC/openSUSE:Factory/u-boot/0011-Temp-workaround-for-Chromebook-snow.patch
    2018-04-11 14:00:50.821284987 +0200
+++ 
/work/SRC/openSUSE:Factory/.u-boot.new/0004-Temp-workaround-for-Chromebook-snow.patch
       2018-05-16 11:42:34.906140987 +0200
@@ -1,4 +1,4 @@
-From 7710a68a4efaa90acd0ac57aa04909b63199e410 Mon Sep 17 00:00:00 2001
+From 4c0955c1217ea7adb6a71d79fd628940b69335fa Mon Sep 17 00:00:00 2001
 From: Guillaume GARDET <guillaume.gar...@free.fr>
 Date: Mon, 9 Apr 2018 10:28:26 +0200
 Subject: [PATCH] Temp workaround for Chromebook snow to avoid the 'unable to
@@ -9,10 +9,10 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
-index 23f642980b..28f4fa0f21 100644
+index 13180fc0d6..a90d8e9140 100644
 --- a/drivers/mmc/dw_mmc.c
 +++ b/drivers/mmc/dw_mmc.c
-@@ -508,7 +508,8 @@ void dwmci_setup_cfg(struct mmc_config *cfg, struct 
dwmci_host *host,
+@@ -507,7 +507,8 @@ void dwmci_setup_cfg(struct mmc_config *cfg, struct 
dwmci_host *host,
                cfg->host_caps |= MMC_MODE_4BIT;
                cfg->host_caps &= ~MMC_MODE_8BIT;
        }

++++++ 0005-zynqmp-Add-generic-target.patch ++++++
>From fe5f8db721930763c7c538de4e21535170879d99 Mon Sep 17 00:00:00 2001
From: Alexander Graf <ag...@suse.de>
Date: Tue, 24 Apr 2018 21:25:23 +0200
Subject: [PATCH] zynqmp: Add generic target

I would like to create a generic U-Boot build that adapts itself completely
based on the DT passed in. That way we can potentially support running
random board configurations with a single U-Boot binary built as part of
the distribution.

Currently a few things are still missing to make it a full reality. The
most obvious one I think is the EEPROM location. This would need to also
move into something described by DT.

Apart from that, we're almost there. This patch adds a defconfig that simply
contains all drivers we could make use of. We can then enable individual
boards along the way and slowly adapt everything to be fully DT described
while we identify each missing bit.

Signed-off-by: Alexander Graf <ag...@suse.de>

---

v1 -> v2:

  - Remove debug uart

v2 -> v3

  - show model information instead of custom IDENT_STRING

v3 -> v4:

  - reintroduce CONFIG_IDENT_STRING
  - remove CONFIG_DEFAULT_DEVICE_TREE
  - run through savedefconfig
  - replace CONFIG_SYS_I2C_ZYNQ with CONFIG_SYS_I2C_CADENCE
  - remove CONFIG_ZYNQ_SDHCI{0,1} - needs to be solved generically
  - add xhci usb1 to xhci controller list
---
 configs/xilinx_zynqmp_generic_defconfig | 86 +++++++++++++++++++++++++++++++++
 include/configs/xilinx_zynqmp_generic.h | 21 ++++++++
 2 files changed, 107 insertions(+)
 create mode 100644 configs/xilinx_zynqmp_generic_defconfig
 create mode 100644 include/configs/xilinx_zynqmp_generic.h

diff --git a/configs/xilinx_zynqmp_generic_defconfig 
b/configs/xilinx_zynqmp_generic_defconfig
new file mode 100644
index 0000000000..ea2be0c9cc
--- /dev/null
+++ b/configs/xilinx_zynqmp_generic_defconfig
@@ -0,0 +1,86 @@
+CONFIG_ARM=y
+CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_generic"
+CONFIG_ARCH_ZYNQMP=y
+CONFIG_SYS_TEXT_BASE=0x8000000
+CONFIG_SYS_MALLOC_F_LEN=0x8000
+CONFIG_IDENT_STRING=" Xilinx ZynqMP based platform"
+CONFIG_ZYNQMP_USB=y
+CONFIG_AHCI=y
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+# CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_BOARD_EARLY_INIT_R=y
+CONFIG_SYS_PROMPT="ZynqMP> "
+CONFIG_FASTBOOT=y
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
+CONFIG_CMD_THOR_DOWNLOAD=y
+CONFIG_CMD_MEMTEST=y
+CONFIG_SYS_ALT_MEMTEST=y
+CONFIG_CMD_CLK=y
+CONFIG_CMD_DFU=y
+# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_FPGA_LOADBP=y
+CONFIG_CMD_FPGA_LOADP=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_TFTPPUT=y
+CONFIG_CMD_TIME=y
+CONFIG_CMD_TIMER=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_OF_BOARD=y
+CONFIG_ENV_IS_IN_FAT=y
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_SCSI_AHCI=y
+CONFIG_SATA_CEVA=y
+CONFIG_CLK_ZYNQMP=y
+CONFIG_DFU_RAM=y
+CONFIG_FPGA_XILINX=y
+CONFIG_FPGA_ZYNQMPPL=y
+CONFIG_DM_GPIO=y
+CONFIG_CMD_PCA953X=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_CADENCE=y
+CONFIG_MISC=y
+CONFIG_DM_MMC=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_ZYNQ=y
+CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_BAR=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
+# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
+CONFIG_PHY_MARVELL=y
+CONFIG_PHY_NATSEMI=y
+CONFIG_PHY_REALTEK=y
+CONFIG_PHY_TI=y
+CONFIG_PHY_VITESSE=y
+CONFIG_PHY_FIXED=y
+CONFIG_DM_ETH=y
+CONFIG_PHY_GIGE=y
+CONFIG_ZYNQ_GEM=y
+CONFIG_SCSI=y
+CONFIG_DM_SCSI=y
+CONFIG_ZYNQ_SERIAL=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_XHCI_ZYNQMP=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
+CONFIG_USB_ULPI_VIEWPORT=y
+CONFIG_USB_ULPI=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Xilinx"
+CONFIG_USB_GADGET_VENDOR_NUM=0x03FD
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
+CONFIG_USB_FUNCTION_THOR=y
+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y
diff --git a/include/configs/xilinx_zynqmp_generic.h 
b/include/configs/xilinx_zynqmp_generic.h
new file mode 100644
index 0000000000..5e3a1240c6
--- /dev/null
+++ b/include/configs/xilinx_zynqmp_generic.h
@@ -0,0 +1,21 @@
+/*
+ * Configuration for the Xilinx ZynqMP generic platform
+ *
+ * (C) Copyright 2018 Alexander Graf <ag...@suse.de>
+ * (C) Copyright 2015 Xilinx, Inc.
+ * Michal Simek <michal.si...@xilinx.com>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef __CONFIG_ZYNQMP_GENERIC_H
+#define __CONFIG_ZYNQMP_GENERIC_H
+
+/* This file should disappear as soon as xhci is converted to DT enumerated */
+
+#define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR, \
+                                ZYNQMP_USB1_XHCI_BASEADDR}
+
+#include <configs/xilinx_zynqmp.h>
+
+#endif /* __CONFIG_ZYNQMP_GENERIC_H */
++++++ 0006-tools-zynqmpimage-Add-partition-rea.patch ++++++
>From d404c070b2d1c0cb3fa3d7e74e94fc142f799dab Mon Sep 17 00:00:00 2001
From: Alexander Graf <ag...@suse.de>
Date: Thu, 15 Mar 2018 11:15:15 +0100
Subject: [PATCH] tools: zynqmpimage: Add partition read support

The zynqmp image format has support for inline partitions which are
used by FSBL to describe payloads that are loaded by FSBL itself.

While we can't create images that contain partitions (yet), we should
still at least be able to examine them and show the user what's inside
when we analyze an image created by bootgen.

Signed-off-by: Alexander Graf <ag...@suse.de>

---

v1 -> v2:

  - prettify defines
  - fix offset and size outputs
  - add u-boot as payload target
  - align CPU names with bif
  - add shift constants
  - add U-Boot as potential partition owner
  - mention documentation source
  - add HEADER_CPU_SELECT_A53_64BIT define

v3 -> v4:

  - fix checkpatch
---
 tools/zynqmpimage.c | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 173 insertions(+), 2 deletions(-)

diff --git a/tools/zynqmpimage.c b/tools/zynqmpimage.c
index 421558d46e..e972c684d5 100644
--- a/tools/zynqmpimage.c
+++ b/tools/zynqmpimage.c
@@ -6,6 +6,7 @@
  * The following Boot Header format/structures and values are defined in the
  * following documents:
  *   * ug1085 ZynqMP TRM doc v1.4 (Chapter 11, Table 11-4)
+ *   * ug1137 ZynqMP Software Developer Guide v6.0 (Chapter 16)
  *
  * Expected Header Size = 0x9C0
  * Forced as 'little' endian, 32-bit words
@@ -62,6 +63,7 @@
 #define HEADER_REGINIT_NULL (cpu_to_le32(0xffffffff))
 #define HEADER_WIDTHDETECTION (cpu_to_le32(0xaa995566))
 #define HEADER_IMAGEIDENTIFIER (cpu_to_le32(0x584c4e58))
+#define HEADER_CPU_SELECT_A53_64BIT    (0x2 << 10)
 
 enum {
        ENCRYPTION_EFUSE = 0xa5c3c5a3,
@@ -79,6 +81,78 @@ struct zynqmp_reginit {
 #define HEADER_INTERRUPT_VECTORS       8
 #define HEADER_REGINITS                        256
 
+struct image_header_table {
+       uint32_t version;                 /* 0x00 */
+       uint32_t nr_parts;                /* 0x04 */
+       uint32_t partition_header_offset; /* 0x08, divided by 4 */
+       uint32_t image_header_offset;     /* 0x0c, divided by 4 */
+       uint32_t auth_certificate_offset; /* 0x10 */
+       uint32_t boot_device;             /* 0x14 */
+       uint32_t __reserved1[9];          /* 0x18 - 0x38 */
+       uint32_t checksum;                /* 0x3c */
+};
+
+#define PART_ATTR_VEC_LOCATION         0x800000
+#define PART_ATTR_BS_BLOCK_SIZE_MASK   0x700000
+#define     PART_ATTR_BS_BLOCK_SIZE_DEFAULT    0x000000
+#define     PART_ATTR_BS_BLOCK_SIZE_8MB                0x400000
+#define PART_ATTR_BIG_ENDIAN           0x040000
+#define PART_ATTR_PART_OWNER_MASK      0x030000
+#define     PART_ATTR_PART_OWNER_FSBL          0x000000
+#define     PART_ATTR_PART_OWNER_UBOOT         0x010000
+#define PART_ATTR_RSA_SIG              0x008000
+#define PART_ATTR_CHECKSUM_MASK                0x007000
+#define    PART_ATTR_CHECKSUM_NONE             0x000000
+#define    PART_ATTR_CHECKSUM_MD5              0x001000
+#define    PART_ATTR_CHECKSUM_SHA2             0x002000
+#define    PART_ATTR_CHECKSUM_SHA3             0x003000
+#define PART_ATTR_DEST_CPU_SHIFT       8
+#define PART_ATTR_DEST_CPU_MASK                0x000f00
+#define    PART_ATTR_DEST_CPU_NONE             0x000000
+#define    PART_ATTR_DEST_CPU_A53_0            0x000100
+#define    PART_ATTR_DEST_CPU_A53_1            0x000200
+#define    PART_ATTR_DEST_CPU_A53_2            0x000300
+#define    PART_ATTR_DEST_CPU_A53_3            0x000400
+#define    PART_ATTR_DEST_CPU_R5_0             0x000500
+#define    PART_ATTR_DEST_CPU_R5_1             0x000600
+#define    PART_ATTR_DEST_CPU_R5_L             0x000700
+#define    PART_ATTR_DEST_CPU_PMU              0x000800
+#define PART_ATTR_ENCRYPTED            0x000080
+#define PART_ATTR_DEST_DEVICE_SHIFT    4
+#define PART_ATTR_DEST_DEVICE_MASK     0x000070
+#define    PART_ATTR_DEST_DEVICE_NONE          0x000000
+#define    PART_ATTR_DEST_DEVICE_PS            0x000010
+#define    PART_ATTR_DEST_DEVICE_PL            0x000020
+#define    PART_ATTR_DEST_DEVICE_PMU           0x000030
+#define    PART_ATTR_DEST_DEVICE_XIP           0x000040
+#define PART_ATTR_A53_EXEC_AARCH32     0x000008
+#define PART_ATTR_TARGET_EL_SHIFT      1
+#define PART_ATTR_TARGET_EL_MASK       0x000006
+#define PART_ATTR_TZ_SECURE            0x000001
+
+static const char *dest_cpus[0x10] = {
+       "none", "a5x-0", "a5x-1", "a5x-2", "a5x-3", "r5-0", "r5-1",
+       "r5-lockstep", "pmu", "unknown", "unknown", "unknown", "unknown",
+       "unknown", "unknown", "unknown"
+};
+
+struct partition_header {
+       uint32_t len_enc;                 /* 0x00, divided by 4 */
+       uint32_t len_unenc;               /* 0x04, divided by 4 */
+       uint32_t len;                     /* 0x08, divided by 4 */
+       uint32_t next_partition_offset;   /* 0x0c */
+       uint64_t entry_point;             /* 0x10 */
+       uint64_t load_address;            /* 0x18 */
+       uint32_t offset;                  /* 0x20, divided by 4 */
+       uint32_t attributes;              /* 0x24 */
+       uint32_t __reserved1;             /* 0x28 */
+       uint32_t checksum_offset;         /* 0x2c, divided by 4 */
+       uint32_t __reserved2;             /* 0x30 */
+       uint32_t auth_certificate_offset; /* 0x34 */
+       uint32_t __reserved3;             /* 0x38 */
+       uint32_t checksum;                /* 0x3c */
+};
+
 struct zynqmp_header {
        uint32_t interrupt_vectors[HEADER_INTERRUPT_VECTORS]; /* 0x0 */
        uint32_t width_detection; /* 0x20 */
@@ -92,7 +166,9 @@ struct zynqmp_header {
        uint32_t image_stored_size; /* 0x40 */
        uint32_t image_attributes; /* 0x44 */
        uint32_t checksum; /* 0x48 */
-       uint32_t __reserved1[27]; /* 0x4c */
+       uint32_t __reserved1[19]; /* 0x4c */
+       uint32_t image_header_table_offset; /* 0x98 */
+       uint32_t __reserved2[7]; /* 0x9c */
        struct zynqmp_reginit register_init[HEADER_REGINITS]; /* 0xb8 */
        uint32_t __reserved4[66]; /* 0x9c0 */
 };
@@ -131,7 +207,7 @@ static void zynqmpimage_default_header(struct zynqmp_header 
*ptr)
                return;
 
        ptr->width_detection = HEADER_WIDTHDETECTION;
-       ptr->image_attributes = 0x800;
+       ptr->image_attributes = HEADER_CPU_SELECT_A53_64BIT;
        ptr->image_identifier = HEADER_IMAGEIDENTIFIER;
        ptr->encryption = cpu_to_le32(ENCRYPTION_NONE);
 
@@ -172,6 +248,80 @@ static int zynqmpimage_verify_header(unsigned char *ptr, 
int image_size,
        return 0;
 }
 
+static void print_partition(const void *ptr, const struct partition_header *ph)
+{
+       uint32_t attr = le32_to_cpu(ph->attributes);
+       unsigned long len = le32_to_cpu(ph->len) * 4;
+       const char *part_owner;
+       const char *dest_devs[0x8] = {
+               "none", "PS", "PL", "PMU", "unknown", "unknown", "unknown",
+               "unknown"
+       };
+
+       switch (attr & PART_ATTR_PART_OWNER_MASK) {
+       case PART_ATTR_PART_OWNER_FSBL:
+               part_owner = "FSBL";
+               break;
+       case PART_ATTR_PART_OWNER_UBOOT:
+               part_owner = "U-Boot";
+               break;
+       default:
+               part_owner = "Unknown";
+               break;
+       }
+
+       printf("%s payload on CPU %s (%s):\n", part_owner,
+              dest_cpus[(attr & PART_ATTR_DEST_CPU_MASK) >> 8],
+              dest_devs[(attr & PART_ATTR_DEST_DEVICE_MASK) >> 4]);
+
+       printf("    Offset     : 0x%08x\n", le32_to_cpu(ph->offset) * 4);
+       printf("    Size       : %lu (0x%lx) bytes\n", len, len);
+       printf("    Load       : 0x%08llx",
+              (unsigned long long)le64_to_cpu(ph->load_address));
+       if (ph->load_address != ph->entry_point)
+               printf(" (entry=0x%08llx)\n",
+                      (unsigned long long)le64_to_cpu(ph->entry_point));
+       else
+               printf("\n");
+       printf("    Attributes : ");
+
+       if (attr & PART_ATTR_VEC_LOCATION)
+               printf("vec ");
+
+       if (attr & PART_ATTR_ENCRYPTED)
+               printf("encrypted ");
+
+       switch (attr & PART_ATTR_CHECKSUM_MASK) {
+       case PART_ATTR_CHECKSUM_MD5:
+               printf("md5 ");
+               break;
+       case PART_ATTR_CHECKSUM_SHA2:
+               printf("sha2 ");
+               break;
+       case PART_ATTR_CHECKSUM_SHA3:
+               printf("sha3 ");
+               break;
+       }
+
+       if (attr & PART_ATTR_BIG_ENDIAN)
+               printf("BigEndian ");
+
+       if (attr & PART_ATTR_RSA_SIG)
+               printf("RSA ");
+
+       if (attr & PART_ATTR_A53_EXEC_AARCH32)
+               printf("AArch32 ");
+
+       if (attr & PART_ATTR_TARGET_EL_MASK)
+               printf("EL%d ", (attr & PART_ATTR_TARGET_EL_MASK) >> 1);
+
+       if (attr & PART_ATTR_TZ_SECURE)
+               printf("secure ");
+       printf("\n");
+
+       printf("    Checksum   : 0x%08x\n", le32_to_cpu(ph->checksum));
+}
+
 static void zynqmpimage_print_header(const void *ptr)
 {
        struct zynqmp_header *zynqhdr = (struct zynqmp_header *)ptr;
@@ -212,6 +362,27 @@ static void zynqmpimage_print_header(const void *ptr)
                       le32_to_cpu(zynqhdr->register_init[i].data));
        }
 
+       if (zynqhdr->image_header_table_offset) {
+               struct image_header_table *iht = (void *)ptr +
+                       zynqhdr->image_header_table_offset;
+               struct partition_header *ph;
+               uint32_t ph_offset;
+               uint32_t next;
+               int i;
+
+               ph_offset = le32_to_cpu(iht->partition_header_offset) * 4;
+               ph = (void *)ptr + ph_offset;
+               for (i = 0; i < le32_to_cpu(iht->nr_parts); i++) {
+                       next = le32_to_cpu(ph->next_partition_offset) * 4;
+
+                       /* Partition 0 is the base image itself */
+                       if (i)
+                               print_partition(ptr, ph);
+
+                       ph = (void *)ptr + next;
+               }
+       }
+
        free(dynamic_header);
 }
 
++++++ 0007-tools-zynqmpimage-Move-defines-to-h.patch ++++++
>From dcab0a6f5c3632d35808c411d7bfbdd3894b4555 Mon Sep 17 00:00:00 2001
From: Alexander Graf <ag...@suse.de>
Date: Thu, 12 Apr 2018 15:17:03 +0200
Subject: [PATCH] tools: zynqmpimage: Move defines to header

We will add support for ZynqMP bif input files later, so let's move
all structure definitions into a header file that can be used by that
one as well.

Signed-off-by: Alexander Graf <ag...@suse.de>
---
 tools/zynqmpimage.c | 115 +--------------------------------------------
 tools/zynqmpimage.h | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 133 insertions(+), 114 deletions(-)
 create mode 100644 tools/zynqmpimage.h

diff --git a/tools/zynqmpimage.c b/tools/zynqmpimage.c
index e972c684d5..870a6b5710 100644
--- a/tools/zynqmpimage.c
+++ b/tools/zynqmpimage.c
@@ -57,122 +57,9 @@
 
 #include "imagetool.h"
 #include "mkimage.h"
+#include "zynqmpimage.h"
 #include <image.h>
 
-#define HEADER_INTERRUPT_DEFAULT (cpu_to_le32(0xeafffffe))
-#define HEADER_REGINIT_NULL (cpu_to_le32(0xffffffff))
-#define HEADER_WIDTHDETECTION (cpu_to_le32(0xaa995566))
-#define HEADER_IMAGEIDENTIFIER (cpu_to_le32(0x584c4e58))
-#define HEADER_CPU_SELECT_A53_64BIT    (0x2 << 10)
-
-enum {
-       ENCRYPTION_EFUSE = 0xa5c3c5a3,
-       ENCRYPTION_OEFUSE = 0xa5c3c5a7,
-       ENCRYPTION_BBRAM = 0x3a5c3c5a,
-       ENCRYPTION_OBBRAM = 0xa35c7ca5,
-       ENCRYPTION_NONE = 0x0,
-};
-
-struct zynqmp_reginit {
-       uint32_t address;
-       uint32_t data;
-};
-
-#define HEADER_INTERRUPT_VECTORS       8
-#define HEADER_REGINITS                        256
-
-struct image_header_table {
-       uint32_t version;                 /* 0x00 */
-       uint32_t nr_parts;                /* 0x04 */
-       uint32_t partition_header_offset; /* 0x08, divided by 4 */
-       uint32_t image_header_offset;     /* 0x0c, divided by 4 */
-       uint32_t auth_certificate_offset; /* 0x10 */
-       uint32_t boot_device;             /* 0x14 */
-       uint32_t __reserved1[9];          /* 0x18 - 0x38 */
-       uint32_t checksum;                /* 0x3c */
-};
-
-#define PART_ATTR_VEC_LOCATION         0x800000
-#define PART_ATTR_BS_BLOCK_SIZE_MASK   0x700000
-#define     PART_ATTR_BS_BLOCK_SIZE_DEFAULT    0x000000
-#define     PART_ATTR_BS_BLOCK_SIZE_8MB                0x400000
-#define PART_ATTR_BIG_ENDIAN           0x040000
-#define PART_ATTR_PART_OWNER_MASK      0x030000
-#define     PART_ATTR_PART_OWNER_FSBL          0x000000
-#define     PART_ATTR_PART_OWNER_UBOOT         0x010000
-#define PART_ATTR_RSA_SIG              0x008000
-#define PART_ATTR_CHECKSUM_MASK                0x007000
-#define    PART_ATTR_CHECKSUM_NONE             0x000000
-#define    PART_ATTR_CHECKSUM_MD5              0x001000
-#define    PART_ATTR_CHECKSUM_SHA2             0x002000
-#define    PART_ATTR_CHECKSUM_SHA3             0x003000
-#define PART_ATTR_DEST_CPU_SHIFT       8
-#define PART_ATTR_DEST_CPU_MASK                0x000f00
-#define    PART_ATTR_DEST_CPU_NONE             0x000000
-#define    PART_ATTR_DEST_CPU_A53_0            0x000100
-#define    PART_ATTR_DEST_CPU_A53_1            0x000200
-#define    PART_ATTR_DEST_CPU_A53_2            0x000300
-#define    PART_ATTR_DEST_CPU_A53_3            0x000400
-#define    PART_ATTR_DEST_CPU_R5_0             0x000500
-#define    PART_ATTR_DEST_CPU_R5_1             0x000600
-#define    PART_ATTR_DEST_CPU_R5_L             0x000700
-#define    PART_ATTR_DEST_CPU_PMU              0x000800
-#define PART_ATTR_ENCRYPTED            0x000080
-#define PART_ATTR_DEST_DEVICE_SHIFT    4
-#define PART_ATTR_DEST_DEVICE_MASK     0x000070
-#define    PART_ATTR_DEST_DEVICE_NONE          0x000000
-#define    PART_ATTR_DEST_DEVICE_PS            0x000010
-#define    PART_ATTR_DEST_DEVICE_PL            0x000020
-#define    PART_ATTR_DEST_DEVICE_PMU           0x000030
-#define    PART_ATTR_DEST_DEVICE_XIP           0x000040
-#define PART_ATTR_A53_EXEC_AARCH32     0x000008
-#define PART_ATTR_TARGET_EL_SHIFT      1
-#define PART_ATTR_TARGET_EL_MASK       0x000006
-#define PART_ATTR_TZ_SECURE            0x000001
-
-static const char *dest_cpus[0x10] = {
-       "none", "a5x-0", "a5x-1", "a5x-2", "a5x-3", "r5-0", "r5-1",
-       "r5-lockstep", "pmu", "unknown", "unknown", "unknown", "unknown",
-       "unknown", "unknown", "unknown"
-};
-
-struct partition_header {
-       uint32_t len_enc;                 /* 0x00, divided by 4 */
-       uint32_t len_unenc;               /* 0x04, divided by 4 */
-       uint32_t len;                     /* 0x08, divided by 4 */
-       uint32_t next_partition_offset;   /* 0x0c */
-       uint64_t entry_point;             /* 0x10 */
-       uint64_t load_address;            /* 0x18 */
-       uint32_t offset;                  /* 0x20, divided by 4 */
-       uint32_t attributes;              /* 0x24 */
-       uint32_t __reserved1;             /* 0x28 */
-       uint32_t checksum_offset;         /* 0x2c, divided by 4 */
-       uint32_t __reserved2;             /* 0x30 */
-       uint32_t auth_certificate_offset; /* 0x34 */
-       uint32_t __reserved3;             /* 0x38 */
-       uint32_t checksum;                /* 0x3c */
-};
-
-struct zynqmp_header {
-       uint32_t interrupt_vectors[HEADER_INTERRUPT_VECTORS]; /* 0x0 */
-       uint32_t width_detection; /* 0x20 */
-       uint32_t image_identifier; /* 0x24 */
-       uint32_t encryption; /* 0x28 */
-       uint32_t image_load; /* 0x2c */
-       uint32_t image_offset; /* 0x30 */
-       uint32_t pfw_image_length; /* 0x34 */
-       uint32_t total_pfw_image_length; /* 0x38 */
-       uint32_t image_size; /* 0x3c */
-       uint32_t image_stored_size; /* 0x40 */
-       uint32_t image_attributes; /* 0x44 */
-       uint32_t checksum; /* 0x48 */
-       uint32_t __reserved1[19]; /* 0x4c */
-       uint32_t image_header_table_offset; /* 0x98 */
-       uint32_t __reserved2[7]; /* 0x9c */
-       struct zynqmp_reginit register_init[HEADER_REGINITS]; /* 0xb8 */
-       uint32_t __reserved4[66]; /* 0x9c0 */
-};
-
 static struct zynqmp_header zynqmpimage_header;
 static void *dynamic_header;
 static FILE *fpmu;
diff --git a/tools/zynqmpimage.h b/tools/zynqmpimage.h
new file mode 100644
index 0000000000..f3b5c195ad
--- /dev/null
+++ b/tools/zynqmpimage.h
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2016 Michal Simek <mich...@xilinx.com>
+ * Copyright (C) 2015 Nathan Rossi <nat...@nathanrossi.com>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ *
+ * The following Boot Header format/structures and values are defined in the
+ * following documents:
+ *   * ug1085 ZynqMP TRM doc v1.4 (Chapter 11, Table 11-4)
+ *   * ug1137 ZynqMP Software Developer Guide v6.0 (Chapter 16)
+ */
+
+#ifndef _ZYNQMPIMAGE_H_
+#define _ZYNQMPIMAGE_H_
+
+#include <stdint.h>
+
+#define HEADER_INTERRUPT_DEFAULT (cpu_to_le32(0xeafffffe))
+#define HEADER_REGINIT_NULL (cpu_to_le32(0xffffffff))
+#define HEADER_WIDTHDETECTION (cpu_to_le32(0xaa995566))
+#define HEADER_IMAGEIDENTIFIER (cpu_to_le32(0x584c4e58))
+#define HEADER_CPU_SELECT_A53_64BIT    (0x2 << 10)
+
+enum {
+       ENCRYPTION_EFUSE = 0xa5c3c5a3,
+       ENCRYPTION_OEFUSE = 0xa5c3c5a7,
+       ENCRYPTION_BBRAM = 0x3a5c3c5a,
+       ENCRYPTION_OBBRAM = 0xa35c7ca5,
+       ENCRYPTION_NONE = 0x0,
+};
+
+struct zynqmp_reginit {
+       uint32_t address;
+       uint32_t data;
+};
+
+#define HEADER_INTERRUPT_VECTORS       8
+#define HEADER_REGINITS                        256
+
+struct image_header_table {
+       uint32_t version;                 /* 0x00 */
+       uint32_t nr_parts;                /* 0x04 */
+       uint32_t partition_header_offset; /* 0x08, divided by 4 */
+       uint32_t image_header_offset;     /* 0x0c, divided by 4 */
+       uint32_t auth_certificate_offset; /* 0x10 */
+       uint32_t boot_device;             /* 0x14 */
+       uint32_t __reserved1[9];          /* 0x18 - 0x38 */
+       uint32_t checksum;                /* 0x3c */
+};
+
+#define PART_ATTR_VEC_LOCATION         0x800000
+#define PART_ATTR_BS_BLOCK_SIZE_MASK   0x700000
+#define     PART_ATTR_BS_BLOCK_SIZE_DEFAULT    0x000000
+#define     PART_ATTR_BS_BLOCK_SIZE_8MB                0x400000
+#define PART_ATTR_BIG_ENDIAN           0x040000
+#define PART_ATTR_PART_OWNER_MASK      0x030000
+#define     PART_ATTR_PART_OWNER_FSBL          0x000000
+#define     PART_ATTR_PART_OWNER_UBOOT         0x010000
+#define PART_ATTR_RSA_SIG              0x008000
+#define PART_ATTR_CHECKSUM_MASK                0x007000
+#define    PART_ATTR_CHECKSUM_NONE             0x000000
+#define    PART_ATTR_CHECKSUM_MD5              0x001000
+#define    PART_ATTR_CHECKSUM_SHA2             0x002000
+#define    PART_ATTR_CHECKSUM_SHA3             0x003000
+#define PART_ATTR_DEST_CPU_SHIFT       8
+#define PART_ATTR_DEST_CPU_MASK                0x000f00
+#define    PART_ATTR_DEST_CPU_NONE             0x000000
+#define    PART_ATTR_DEST_CPU_A53_0            0x000100
+#define    PART_ATTR_DEST_CPU_A53_1            0x000200
+#define    PART_ATTR_DEST_CPU_A53_2            0x000300
+#define    PART_ATTR_DEST_CPU_A53_3            0x000400
+#define    PART_ATTR_DEST_CPU_R5_0             0x000500
+#define    PART_ATTR_DEST_CPU_R5_1             0x000600
+#define    PART_ATTR_DEST_CPU_R5_L             0x000700
+#define    PART_ATTR_DEST_CPU_PMU              0x000800
+#define PART_ATTR_ENCRYPTED            0x000080
+#define PART_ATTR_DEST_DEVICE_SHIFT    4
+#define PART_ATTR_DEST_DEVICE_MASK     0x000070
+#define    PART_ATTR_DEST_DEVICE_NONE          0x000000
+#define    PART_ATTR_DEST_DEVICE_PS            0x000010
+#define    PART_ATTR_DEST_DEVICE_PL            0x000020
+#define    PART_ATTR_DEST_DEVICE_PMU           0x000030
+#define    PART_ATTR_DEST_DEVICE_XIP           0x000040
+#define PART_ATTR_A53_EXEC_AARCH32     0x000008
+#define PART_ATTR_TARGET_EL_SHIFT      1
+#define PART_ATTR_TARGET_EL_MASK       0x000006
+#define PART_ATTR_TZ_SECURE            0x000001
+
+static const char *dest_cpus[0x10] = {
+       "none", "a5x-0", "a5x-1", "a5x-2", "a5x-3", "r5-0", "r5-1",
+       "r5-lockstep", "pmu", "unknown", "unknown", "unknown", "unknown",
+       "unknown", "unknown", "unknown"
+};
+
+struct partition_header {
+       uint32_t len_enc;                 /* 0x00, divided by 4 */
+       uint32_t len_unenc;               /* 0x04, divided by 4 */
+       uint32_t len;                     /* 0x08, divided by 4 */
+       uint32_t next_partition_offset;   /* 0x0c */
+       uint64_t entry_point;             /* 0x10 */
+       uint64_t load_address;            /* 0x18 */
+       uint32_t offset;                  /* 0x20, divided by 4 */
+       uint32_t attributes;              /* 0x24 */
+       uint32_t __reserved1;             /* 0x28 */
+       uint32_t checksum_offset;         /* 0x2c, divided by 4 */
+       uint32_t __reserved2;             /* 0x30 */
+       uint32_t auth_certificate_offset; /* 0x34 */
+       uint32_t __reserved3;             /* 0x38 */
+       uint32_t checksum;                /* 0x3c */
+};
+
+struct zynqmp_header {
+       uint32_t interrupt_vectors[HEADER_INTERRUPT_VECTORS]; /* 0x0 */
+       uint32_t width_detection; /* 0x20 */
+       uint32_t image_identifier; /* 0x24 */
+       uint32_t encryption; /* 0x28 */
+       uint32_t image_load; /* 0x2c */
+       uint32_t image_offset; /* 0x30 */
+       uint32_t pfw_image_length; /* 0x34 */
+       uint32_t total_pfw_image_length; /* 0x38 */
+       uint32_t image_size; /* 0x3c */
+       uint32_t image_stored_size; /* 0x40 */
+       uint32_t image_attributes; /* 0x44 */
+       uint32_t checksum; /* 0x48 */
+       uint32_t __reserved1[19]; /* 0x4c */
+       uint32_t image_header_table_offset; /* 0x98 */
+       uint32_t __reserved2[7]; /* 0x9c */
+       struct zynqmp_reginit register_init[HEADER_REGINITS]; /* 0xb8 */
+       uint32_t __reserved4[66]; /* 0x9c0 */
+};
+
+#endif /* _ZYNQMPIMAGE_H_ */
++++++ 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch ++++++
>From 42b33e675c7e4e162485cf78519c4ff24509be69 Mon Sep 17 00:00:00 2001
From: Alexander Graf <ag...@suse.de>
Date: Fri, 13 Apr 2018 13:47:05 +0200
Subject: [PATCH] MAINTAINERS: Declare tools/zynq*.{c,h} as Xilinx maintained

The zynqimage.c, zynqmpimage.c and the new zynqmpbif.c files are all
maintained by Xilinx for the Zynq platforms. Let's match them accordingly
in the MAINTAINERS file.

Signed-off-by: Alexander Graf <ag...@suse.de>
---
 MAINTAINERS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 60d4adf266..a9140d2ed0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -291,7 +291,8 @@ F:  drivers/spi/zynq_spi.c
 F:     drivers/usb/host/ehci-zynq.c
 F:     drivers/watchdog/cdns_wdt.c
 F:     include/zynqmppl.h
-F:     tools/zynqimage.c
+F:     tools/zynq*.c
+F:     tools/zynq*.h
 N:     zynqmp
 
 BUILDMAN
++++++ 0009-tools-zynqmpimage-Add-bif-support.patch ++++++
++++ 1175 lines (skipped)

++++++ 0010-tools-zynqmpbif-Add-support-for-loa.patch ++++++
>From 0bad4410836a457b5eb19801fd97ab9d43ef6e2d Mon Sep 17 00:00:00 2001
From: Alexander Graf <ag...@suse.de>
Date: Thu, 26 Apr 2018 13:30:32 +0200
Subject: [PATCH] tools: zynqmpbif: Add support for load=after

Some times it's handy to have a partition loaded immediately after
the end of the previous blob. The most obvious example for this is
a U-Boot binary (coming from .elf) and a device tree file.

This patch adds that logic. With this, the following bif snippet
does what you would expect:

  [destination_cpu=a5x-0, exception_level=el-2] u-boot.elf
  [load=after] u-boot.dtb

converts to

  FSBL payload on CPU a5x-0 (PS):
    Offset     : 0x00590500
    Size       : 577768 (0x8d0e8) bytes
    Load       : 0x08000000
    Attributes : EL2
    Checksum   : 0xefca2cad
  FSBL payload on CPU none (PS):
    Offset     : 0x0061d640
    Size       : 129760 (0x1fae0) bytes
    Load       : 0x0808d0e8 (entry=0x00000000)
    Attributes : EL3
    Checksum   : 0xf7dd3d49

Signed-off-by: Alexander Graf <ag...@suse.de>
---
 tools/zynqmpbif.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tools/zynqmpbif.c b/tools/zynqmpbif.c
index 6c8f66055d..47c233c15f 100644
--- a/tools/zynqmpbif.c
+++ b/tools/zynqmpbif.c
@@ -42,6 +42,7 @@ enum bif_flag {
        BIF_FLAG_PUF_FILE,
        BIF_FLAG_AARCH32,
        BIF_FLAG_PART_OWNER_UBOOT,
+       BIF_FLAG_LOAD_AFTER,
 
        /* Internal flags */
        BIF_FLAG_BIT_FILE,
@@ -151,6 +152,11 @@ static char *parse_load(char *line, struct bif_entry *bf)
 {
        char *endptr;
 
+       if (!strncmp(line, "after", strlen("after"))) {
+               bf->flags |= (1ULL << BIF_FLAG_LOAD_AFTER);
+               return line + strlen("after");
+       }
+
        bf->load = strtoll(line, &endptr, 0);
 
        return endptr;
@@ -336,6 +342,15 @@ static int bif_add_part(struct bif_entry *bf, const char 
*data, size_t len)
        if (r)
                return r;
 
+       if (bf->flags & (1ULL << BIF_FLAG_LOAD_AFTER) &&
+           bif_output.last_part) {
+               struct partition_header *p = bif_output.last_part;
+               uint64_t load = le64_to_cpu(p->load_address);
+
+               load += le32_to_cpu(p->len) * 4;
+               parthdr.load_address = cpu_to_le64(load);
+       }
+
        parthdr.offset = cpu_to_le32(bf->offset / 4);
 
        if (bf->flags & (1ULL << BIF_FLAG_BOOTLOADER)) {

++++++ pre_checkin.sh ++++++
--- /var/tmp/diff_new_pack.MQOfib/_old  2018-05-16 11:43:40.483754116 +0200
+++ /var/tmp/diff_new_pack.MQOfib/_new  2018-05-16 11:43:40.483754116 +0200
@@ -35,11 +35,13 @@
 # Altera
 armv7_boards="$armv7_boards socfpga_de0_nano_soc"
 
-aarch64_boards="dragonboard410c hikey ls1012afrdm_qspi p2371-2180 rpi_3"
+aarch64_boards="dragonboard410c ls1012afrdm_qspi p2371-2180 rpi_3"
 # Allwinner
 aarch64_boards="$aarch64_boards nanopi_a64 orangepi_pc2 pine64_plus"
 # Amlogic
 aarch64_boards="$aarch64_boards odroid-c2"
+# Hisilicon
+aarch64_boards="$aarch64_boards hikey poplar"
 # Marvell
 aarch64_boards="$aarch64_boards mvebu_db-88f3720 mvebu_espressobin-88f3720"
 aarch64_boards="$aarch64_boards mvebu_db_armada8k mvebu_mcbin-88f8040"
@@ -47,10 +49,28 @@
 aarch64_boards="$aarch64_boards geekbox"
 aarch64_boards="$aarch64_boards evb-rk3399 firefly-rk3399"
 # Xilinx
-aarch64_boards="$aarch64_boards xilinx_zynqmp_zcu102_rev1_0"
+aarch64_boards="$aarch64_boards xilinx_zynqmp_zcu102_rev1_0 
xilinx_zynqmp_generic"
 
 ppc_boards="qemu-ppce500"
 
+function generate_spec() {
+    sed "s/BOARDCONFIG/$BOARDCONFIG/g
+         s/BOARDNAME/$BOARDNAME/g
+         s/ARCH_RESTRICTIONS/$ARCH_RESTRICTIONS/g
+         s/BINEND/$BINEND/g
+         s/ORIGEN_SPL/$ORIGEN_SPL/g
+         s/ARNDALE_SPL/$ARNDALE_SPL/g
+         s/MVEBU_SPL/$MVEBU_SPL/g
+         s/SOCFPGA_SPL/$SOCFPGA_SPL/g
+         s/ROCKCHIP_SPL_IMAGE_TYPES/$ROCKCHIP_SPL_IMAGE_TYPES/g
+         s/ROCKCHIP_SPL_SOC/$ROCKCHIP_SPL_SOC/g
+         s/ROCKCHIP_SPL/$ROCKCHIP_SPL/g
+         s/SUNXI_SPL/$SUNXI_SPL/g
+         s/TEGRA_SPL/$TEGRA_SPL/g
+         s/IMX6_SPL/$IMX6_SPL/g
+         s/OMAP_SPL/$OMAP_SPL/g"
+}
+
 if [ ! "$1" -o ! "$2" -o ! "$3" ]; then
     # armv6 boards
     for BOARDCONFIG in $armv6_boards; do
@@ -80,6 +100,9 @@
         ARCH_RESTRICTIONS="ppc"
         bash $0 $BOARDNAME $BOARDCONFIG "$ARCH_RESTRICTIONS"
     done
+
+    # Generate u-boot.spec
+    generate_spec < u-boot.spec.tmp > u-boot.spec
     exit 0
 fi
 
@@ -142,27 +165,13 @@
     BINEND=img
     SOCFPGA_SPL=1
     ;;
-xilinx*)
+xilinx*|zynq*)
     BINEND=elf
     ;;
 
 *)  BINEND=bin ;;
 esac
 
-sed "s/BOARDCONFIG/$BOARDCONFIG/g
-s/BOARDNAME/$BOARDNAME/g
-s/ARCH_RESTRICTIONS/$ARCH_RESTRICTIONS/g
-s/BINEND/$BINEND/g
-s/ORIGEN_SPL/$ORIGEN_SPL/g
-s/ARNDALE_SPL/$ARNDALE_SPL/g
-s/MVEBU_SPL/$MVEBU_SPL/g
-s/SOCFPGA_SPL/$SOCFPGA_SPL/g
-s/ROCKCHIP_SPL_IMAGE_TYPES/$ROCKCHIP_SPL_IMAGE_TYPES/g
-s/ROCKCHIP_SPL_SOC/$ROCKCHIP_SPL_SOC/g
-s/ROCKCHIP_SPL/$ROCKCHIP_SPL/g
-s/SUNXI_SPL/$SUNXI_SPL/g
-s/TEGRA_SPL/$TEGRA_SPL/g
-s/IMX6_SPL/$IMX6_SPL/g
-s/OMAP_SPL/$OMAP_SPL/g" < u-boot.spec.tmp > u-boot-$BOARDNAME.spec
+generate_spec < u-boot-board.spec.tmp > u-boot-$BOARDNAME.spec
 
 cp u-boot.changes u-boot-$BOARDNAME.changes

++++++ u-boot-2018.03.tar.bz2 -> u-boot-2018.05.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/u-boot/u-boot-2018.03.tar.bz2 
/work/SRC/openSUSE:Factory/.u-boot.new/u-boot-2018.05.tar.bz2 differ: char 11, 
line 1

++++++ u-boot-board.spec.in ++++++
#
# spec file for package u-boot-BOARDNAME
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon
# Copyright (c) 2007-2010 by Silvan Calarco <silvan.cala...@mambasoft.it>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#


%bcond_with uboot_atf_pine64

%define mvebu_spl MVEBU_SPL
%define x_loader OMAP_SPL
%define rockchip_spl ROCKCHIP_SPL
%define sunxi_spl SUNXI_SPL
%define arndale_spl ARNDALE_SPL
%define origen_spl ORIGEN_SPL
%define imx6_spl IMX6_SPL
%define socfpga_spl SOCFPGA_SPL

%if "BOARDNAME" == "rpi" || "BOARDNAME" == "rpi2" || "BOARDNAME" == "rpi332b" 
|| "BOARDNAME" == "rpi3"
%define is_rpi 1
%endif

# archive_version differs from version for RC version only
ARCHIVE_VERSION

Name:           u-boot-BOARDNAME
UBOOT_VERSION
Release:        0
Summary:        The U-Boot firmware for the BOARDNAME platform
License:        GPL-2.0-only
Group:          System/Boot
Url:            http://www.denx.de/wiki/U-Boot
Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2
Source1:        
ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2.sig
Source2:        arndale-bl1.img
Source3:        update_git.sh
Source300:      u-boot-rpmlintrc
PATCH_FILES
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
%if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64}
BuildRequires:  arm-trusted-firmware-pine64
%endif
BuildRequires:  bc
# Arndale board needs DTC >= 1.4
BuildRequires:  dtc >= 1.4.0
# u-boot-clearfog (tools/kwbimage.c) needs openssl to build
BuildRequires:  libopenssl-devel
BuildRequires:  python-devel
BuildRequires:  swig
%if "%{name}" == "u-boot-qemu-ppce500"
# Owns /usr/share/qemu directory
BuildRequires:  qemu
Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
%endif
%if "%{name}" == "u-boot-zynqmp"
BuildRequires:  zynqmp-dts
%endif
%if 0%{?is_rpi}
# Owns /boot/vc directory
BuildRequires:  raspberrypi-firmware
# For mountpoint
Requires(post): util-linux
%endif
Provides:       u-boot-loader
Conflicts:      otherproviders(u-boot-loader)
%if %x_loader == 1
Obsoletes:      x-loader-BOARDNAME
Provides:       x-loader-BOARDNAME
%endif
ExclusiveArch:  ARCH_RESTRICTIONS

%description
Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded 
PowerPC, ARM, MIPS and x86 processors.
This package contains the firmware for the BOARDNAME platform.

%package doc
Summary:        Documentation for the U-Boot Firmware
Group:          Documentation/Other

%description doc
Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded 
PowerPC, ARM, MIPS and x86 processors.
This package contains documentation for U-Boot firmware.

%prep
%setup -q -n u-boot-%{archive_version}
PATCH_EXEC

%build
export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | 
tail -n 1 | cut -d- -f1 )" +%s)
%if "%{name}" == "u-boot-pine64plus"
export BL31=/boot/bl31.bin
%endif

make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" BOARDCONFIG
echo "Attempting to enable fdt apply command (.dtbo) support."
echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" 
USE_PRIVATE_LIBGG=yes

%ifarch aarch64
%if %sunxi_spl == 1
cat spl/sunxi-spl.bin u-boot.itb > u-boot-sunxi-with-spl.bin
%endif
%endif

%if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring"
# Chromebook ARM (snow) and HP Chromebook 11 (spring) need a uImage format
export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map)
./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START 
-n uboot -d u-boot-dtb.bin u-boot.img
%endif

%if %rockchip_spl == 1
for t in ROCKCHIP_SPL_IMAGE_TYPES; do
    ./tools/mkimage -n ROCKCHIP_SPL_SOC -d spl/u-boot-spl.bin -T $t 
u-boot-spl.$t
done
%endif

%install
export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | 
tail -n 1 | cut -d- -f1 )" +%s)
export NO_BRP_STRIP_DEBUG=true
export NO_DEBUGINFO_STRIP_DEBUG=true
%define uboot_dir /boot
%if 0%{?is_rpi}
%define uboot_dir /boot/vc
%endif
%if "%{name}" == "u-boot-qemu-ppce500"
%define uboot_dir %{_datadir}/qemu
%endif
%if "%{name}" == "u-boot-jetson-tk1"
# tegra-uboot-flasher needs several intermediate files, under their original 
name.
for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin 
spl/u-boot-spl; do
    install -D -m 0644 $f %{buildroot}%{uboot_dir}/$f
done
%else
%if "%{name}" == "u-boot-p2371-2180"
# Jetson TX1 Driver Pack flash.sh needs several intermediate files, under their 
original name.
for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
    install -D -m 0644 $f %{buildroot}%{uboot_dir}/$f
done
%else
install -D -m 0644 u-boot.BINEND %{buildroot}%{uboot_dir}/u-boot.BINEND
%if "%{name}" == "u-boot-qemu-ppce500"
mv %{buildroot}%{uboot_dir}/u-boot.BINEND %{buildroot}%{uboot_dir}/u-boot.e500
%endif
%endif
%endif
%if %x_loader == 1
install -D -m 0644 MLO %{buildroot}%{uboot_dir}/MLO
%endif
%if %origen_spl == 1
install -D -m 0644 spl/origen-spl.bin %{buildroot}%{uboot_dir}/origen-spl.bin
%endif
%if %arndale_spl == 1
install -D -m 0644 spl/arndale-spl.bin %{buildroot}%{uboot_dir}/arndale-spl.bin
install -D -m 0644 %{SOURCE2} %{buildroot}%{uboot_dir}/arndale-bl1.img
%endif
%if %mvebu_spl == 1
install -D -m 0644 u-boot-spl.kwb %{buildroot}%{uboot_dir}/u-boot-spl.kwb
%endif
%if %rockchip_spl == 1
install -D -m 0644 spl/u-boot-spl.bin %{buildroot}%{uboot_dir}/u-boot-spl.bin
for t in ROCKCHIP_SPL_IMAGE_TYPES; do
    install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t
done
%endif
%if %sunxi_spl == 1
install -D -m 0644 spl/sunxi-spl.bin %{buildroot}%{uboot_dir}/sunxi-spl.bin
install -D -m 0644 u-boot-sunxi-with-spl.bin 
%{buildroot}%{uboot_dir}/u-boot-sunxi-with-spl.bin
%endif
%if %imx6_spl == 1
install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
%endif
%if %socfpga_spl == 1
install -D -m 0644 u-boot-with-spl.sfp 
%{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
%endif

%if 0%{?is_rpi}
%post
# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt.
# It needs to be on the first FAT partition, wherever we mounted it.
# a) Unmounted, then do nothing.
# b) Mounted as /boot/vc, then they're in the right place already.
# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
if mountpoint -q /boot/efi; then
  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp 
%{uboot_dir}/u-boot.BINEND /boot/efi/
fi
%endif

%files
%defattr(-,root,root)
%{uboot_dir}/*
%doc Licenses/gpl-2.0.txt README

%files doc
%defattr(-,root,root)
# Generic documents
%doc doc/README.JFFS2 doc/README.JFFS2_NAND doc/README.commands
%doc doc/README.autoboot doc/README.commands doc/README.console doc/README.dns
%doc doc/README.hwconfig doc/README.nand doc/README.NetConsole 
doc/README.serial_multi
%doc doc/README.SNTP doc/README.standalone doc/README.update doc/README.usb
%doc doc/README.video doc/README.VLAN doc/README.silent doc/README.POST
# Copy some useful kermit scripts as well
%doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd 
tools/kermit/send_image
# Now any h/w dependent Documentation
%doc doc/README.ARM-memory-map

%changelog
++++++ u-boot.spec.in ++++++
--- /var/tmp/diff_new_pack.MQOfib/_old  2018-05-16 11:43:40.767743778 +0200
+++ /var/tmp/diff_new_pack.MQOfib/_new  2018-05-16 11:43:40.771743633 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package u-boot-BOARDNAME
+# spec file for package u-boot
 #
 # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon
@@ -18,198 +18,54 @@
 #
 
 
-%define mvebu_spl MVEBU_SPL
-%define x_loader OMAP_SPL
-%define rockchip_spl ROCKCHIP_SPL
-%define sunxi_spl SUNXI_SPL
-%define arndale_spl ARNDALE_SPL
-%define origen_spl ORIGEN_SPL
-%define imx6_spl IMX6_SPL
-%define socfpga_spl SOCFPGA_SPL
-
-%if "BOARDNAME" == "rpi" || "BOARDNAME" == "rpi2" || "BOARDNAME" == "rpi332b" 
|| "BOARDNAME" == "rpi3"
-%define is_rpi 1
-%endif
-
-# archive_version differs from version for RC version only
+# 'archive_version' differs from 'version' for RC version only
 ARCHIVE_VERSION
 
-Name:           u-boot-BOARDNAME
+Name:           u-boot
 UBOOT_VERSION
 Release:        0
-Summary:        The U-Boot firmware for the BOARDNAME platform
-License:        GPL-2.0
+Summary:        Tools for the U-Boot Firmware
+License:        GPL-2.0-only
 Group:          System/Boot
 Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2
 Source1:        
ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2.sig
-Source2:        arndale-bl1.img
-Source3:        update_git.sh
-Source300:      u-boot-rpmlintrc
 PATCH_FILES
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0
-BuildRequires:  arm-trusted-firmware-pine64
-%endif
-BuildRequires:  bc
-# Arndale board needs DTC >= 1.4
-BuildRequires:  dtc >= 1.4.0
-# u-boot-clearfog (tools/kwbimage.c) needs openssl to build
 BuildRequires:  libopenssl-devel
-BuildRequires:  python-devel
-BuildRequires:  swig
-%if "%{name}" == "u-boot-qemu-ppce500"
-# Owns /usr/share/qemu directory
-BuildRequires:  qemu
-Provides:       qemu-ppc:%{_datadir}/qemu/u-boot.e500
-%endif
-%if 0%{?is_rpi}
-# Owns /boot/vc directory
-BuildRequires:  raspberrypi-firmware
-# For mountpoint
-Requires(post): util-linux
-%endif
-Provides:       u-boot-loader
-Conflicts:      otherproviders(u-boot-loader)
-%if %x_loader == 1
-Obsoletes:      x-loader-BOARDNAME
-Provides:       x-loader-BOARDNAME
-%endif
-ExclusiveArch:  ARCH_RESTRICTIONS
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded 
PowerPC, ARM, MIPS and x86 processors.
-This package contains the firmware for the BOARDNAME platform.
+This package contains:
+mkimage- a tool that creates kernel bootable images for U-Boot.
 
-%package doc
-Summary:        Documentation for the U-Boot Firmware
-Group:          Documentation/Other
 
-%description doc
+%package tools
+Summary:        Tools for the U-Boot Firmware
+Group:          System/Boot
+
+%description tools
 Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded 
PowerPC, ARM, MIPS and x86 processors.
-This package contains documentation for U-Boot firmware.
+This package contains:
+mkimage- a tool that creates kernel bootable images for U-Boot.
 
 %prep
 %setup -q -n u-boot-%{archive_version}
 PATCH_EXEC
 
 %build
-export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes 
| tail -n 1 | cut -d- -f1 )" +%s)
-%if "%{name}" == "u-boot-pine64plus"
-export BL31=/boot/bl31.bin
-%endif
-
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" BOARDCONFIG
-echo "Attempting to enable fdt apply command (.dtbo) support."
-echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config
-make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" 
USE_PRIVATE_LIBGG=yes
-
-%ifarch aarch64
-%if %sunxi_spl == 1
-cat spl/sunxi-spl.bin u-boot.itb > u-boot-sunxi-with-spl.bin
-%endif
-%endif
-
-%if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring"
-# Chromebook ARM (snow) and HP Chromebook 11 (spring) need a uImage format
-export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map)
-./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e 
$TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img
-%endif
-
-%if %rockchip_spl == 1
-for t in ROCKCHIP_SPL_IMAGE_TYPES; do
-    ./tools/mkimage -n ROCKCHIP_SPL_SOC -d spl/u-boot-spl.bin -T $t 
u-boot-spl.$t
-done
-%endif
+# needed for include/config/auto.conf
+make defconfig
+make silentoldconfig
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes tools-only
 
 %install
-export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes 
| tail -n 1 | cut -d- -f1 )" +%s)
-export NO_BRP_STRIP_DEBUG=true
-export NO_DEBUGINFO_STRIP_DEBUG=true
-%define uboot_dir /boot
-%if 0%{?is_rpi}
-%define uboot_dir /boot/vc
-%endif
-%if "%{name}" == "u-boot-qemu-ppce500"
-%define uboot_dir %{_datadir}/qemu
-%endif
-%if "%{name}" == "u-boot-jetson-tk1"
-# tegra-uboot-flasher needs several intermediate files, under their original 
name.
-for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin 
spl/u-boot-spl; do
-    install -D -m 0644 $f %{buildroot}%{uboot_dir}/$f
-done
-%else
-%if "%{name}" == "u-boot-p2371-2180"
-# Jetson TX1 Driver Pack flash.sh needs several intermediate files, under 
their original name.
-for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do
-    install -D -m 0644 $f %{buildroot}%{uboot_dir}/$f
-done
-%else
-install -D -m 0644 u-boot.BINEND %{buildroot}%{uboot_dir}/u-boot.BINEND
-%if "%{name}" == "u-boot-qemu-ppce500"
-mv %{buildroot}%{uboot_dir}/u-boot.BINEND %{buildroot}%{uboot_dir}/u-boot.e500
-%endif
-%endif
-%endif
-%if %x_loader == 1
-install -D -m 0644 MLO %{buildroot}%{uboot_dir}/MLO
-%endif
-%if %origen_spl == 1
-install -D -m 0644 spl/origen-spl.bin %{buildroot}%{uboot_dir}/origen-spl.bin
-%endif
-%if %arndale_spl == 1
-install -D -m 0644 spl/arndale-spl.bin %{buildroot}%{uboot_dir}/arndale-spl.bin
-install -D -m 0644 %{SOURCE2} %{buildroot}%{uboot_dir}/arndale-bl1.img
-%endif
-%if %mvebu_spl == 1
-install -D -m 0644 u-boot-spl.kwb %{buildroot}%{uboot_dir}/u-boot-spl.kwb
-%endif
-%if %rockchip_spl == 1
-install -D -m 0644 spl/u-boot-spl.bin %{buildroot}%{uboot_dir}/u-boot-spl.bin
-for t in ROCKCHIP_SPL_IMAGE_TYPES; do
-    install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t
-done
-%endif
-%if %sunxi_spl == 1
-install -D -m 0644 spl/sunxi-spl.bin %{buildroot}%{uboot_dir}/sunxi-spl.bin
-install -D -m 0644 u-boot-sunxi-with-spl.bin 
%{buildroot}%{uboot_dir}/u-boot-sunxi-with-spl.bin
-%endif
-%if %imx6_spl == 1
-install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin
-%endif
-%if %socfpga_spl == 1
-install -D -m 0644 u-boot-with-spl.sfp 
%{buildroot}%{uboot_dir}/u-boot-with-spl.sfp
-%endif
-
-%if 0%{?is_rpi}
-%post
-# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via 
config.txt.
-# It needs to be on the first FAT partition, wherever we mounted it.
-# a) Unmounted, then do nothing.
-# b) Mounted as /boot/vc, then they're in the right place already.
-# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done.
-# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over.
-if mountpoint -q /boot/efi; then
-  [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp 
%{uboot_dir}/u-boot.BINEND /boot/efi/
-fi
-%endif
-
-%files
-%defattr(-,root,root)
-%{uboot_dir}/*
-%doc Licenses/gpl-2.0.txt README
+install -D -m 0755 tools/mkimage %{buildroot}%{_bindir}/mkimage
+install -D -m 0644 doc/mkimage.1 %{buildroot}%{_mandir}/man1/mkimage.1
 
-%files doc
+%files tools
 %defattr(-,root,root)
-# Generic documents
-%doc doc/README.JFFS2 doc/README.JFFS2_NAND doc/README.commands
-%doc doc/README.autoboot doc/README.commands doc/README.console doc/README.dns
-%doc doc/README.hwconfig doc/README.nand doc/README.NetConsole 
doc/README.serial_multi
-%doc doc/README.SNTP doc/README.standalone doc/README.update doc/README.usb
-%doc doc/README.video doc/README.VLAN doc/README.silent doc/README.POST
-# Copy some useful kermit scripts as well
-%doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd 
tools/kermit/send_image
-# Now any h/w dependent Documentation
-%doc doc/README.ARM-memory-map
+%{_bindir}/mkimage
+%{_mandir}/man1/mkimage.1.gz
 
 %changelog

++++++ update_git.sh ++++++
--- /var/tmp/diff_new_pack.MQOfib/_old  2018-05-16 11:43:40.787743051 +0200
+++ /var/tmp/diff_new_pack.MQOfib/_new  2018-05-16 11:43:40.787743051 +0200
@@ -13,8 +13,8 @@
 
 GIT_TREE=git://github.com/openSUSE/u-boot.git
 GIT_LOCAL_TREE=~/git/u-boot-opensuse
-GIT_BRANCH=tumbleweed-2018.03
-GIT_UPSTREAM_TAG=v2018.03
+GIT_BRANCH=tumbleweed-2018.05
+GIT_UPSTREAM_TAG=v2018.05
 GIT_DIR=/dev/shm/u-boot-factory-git-dir
 CMP_DIR=/dev/shm/u-boot-factory-cmp-dir
 
@@ -99,7 +99,7 @@
         echo "  ${i##*/}" >> u-boot.changes.added
     done
 
-    for package in u-boot; do
+    for package in u-boot u-boot-board; do
         while IFS= read -r line; do
             if [ "$line" = "PATCH_FILES" ]; then
                 for i in 0???-*.patch; do
@@ -119,24 +119,24 @@
                 echo "$line"
             fi
         done < $package.spec.in > $package.spec.tmp
-
-        # Factory requires all deleted and added patches to be mentioned
-        if [ -e u-boot.changes.deleted ] || [ -e u-boot.changes.added ]; then
-            echo "Patch queue updated from ${GIT_TREE} ${GIT_BRANCH}" > 
$package.changes.proposed
-        fi
-        if [ -e u-boot.changes.deleted ]; then
-            echo "* Patches dropped:" >> $package.changes.proposed
-            cat u-boot.changes.deleted  >> $package.changes.proposed
-        fi
-        if [ -e u-boot.changes.added ]; then
-            echo "* Patches added:" >> $package.changes.proposed
-            cat u-boot.changes.added  >> $package.changes.proposed
-        fi
-        if [ -e $package.changes.proposed ]; then
-            osc vc --file=$package.changes.proposed $package
-            rm -f $package.changes.proposed
-        fi
     done
+
+    # Factory requires all deleted and added patches to be mentioned
+    if [ -e u-boot.changes.deleted ] || [ -e u-boot.changes.added ]; then
+        echo "Patch queue updated from ${GIT_TREE} ${GIT_BRANCH}" > 
u-boot.changes.proposed
+    fi
+    if [ -e u-boot.changes.deleted ]; then
+        echo "* Patches dropped:" >> u-boot.changes.proposed
+        cat u-boot.changes.deleted  >> u-boot.changes.proposed
+    fi
+    if [ -e u-boot.changes.added ]; then
+        echo "* Patches added:" >> u-boot.changes.proposed
+        cat u-boot.changes.added  >> u-boot.changes.proposed
+    fi
+    if [ -e u-boot.changes.proposed ]; then
+        osc vc --file=u-boot.changes.proposed u-boot
+        rm -f u-boot.changes.proposed
+    fi
     if [ -e u-boot.changes.deleted ]; then
         rm -f u-boot.changes.deleted
     fi


Reply via email to