Accepting request 650041 from hardware👢staging

OBS-URL: https://build.opensuse.org/request/show/650041 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=29
2018-11-18 19:13:29 +00:00 · 2018-11-18 19:13:29 +00:00 · 3cb5805671
commit 3cb5805671
parent 818d48706c
142 changed files with 772 additions and 212 deletions
--- a/0005-zynqmp-Add-generic-target.patch
+++ b/0005-zynqmp-Add-generic-target.patch
@ -38,8 +38,8 @@ v3 -> v4:
  - 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 ++++++
+ 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
--- a/u-boot-a10-olinuxino-lime.changes
+++ b/u-boot-a10-olinuxino-lime.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-a10-olinuxino-lime.spec
+++ b/u-boot-a10-olinuxino-lime.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-a13-olinuxino.changes
+++ b/u-boot-a13-olinuxino.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-a13-olinuxino.spec
+++ b/u-boot-a13-olinuxino.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-a13-olinuxinom.changes
+++ b/u-boot-a13-olinuxinom.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-a13-olinuxinom.spec
+++ b/u-boot-a13-olinuxinom.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-a20-olinuxino-lime.changes
+++ b/u-boot-a20-olinuxino-lime.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-a20-olinuxino-lime.spec
+++ b/u-boot-a20-olinuxino-lime.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-a20-olinuxino-lime2.changes
+++ b/u-boot-a20-olinuxino-lime2.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-a20-olinuxino-lime2.spec
+++ b/u-boot-a20-olinuxino-lime2.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-a20-olinuxinomicro.changes
+++ b/u-boot-a20-olinuxinomicro.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-a20-olinuxinomicro.spec
+++ b/u-boot-a20-olinuxinomicro.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-am335xboneblack.changes
+++ b/u-boot-am335xboneblack.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-am335xboneblack.spec
+++ b/u-boot-am335xboneblack.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-am335xevm.changes
+++ b/u-boot-am335xevm.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-am335xevm.spec
+++ b/u-boot-am335xevm.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-am57xxevm.changes
+++ b/u-boot-am57xxevm.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-am57xxevm.spec
+++ b/u-boot-am57xxevm.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-arndale.changes
+++ b/u-boot-arndale.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-arndale.spec
+++ b/u-boot-arndale.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-bananapi.changes
+++ b/u-boot-bananapi.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-bananapi.spec
+++ b/u-boot-bananapi.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-bananapim64.changes
+++ b/u-boot-bananapim64.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-bananapim64.spec
+++ b/u-boot-bananapim64.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-board.spec.in
+++ b/u-boot-board.spec.in
@ -129,8 +129,11 @@ PATCH_EXEC

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-clearfog.changes
+++ b/u-boot-clearfog.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-clearfog.spec
+++ b/u-boot-clearfog.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-colibrit20.changes
+++ b/u-boot-colibrit20.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-colibrit20.spec
+++ b/u-boot-colibrit20.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-cubieboard.changes
+++ b/u-boot-cubieboard.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-cubieboard.spec
+++ b/u-boot-cubieboard.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-cubieboard2.changes
+++ b/u-boot-cubieboard2.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-cubieboard2.spec
+++ b/u-boot-cubieboard2.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-cubietruck.changes
+++ b/u-boot-cubietruck.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-cubietruck.spec
+++ b/u-boot-cubietruck.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-dragonboard410c.changes
+++ b/u-boot-dragonboard410c.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-dragonboard410c.spec
+++ b/u-boot-dragonboard410c.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-dragonboard820c.changes
+++ b/u-boot-dragonboard820c.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-dragonboard820c.spec
+++ b/u-boot-dragonboard820c.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-evb-rk3399.changes
+++ b/u-boot-evb-rk3399.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-evb-rk3399.spec
+++ b/u-boot-evb-rk3399.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-firefly-rk3288.changes
+++ b/u-boot-firefly-rk3288.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-firefly-rk3288.spec
+++ b/u-boot-firefly-rk3288.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-firefly-rk3399.changes
+++ b/u-boot-firefly-rk3399.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-firefly-rk3399.spec
+++ b/u-boot-firefly-rk3399.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-geekbox.changes
+++ b/u-boot-geekbox.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-geekbox.spec
+++ b/u-boot-geekbox.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-highbank.changes
+++ b/u-boot-highbank.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-highbank.spec
+++ b/u-boot-highbank.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-hikey.changes
+++ b/u-boot-hikey.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-hikey.spec
+++ b/u-boot-hikey.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-hyundaia7hd.changes
+++ b/u-boot-hyundaia7hd.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-hyundaia7hd.spec
+++ b/u-boot-hyundaia7hd.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-jetson-tk1.changes
+++ b/u-boot-jetson-tk1.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-jetson-tk1.spec
+++ b/u-boot-jetson-tk1.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-lamobor1.changes
+++ b/u-boot-lamobor1.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-lamobor1.spec
+++ b/u-boot-lamobor1.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-ls1012afrdmqspi.changes
+++ b/u-boot-ls1012afrdmqspi.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-ls1012afrdmqspi.spec
+++ b/u-boot-ls1012afrdmqspi.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-melea1000.changes
+++ b/u-boot-melea1000.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-melea1000.spec
+++ b/u-boot-melea1000.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-merriia80optimus.changes
+++ b/u-boot-merriia80optimus.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-merriia80optimus.spec
+++ b/u-boot-merriia80optimus.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-mvebudb-88f3720.changes
+++ b/u-boot-mvebudb-88f3720.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-mvebudb-88f3720.spec
+++ b/u-boot-mvebudb-88f3720.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-mvebudbarmada8k.changes
+++ b/u-boot-mvebudbarmada8k.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-mvebudbarmada8k.spec
+++ b/u-boot-mvebudbarmada8k.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-mvebuespressobin-88f3720.changes
+++ b/u-boot-mvebuespressobin-88f3720.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-mvebuespressobin-88f3720.spec
+++ b/u-boot-mvebuespressobin-88f3720.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-mvebumcbin-88f8040.changes
+++ b/u-boot-mvebumcbin-88f8040.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-mvebumcbin-88f8040.spec
+++ b/u-boot-mvebumcbin-88f8040.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-mx53loco.changes
+++ b/u-boot-mx53loco.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-mx53loco.spec
+++ b/u-boot-mx53loco.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-mx6cuboxi.changes
+++ b/u-boot-mx6cuboxi.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-mx6cuboxi.spec
+++ b/u-boot-mx6cuboxi.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-mx6qsabrelite.changes
+++ b/u-boot-mx6qsabrelite.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-mx6qsabrelite.spec
+++ b/u-boot-mx6qsabrelite.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-nanopia64.changes
+++ b/u-boot-nanopia64.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-nanopia64.spec
+++ b/u-boot-nanopia64.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-nanopineo.changes
+++ b/u-boot-nanopineo.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-nanopineo.spec
+++ b/u-boot-nanopineo.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-nanopineoair.changes
+++ b/u-boot-nanopineoair.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-nanopineoair.spec
+++ b/u-boot-nanopineoair.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-odroid-c2.changes
+++ b/u-boot-odroid-c2.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-odroid-c2.spec
+++ b/u-boot-odroid-c2.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-odroid-xu3.changes
+++ b/u-boot-odroid-xu3.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-odroid-xu3.spec
+++ b/u-boot-odroid-xu3.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-odroid.changes
+++ b/u-boot-odroid.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-odroid.spec
+++ b/u-boot-odroid.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-omap3beagle.changes
+++ b/u-boot-omap3beagle.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-omap3beagle.spec
+++ b/u-boot-omap3beagle.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-omap4panda.changes
+++ b/u-boot-omap4panda.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-omap4panda.spec
+++ b/u-boot-omap4panda.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-orangepipc.changes
+++ b/u-boot-orangepipc.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-orangepipc.spec
+++ b/u-boot-orangepipc.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-orangepipc2.changes
+++ b/u-boot-orangepipc2.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-orangepipc2.spec
+++ b/u-boot-orangepipc2.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/u-boot-p2371-2180.changes
+++ b/u-boot-p2371-2180.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 18:56:52 UTC 2018 - afaerber@suse.de
+
+- pine64plus, nanopia64, bananapim64, orangepipc2, pineh64: Fix BL31
+
 -------------------------------------------------------------------
 Thu Nov 15 14:30:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/u-boot-p2371-2180.spec
+++ b/u-boot-p2371-2180.spec
@ -14,7 +14,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

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


@ -141,8 +141,11 @@ This package contains documentation for U-Boot firmware.

 %build
 export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s)
-%if 0%{?is_a64} || 0%{?is_h5} || 0%{?is_h6}
-export BL31=/boot/bl31.bin
+%if 0%{?is_a64} || 0%{?is_h5}
+export BL31=/usr/share/arm-trusted-firmware-sun50ia64/bl31.bin
+%endif
+%if 0%{?is_h6}
+export BL31=/usr/share/arm-trusted-firmware-sun50ih6/bl31.bin
 %endif

 %if %{with uboot_atf}
--- a/Show More
+++ b/Show More