Accepting request 366093 from Base:System

Sorry for the supersede, this fixes a small issue with beaglebone where grub2
would overwrite the initrd while patching the device tree because it's missing
boundary checks.

- EFI: Map fdt as reserved
  * efi-map-fdt-as-reserved.patch

- Fix OMAP3 boards to load u-boot from raw sector offset
  * omap3-Use-raw-SPL-by-default-for-mmc1.patch

- Allow grub2 to find its config
  * efi_loader-Pass-proper-device-path-in-on-boot.patch
- Fix Raspberry Pi 1 build
  * efi_loader-Provide-icache-flush-stub.patch

- Move omap3 to distro bootcmd (to enable efi boot on beagle-xm)
  * omap3-Move-to-distro-bootcmd.patch
- Add EFI patch to support FDT fixups (patches in RAM size)
  * efi_loader-Call-fdt-preparation-functions.patch

- Patch the default u-boot env to search for dtb in /boot at part 2
  * efi-default-env.patch

- Use $fdtfile rather than $fdt_name everywhere:
  * efi2.patch

- Add EFI support about to move upstream:
  * efi.patch

- EFI: Map fdt as reserved
  * efi-map-fdt-as-reserved.patch

- Fix OMAP3 boards to load u-boot from raw sector offset
  * omap3-Use-raw-SPL-by-default-for-mmc1.patch (forwarded request 365802 from algraf)

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

u-boot.spec.in

@@ -26,10 +26,10 @@
 %define udoo_spl UDOO_SPL
 
 # archive_version differs from version for RC version only
-%define archive_version 2016.03-rc2
+%define archive_version 2016.03-rc3
 
 Name:           u-boot-BOARDNAME
-Version:        2016.03~rc2
+Version:        2016.03~rc3
 Release:        0
 Summary:        The u-boot firmware for the BOARDNAME arm platform
 License:        GPL-2.0
@@ -40,8 +40,23 @@ Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
 # Fix exynos KVM support
 Patch1:         u-boot-exynos.patch
-# PATCH-FIX-UPSTREAM fix boot on partition when RAW mode is also available
-Patch2:         0001-spl-if-MMCSD_MODE_RAW-fails-try-MMCSD_MODE_FS-if-ava.patch
+# Add EFI support. Will be upstream in the next version of u-boot.
+Patch3:         efi.patch
+Patch4:         efi2.patch
+# Set default environment slightly different for EFI, so it finds our dtbs
+Patch5:         efi-default-env.patch
+# Move omap3 to distro boot method
+Patch6:		omap3-Move-to-distro-bootcmd.patch
+# efi: Run memory node fixups in device tree
+Patch7:         efi_loader-Call-fdt-preparation-functions.patch
+# Allow grub2 to find its config file
+Patch8:         efi_loader-Pass-proper-device-path-in-on-boot.patch
+# Fix Raspberry Pi 1 build
+Patch9:         efi_loader-Provide-icache-flush-stub.patch
+# Make SPL work with raw sector offsets on beagle-xm
+Patch10:        omap3-Use-raw-SPL-by-default-for-mmc1.patch
+# Ensure we mark the device tree as reserved
+Patch11:        efi-map-fdt-as-reserved.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
@@ -80,7 +95,15 @@ This package contains documentation for u-boot firmware
 %prep
 %setup -q -n u-boot-%{archive_version}
 %patch1 -p1
-%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 %patch99 -p1