Accepting request 342326 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/342326
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/u-boot?expand=0&rev=58

u-boot.spec.in

@@ -25,10 +25,10 @@
 %define cuboxi_spl CUBOXI_SPL
 
 # archive_version differs from version for RC version only
-%define archive_version 2015.10-rc5
+%define archive_version 2015.10
 
 Name:           u-boot-BOARDNAME
-Version:        2015.10~rc5
+Version:        2015.10
 Release:        0
 Summary:        The u-boot firmware for the BOARDNAME arm platform
 License:        GPL-2.0
@@ -37,9 +37,10 @@ Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2
 Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
-# Odroid patches
-Patch10:        0001-odroid-replace-fatload-with-load-to-be-able-to-use-E.patch
-Patch11:        0002-odroid-Add-boot-script-boot.scr-support.patch
+# PATCH-FIX-UPSTREAM Fix build for beagle x15
+Patch1:         U-Boot-1-2-usb-host-xhci-omap-fix-build-break.patch
+# PATCH-FIX-UPSTREAM Fix am335x booting
+Patch2:         U-Boot-image.c-Fix-non-Android-booting-with-ramdisk-and-or-device-tree.patch
 # Marvell boards support is non-free licensed, and we don't need it (bnc#773824)
 Patch99:        drop-marvell.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -68,8 +69,8 @@ This package contains documentation for u-boot firmware
 
 %prep
 %setup -q -n u-boot-%{archive_version}
-%patch10 -p1
-%patch11 -p1
+%patch1 -p1
+%patch2 -p1
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 %patch99 -p1