Accepting request 312513 from Base:System

1

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

enable_spl_ext_support_for_ti_armv7.patch

@@ -1,10 +1,35 @@
---- include/configs/ti_armv7_common.h.orig	2014-08-21 10:41:47.979045987 +0200
+From 06b07abc2932582fceeb87d8888dff1d5853df83 Mon Sep 17 00:00:00 2001
-+++ include/configs/ti_armv7_common.h	2014-08-21 10:42:12.325045125 +0200
+From: Guillaume GARDET <guillaume.gardet@free.fr>
-@@ -250,6 +250,7 @@
+Date: Tue, 16 Jun 2015 12:26:52 +0200
+Subject: [U-Boot] [PATCH 1/2] ti: armv7: enable EXT support in SPL
+ (using ti_armv7_common.h)
+
+Tested on Pandaboard (rev. A3) and Beagleboard xM (rev. B).
+Compilation tested on TI armv7 boards and OMAP boards from other vendors.
+
+Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
+Cc: Tom Rini <trini@konsulko.com>
+
+---
+ include/configs/ti_armv7_common.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
+index 2bd1164..8762930 100644
+--- a/include/configs/ti_armv7_common.h
++++ b/include/configs/ti_armv7_common.h
+@@ -256,6 +256,11 @@
  #define CONFIG_SPL_LIBDISK_SUPPORT
  #define CONFIG_SPL_MMC_SUPPORT
  #define CONFIG_SPL_FAT_SUPPORT
 +#define CONFIG_SPL_EXT_SUPPORT
++#endif
++
++#ifdef CONFIG_SPL_BUILD
++#define CONFIG_SYS_THUMB_BUILD	/* Thumbs mode to save space in SPL */
  #endif
  
  /* General parts of the framework, required. */
+-- 
+1.8.4.5
+

fix_beagle_spl_build.patch

@@ -1,17 +0,0 @@
-diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
-index f25a940..a28453c 100644
---- a/include/configs/omap3_beagle.h
-+++ b/include/configs/omap3_beagle.h
-@@ -311,6 +311,12 @@
- #define CONFIG_SYS_NAND_ECCBYTES	3
- #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_HAM1_CODE_HW
- #define CONFIG_SYS_NAND_U_BOOT_OFFS	0x80000
-+
-+/* SPL: EXT SUPPORT needs to disable CONFIG_SPL_FAT_SUPPORT otherwise spl is too big for .sram */
-+#ifdef CONFIG_SPL_EXT_SUPPORT
-+#undef CONFIG_SPL_FAT_SUPPORT
-+#endif
-+
- /* NAND: SPL falcon mode configs */
- #ifdef CONFIG_SPL_OS_BOOT
- #define CONFIG_CMD_SPL_NAND_OFS		0x240000

fix_slow_mmc_on_rpi.patch

@@ -0,0 +1,18 @@
+diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c
+index 078ef05..74b497e 100644
+--- a/drivers/mmc/bcm2835_sdhci.c
++++ b/drivers/mmc/bcm2835_sdhci.c
+@@ -69,11 +69,11 @@ static inline void bcm2835_sdhci_raw_writel(struct sdhci_host *host, u32 val,
+ 	 * (Which is just as well - otherwise we'd have to nobble the DMA engine
+ 	 * too)
+ 	 */
+-	while (get_timer(bcm_host->last_write) < bcm_host->twoticks_delay)
++	while (timer_get_us() < bcm_host->last_write + bcm_host->twoticks_delay)
+ 		;
+ 
+ 	writel(val, host->ioaddr + reg);
+-	bcm_host->last_write = get_timer(0);
++	bcm_host->last_write = timer_get_us();
+ }
+ 
+ static inline u32 bcm2835_sdhci_raw_readl(struct sdhci_host *host, int reg)

mx53loco-bootscr.patch

@@ -1,19 +1,48 @@
-Index: include/configs/mx53loco.h
+From eb1f4cea895bcb8edcb58548ba395329783ddd8b Mon Sep 17 00:00:00 2001
-===================================================================
+From: Guillaume GARDET <guillaume.gardet@free.fr>
---- include/configs/mx53loco.h.orig
+Date: Tue, 16 Jun 2015 11:38:07 +0200
-+++ include/configs/mx53loco.h
+Subject: [U-Boot] [PATCH] mx53loco: Use generic 'load' command instead of 'fatload'
+
+This patch uses generic 'load' command instead of 'fatload' for 'loadbootscript', 'loadimage' and 'loadfdt' for mx53loco board.
+
+This allows to use EXT partition instead of FAT, while keeping FAT compatibility.
+
+Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
+
+Cc: Jason Liu <r64343@freescale.com>
+Cc: Stefano Babic <sbabic@denx.de>
+
+---
+ include/configs/mx53loco.h | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
+index db551a9..b3ac5e2 100644
+--- a/include/configs/mx53loco.h
++++ b/include/configs/mx53loco.h
+@@ -43,6 +43,7 @@
+ #define CONFIG_MMC
+ #define CONFIG_CMD_MMC
+ #define CONFIG_GENERIC_MMC
++#define CONFIG_CMD_FS_GENERIC
+ #define CONFIG_CMD_FAT
+ #define CONFIG_CMD_EXT2
+ #define CONFIG_DOS_PARTITION
 @@ -116,11 +117,11 @@
  	"mmcroot=/dev/mmcblk0p2 rw rootwait\0" \
  	"mmcargs=setenv bootargs console=ttymxc0,${baudrate} root=${mmcroot}\0" \
  	"loadbootscript=" \
 -		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
-+		"ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
++		"load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
  	"bootscript=echo Running bootscript from mmc ...; " \
  		"source\0" \
 -	"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
 -	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
-+	"loadimage=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
++	"loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
-+	"loadfdt=ext2load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
++	"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
  	"mmcboot=echo Booting from mmc ...; " \
  		"run mmcargs; " \
  		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+-- 
+1.8.4.5
+

u-boot-a10-olinuxino-lime.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 18 12:07:10 UTC 2015 - guillaume@opensuse.org
+
+- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi
+- Rework patches (to be upstreamable):
+  * enable_spl_ext_support_for_ti_armv7.patch
+  * mx53loco-bootscr.patch
+- Remove fix_beagle_spl_build.patch
+
 -------------------------------------------------------------------
 Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org
 

u-boot-a10-olinuxino-lime.spec

@@ -35,9 +35,9 @@ Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-2015.07-rc2.tar.bz2
 Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
+Patch0:         fix_slow_mmc_on_rpi.patch
 Patch1:         enable_spl_ext_support_for_ti_armv7.patch
-Patch2:         fix_beagle_spl_build.patch
+Patch2:         mx53loco-bootscr.patch
-Patch3:         mx53loco-bootscr.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
@@ -70,9 +70,9 @@ This package contains documentation for u-boot firmware
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 # Any custom patches to be applied on top of mainline u-boot
-%patch1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3
 %patch99 -p1
 
 %build

u-boot-a13-olinuxino.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 18 12:07:10 UTC 2015 - guillaume@opensuse.org
+
+- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi
+- Rework patches (to be upstreamable):
+  * enable_spl_ext_support_for_ti_armv7.patch
+  * mx53loco-bootscr.patch
+- Remove fix_beagle_spl_build.patch
+
 -------------------------------------------------------------------
 Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org
 

u-boot-a13-olinuxino.spec

@@ -35,9 +35,9 @@ Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-2015.07-rc2.tar.bz2
 Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
+Patch0:         fix_slow_mmc_on_rpi.patch
 Patch1:         enable_spl_ext_support_for_ti_armv7.patch
-Patch2:         fix_beagle_spl_build.patch
+Patch2:         mx53loco-bootscr.patch
-Patch3:         mx53loco-bootscr.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
@@ -70,9 +70,9 @@ This package contains documentation for u-boot firmware
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 # Any custom patches to be applied on top of mainline u-boot
-%patch1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3
 %patch99 -p1
 
 %build

u-boot-a13-olinuxinom.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 18 12:07:10 UTC 2015 - guillaume@opensuse.org
+
+- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi
+- Rework patches (to be upstreamable):
+  * enable_spl_ext_support_for_ti_armv7.patch
+  * mx53loco-bootscr.patch
+- Remove fix_beagle_spl_build.patch
+
 -------------------------------------------------------------------
 Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org
 

u-boot-a13-olinuxinom.spec

@@ -35,9 +35,9 @@ Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-2015.07-rc2.tar.bz2
 Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
+Patch0:         fix_slow_mmc_on_rpi.patch
 Patch1:         enable_spl_ext_support_for_ti_armv7.patch
-Patch2:         fix_beagle_spl_build.patch
+Patch2:         mx53loco-bootscr.patch
-Patch3:         mx53loco-bootscr.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
@@ -70,9 +70,9 @@ This package contains documentation for u-boot firmware
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 # Any custom patches to be applied on top of mainline u-boot
-%patch1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3
 %patch99 -p1
 
 %build

u-boot-a20-olinuxino-lime.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 18 12:07:10 UTC 2015 - guillaume@opensuse.org
+
+- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi
+- Rework patches (to be upstreamable):
+  * enable_spl_ext_support_for_ti_armv7.patch
+  * mx53loco-bootscr.patch
+- Remove fix_beagle_spl_build.patch
+
 -------------------------------------------------------------------
 Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org
 

u-boot-a20-olinuxino-lime.spec

@@ -35,9 +35,9 @@ Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-2015.07-rc2.tar.bz2
 Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
+Patch0:         fix_slow_mmc_on_rpi.patch
 Patch1:         enable_spl_ext_support_for_ti_armv7.patch
-Patch2:         fix_beagle_spl_build.patch
+Patch2:         mx53loco-bootscr.patch
-Patch3:         mx53loco-bootscr.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
@@ -70,9 +70,9 @@ This package contains documentation for u-boot firmware
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 # Any custom patches to be applied on top of mainline u-boot
-%patch1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3
 %patch99 -p1
 
 %build

u-boot-a20-olinuxino-lime2.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 18 12:07:10 UTC 2015 - guillaume@opensuse.org
+
+- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi
+- Rework patches (to be upstreamable):
+  * enable_spl_ext_support_for_ti_armv7.patch
+  * mx53loco-bootscr.patch
+- Remove fix_beagle_spl_build.patch
+
 -------------------------------------------------------------------
 Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org
 

u-boot-a20-olinuxino-lime2.spec

@@ -35,9 +35,9 @@ Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-2015.07-rc2.tar.bz2
 Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
+Patch0:         fix_slow_mmc_on_rpi.patch
 Patch1:         enable_spl_ext_support_for_ti_armv7.patch
-Patch2:         fix_beagle_spl_build.patch
+Patch2:         mx53loco-bootscr.patch
-Patch3:         mx53loco-bootscr.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
@@ -70,9 +70,9 @@ This package contains documentation for u-boot firmware
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 # Any custom patches to be applied on top of mainline u-boot
-%patch1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3
 %patch99 -p1
 
 %build

u-boot-a20-olinuxinomicro.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 18 12:07:10 UTC 2015 - guillaume@opensuse.org
+
+- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi
+- Rework patches (to be upstreamable):
+  * enable_spl_ext_support_for_ti_armv7.patch
+  * mx53loco-bootscr.patch
+- Remove fix_beagle_spl_build.patch
+
 -------------------------------------------------------------------
 Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org
 

u-boot-a20-olinuxinomicro.spec

@@ -35,9 +35,9 @@ Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-2015.07-rc2.tar.bz2
 Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
+Patch0:         fix_slow_mmc_on_rpi.patch
 Patch1:         enable_spl_ext_support_for_ti_armv7.patch
-Patch2:         fix_beagle_spl_build.patch
+Patch2:         mx53loco-bootscr.patch
-Patch3:         mx53loco-bootscr.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
@@ -70,9 +70,9 @@ This package contains documentation for u-boot firmware
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 # Any custom patches to be applied on top of mainline u-boot
-%patch1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3
 %patch99 -p1
 
 %build

u-boot-am335xevm.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 18 12:07:10 UTC 2015 - guillaume@opensuse.org
+
+- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi
+- Rework patches (to be upstreamable):
+  * enable_spl_ext_support_for_ti_armv7.patch
+  * mx53loco-bootscr.patch
+- Remove fix_beagle_spl_build.patch
+
 -------------------------------------------------------------------
 Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org
 

u-boot-am335xevm.spec

@@ -35,9 +35,9 @@ Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-2015.07-rc2.tar.bz2
 Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
+Patch0:         fix_slow_mmc_on_rpi.patch
 Patch1:         enable_spl_ext_support_for_ti_armv7.patch
-Patch2:         fix_beagle_spl_build.patch
+Patch2:         mx53loco-bootscr.patch
-Patch3:         mx53loco-bootscr.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
@@ -70,9 +70,9 @@ This package contains documentation for u-boot firmware
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 # Any custom patches to be applied on top of mainline u-boot
-%patch1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3
 %patch99 -p1
 
 %build

u-boot-arndale.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 18 12:07:10 UTC 2015 - guillaume@opensuse.org
+
+- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi
+- Rework patches (to be upstreamable):
+  * enable_spl_ext_support_for_ti_armv7.patch
+  * mx53loco-bootscr.patch
+- Remove fix_beagle_spl_build.patch
+
 -------------------------------------------------------------------
 Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org
 

u-boot-arndale.spec

@@ -35,9 +35,9 @@ Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-2015.07-rc2.tar.bz2
 Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
+Patch0:         fix_slow_mmc_on_rpi.patch
 Patch1:         enable_spl_ext_support_for_ti_armv7.patch
-Patch2:         fix_beagle_spl_build.patch
+Patch2:         mx53loco-bootscr.patch
-Patch3:         mx53loco-bootscr.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
@@ -70,9 +70,9 @@ This package contains documentation for u-boot firmware
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 # Any custom patches to be applied on top of mainline u-boot
-%patch1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3
 %patch99 -p1
 
 %build

u-boot-bananapi.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 18 12:07:10 UTC 2015 - guillaume@opensuse.org
+
+- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi
+- Rework patches (to be upstreamable):
+  * enable_spl_ext_support_for_ti_armv7.patch
+  * mx53loco-bootscr.patch
+- Remove fix_beagle_spl_build.patch
+
 -------------------------------------------------------------------
 Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org
 

u-boot-bananapi.spec

@@ -35,9 +35,9 @@ Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-2015.07-rc2.tar.bz2
 Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
+Patch0:         fix_slow_mmc_on_rpi.patch
 Patch1:         enable_spl_ext_support_for_ti_armv7.patch
-Patch2:         fix_beagle_spl_build.patch
+Patch2:         mx53loco-bootscr.patch
-Patch3:         mx53loco-bootscr.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
@@ -70,9 +70,9 @@ This package contains documentation for u-boot firmware
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 # Any custom patches to be applied on top of mainline u-boot
-%patch1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3
 %patch99 -p1
 
 %build

u-boot-colibrit20.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 18 12:07:10 UTC 2015 - guillaume@opensuse.org
+
+- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi
+- Rework patches (to be upstreamable):
+  * enable_spl_ext_support_for_ti_armv7.patch
+  * mx53loco-bootscr.patch
+- Remove fix_beagle_spl_build.patch
+
 -------------------------------------------------------------------
 Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org
 

u-boot-colibrit20.spec

@@ -35,9 +35,9 @@ Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-2015.07-rc2.tar.bz2
 Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
+Patch0:         fix_slow_mmc_on_rpi.patch
 Patch1:         enable_spl_ext_support_for_ti_armv7.patch
-Patch2:         fix_beagle_spl_build.patch
+Patch2:         mx53loco-bootscr.patch
-Patch3:         mx53loco-bootscr.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
@@ -70,9 +70,9 @@ This package contains documentation for u-boot firmware
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 # Any custom patches to be applied on top of mainline u-boot
-%patch1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3
 %patch99 -p1
 
 %build

u-boot-cubieboard.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 18 12:07:10 UTC 2015 - guillaume@opensuse.org
+
+- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi
+- Rework patches (to be upstreamable):
+  * enable_spl_ext_support_for_ti_armv7.patch
+  * mx53loco-bootscr.patch
+- Remove fix_beagle_spl_build.patch
+
 -------------------------------------------------------------------
 Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org
 

u-boot-cubieboard.spec

@@ -35,9 +35,9 @@ Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-2015.07-rc2.tar.bz2
 Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
+Patch0:         fix_slow_mmc_on_rpi.patch
 Patch1:         enable_spl_ext_support_for_ti_armv7.patch
-Patch2:         fix_beagle_spl_build.patch
+Patch2:         mx53loco-bootscr.patch
-Patch3:         mx53loco-bootscr.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
@@ -70,9 +70,9 @@ This package contains documentation for u-boot firmware
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 # Any custom patches to be applied on top of mainline u-boot
-%patch1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3
 %patch99 -p1
 
 %build

u-boot-cubieboard2.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 18 12:07:10 UTC 2015 - guillaume@opensuse.org
+
+- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi
+- Rework patches (to be upstreamable):
+  * enable_spl_ext_support_for_ti_armv7.patch
+  * mx53loco-bootscr.patch
+- Remove fix_beagle_spl_build.patch
+
 -------------------------------------------------------------------
 Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org
 

u-boot-cubieboard2.spec

@@ -35,9 +35,9 @@ Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-2015.07-rc2.tar.bz2
 Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
+Patch0:         fix_slow_mmc_on_rpi.patch
 Patch1:         enable_spl_ext_support_for_ti_armv7.patch
-Patch2:         fix_beagle_spl_build.patch
+Patch2:         mx53loco-bootscr.patch
-Patch3:         mx53loco-bootscr.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
@@ -70,9 +70,9 @@ This package contains documentation for u-boot firmware
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 # Any custom patches to be applied on top of mainline u-boot
-%patch1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3
 %patch99 -p1
 
 %build

u-boot-cubietruck.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 18 12:07:10 UTC 2015 - guillaume@opensuse.org
+
+- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi
+- Rework patches (to be upstreamable):
+  * enable_spl_ext_support_for_ti_armv7.patch
+  * mx53loco-bootscr.patch
+- Remove fix_beagle_spl_build.patch
+
 -------------------------------------------------------------------
 Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org
 

u-boot-cubietruck.spec

@@ -35,9 +35,9 @@ Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-2015.07-rc2.tar.bz2
 Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
+Patch0:         fix_slow_mmc_on_rpi.patch
 Patch1:         enable_spl_ext_support_for_ti_armv7.patch
-Patch2:         fix_beagle_spl_build.patch
+Patch2:         mx53loco-bootscr.patch
-Patch3:         mx53loco-bootscr.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
@@ -70,9 +70,9 @@ This package contains documentation for u-boot firmware
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 # Any custom patches to be applied on top of mainline u-boot
-%patch1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3
 %patch99 -p1
 
 %build

u-boot-highbank.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 18 12:07:10 UTC 2015 - guillaume@opensuse.org
+
+- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi
+- Rework patches (to be upstreamable):
+  * enable_spl_ext_support_for_ti_armv7.patch
+  * mx53loco-bootscr.patch
+- Remove fix_beagle_spl_build.patch
+
 -------------------------------------------------------------------
 Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org
 

u-boot-highbank.spec

@@ -35,9 +35,9 @@ Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-2015.07-rc2.tar.bz2
 Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
+Patch0:         fix_slow_mmc_on_rpi.patch
 Patch1:         enable_spl_ext_support_for_ti_armv7.patch
-Patch2:         fix_beagle_spl_build.patch
+Patch2:         mx53loco-bootscr.patch
-Patch3:         mx53loco-bootscr.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
@@ -70,9 +70,9 @@ This package contains documentation for u-boot firmware
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 # Any custom patches to be applied on top of mainline u-boot
-%patch1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3
 %patch99 -p1
 
 %build

u-boot-melea1000.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 18 12:07:10 UTC 2015 - guillaume@opensuse.org
+
+- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi
+- Rework patches (to be upstreamable):
+  * enable_spl_ext_support_for_ti_armv7.patch
+  * mx53loco-bootscr.patch
+- Remove fix_beagle_spl_build.patch
+
 -------------------------------------------------------------------
 Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org
 

u-boot-melea1000.spec

@@ -35,9 +35,9 @@ Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-2015.07-rc2.tar.bz2
 Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
+Patch0:         fix_slow_mmc_on_rpi.patch
 Patch1:         enable_spl_ext_support_for_ti_armv7.patch
-Patch2:         fix_beagle_spl_build.patch
+Patch2:         mx53loco-bootscr.patch
-Patch3:         mx53loco-bootscr.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
@@ -70,9 +70,9 @@ This package contains documentation for u-boot firmware
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 # Any custom patches to be applied on top of mainline u-boot
-%patch1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3
 %patch99 -p1
 
 %build

u-boot-mx53loco.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 18 12:07:10 UTC 2015 - guillaume@opensuse.org
+
+- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi
+- Rework patches (to be upstreamable):
+  * enable_spl_ext_support_for_ti_armv7.patch
+  * mx53loco-bootscr.patch
+- Remove fix_beagle_spl_build.patch
+
 -------------------------------------------------------------------
 Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org
 

u-boot-mx53loco.spec

@@ -35,9 +35,9 @@ Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-2015.07-rc2.tar.bz2
 Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
+Patch0:         fix_slow_mmc_on_rpi.patch
 Patch1:         enable_spl_ext_support_for_ti_armv7.patch
-Patch2:         fix_beagle_spl_build.patch
+Patch2:         mx53loco-bootscr.patch
-Patch3:         mx53loco-bootscr.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
@@ -70,9 +70,9 @@ This package contains documentation for u-boot firmware
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 # Any custom patches to be applied on top of mainline u-boot
-%patch1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3
 %patch99 -p1
 
 %build

u-boot-mx6qsabrelite.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 18 12:07:10 UTC 2015 - guillaume@opensuse.org
+
+- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi
+- Rework patches (to be upstreamable):
+  * enable_spl_ext_support_for_ti_armv7.patch
+  * mx53loco-bootscr.patch
+- Remove fix_beagle_spl_build.patch
+
 -------------------------------------------------------------------
 Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org
 

u-boot-mx6qsabrelite.spec

@@ -35,9 +35,9 @@ Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-2015.07-rc2.tar.bz2
 Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
+Patch0:         fix_slow_mmc_on_rpi.patch
 Patch1:         enable_spl_ext_support_for_ti_armv7.patch
-Patch2:         fix_beagle_spl_build.patch
+Patch2:         mx53loco-bootscr.patch
-Patch3:         mx53loco-bootscr.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
@@ -70,9 +70,9 @@ This package contains documentation for u-boot firmware
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 # Any custom patches to be applied on top of mainline u-boot
-%patch1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3
 %patch99 -p1
 
 %build

u-boot-omap3beagle.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 18 12:07:10 UTC 2015 - guillaume@opensuse.org
+
+- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi
+- Rework patches (to be upstreamable):
+  * enable_spl_ext_support_for_ti_armv7.patch
+  * mx53loco-bootscr.patch
+- Remove fix_beagle_spl_build.patch
+
 -------------------------------------------------------------------
 Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org
 

u-boot-omap3beagle.spec

@@ -35,9 +35,9 @@ Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-2015.07-rc2.tar.bz2
 Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
+Patch0:         fix_slow_mmc_on_rpi.patch
 Patch1:         enable_spl_ext_support_for_ti_armv7.patch
-Patch2:         fix_beagle_spl_build.patch
+Patch2:         mx53loco-bootscr.patch
-Patch3:         mx53loco-bootscr.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
@@ -70,9 +70,9 @@ This package contains documentation for u-boot firmware
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 # Any custom patches to be applied on top of mainline u-boot
-%patch1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3
 %patch99 -p1
 
 %build

u-boot-omap4panda.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 18 12:07:10 UTC 2015 - guillaume@opensuse.org
+
+- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi
+- Rework patches (to be upstreamable):
+  * enable_spl_ext_support_for_ti_armv7.patch
+  * mx53loco-bootscr.patch
+- Remove fix_beagle_spl_build.patch
+
 -------------------------------------------------------------------
 Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org
 

u-boot-omap4panda.spec

@@ -35,9 +35,9 @@ Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-2015.07-rc2.tar.bz2
 Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
+Patch0:         fix_slow_mmc_on_rpi.patch
 Patch1:         enable_spl_ext_support_for_ti_armv7.patch
-Patch2:         fix_beagle_spl_build.patch
+Patch2:         mx53loco-bootscr.patch
-Patch3:         mx53loco-bootscr.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
@@ -70,9 +70,9 @@ This package contains documentation for u-boot firmware
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 # Any custom patches to be applied on top of mainline u-boot
-%patch1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3
 %patch99 -p1
 
 %build

u-boot-paz00.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 18 12:07:10 UTC 2015 - guillaume@opensuse.org
+
+- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi
+- Rework patches (to be upstreamable):
+  * enable_spl_ext_support_for_ti_armv7.patch
+  * mx53loco-bootscr.patch
+- Remove fix_beagle_spl_build.patch
+
 -------------------------------------------------------------------
 Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org
 

u-boot-paz00.spec

@@ -35,9 +35,9 @@ Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-2015.07-rc2.tar.bz2
 Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
+Patch0:         fix_slow_mmc_on_rpi.patch
 Patch1:         enable_spl_ext_support_for_ti_armv7.patch
-Patch2:         fix_beagle_spl_build.patch
+Patch2:         mx53loco-bootscr.patch
-Patch3:         mx53loco-bootscr.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
@@ -70,9 +70,9 @@ This package contains documentation for u-boot firmware
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 # Any custom patches to be applied on top of mainline u-boot
-%patch1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3
 %patch99 -p1
 
 %build

u-boot-pcm051rev3.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 18 12:07:10 UTC 2015 - guillaume@opensuse.org
+
+- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi
+- Rework patches (to be upstreamable):
+  * enable_spl_ext_support_for_ti_armv7.patch
+  * mx53loco-bootscr.patch
+- Remove fix_beagle_spl_build.patch
+
 -------------------------------------------------------------------
 Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org
 

u-boot-pcm051rev3.spec

@@ -35,9 +35,9 @@ Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-2015.07-rc2.tar.bz2
 Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
+Patch0:         fix_slow_mmc_on_rpi.patch
 Patch1:         enable_spl_ext_support_for_ti_armv7.patch
-Patch2:         fix_beagle_spl_build.patch
+Patch2:         mx53loco-bootscr.patch
-Patch3:         mx53loco-bootscr.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
@@ -70,9 +70,9 @@ This package contains documentation for u-boot firmware
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 # Any custom patches to be applied on top of mainline u-boot
-%patch1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3
 %patch99 -p1
 
 %build

u-boot-rpi.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 18 12:07:10 UTC 2015 - guillaume@opensuse.org
+
+- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi
+- Rework patches (to be upstreamable):
+  * enable_spl_ext_support_for_ti_armv7.patch
+  * mx53loco-bootscr.patch
+- Remove fix_beagle_spl_build.patch
+
 -------------------------------------------------------------------
 Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org
 

u-boot-rpi.spec

@@ -35,9 +35,9 @@ Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-2015.07-rc2.tar.bz2
 Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
+Patch0:         fix_slow_mmc_on_rpi.patch
 Patch1:         enable_spl_ext_support_for_ti_armv7.patch
-Patch2:         fix_beagle_spl_build.patch
+Patch2:         mx53loco-bootscr.patch
-Patch3:         mx53loco-bootscr.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
@@ -70,9 +70,9 @@ This package contains documentation for u-boot firmware
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 # Any custom patches to be applied on top of mainline u-boot
-%patch1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3
 %patch99 -p1
 
 %build

u-boot-rpi2.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 18 12:07:10 UTC 2015 - guillaume@opensuse.org
+
+- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi
+- Rework patches (to be upstreamable):
+  * enable_spl_ext_support_for_ti_armv7.patch
+  * mx53loco-bootscr.patch
+- Remove fix_beagle_spl_build.patch
+
 -------------------------------------------------------------------
 Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org
 

u-boot-rpi2.spec

@@ -35,9 +35,9 @@ Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-2015.07-rc2.tar.bz2
 Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
+Patch0:         fix_slow_mmc_on_rpi.patch
 Patch1:         enable_spl_ext_support_for_ti_armv7.patch
-Patch2:         fix_beagle_spl_build.patch
+Patch2:         mx53loco-bootscr.patch
-Patch3:         mx53loco-bootscr.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
@@ -70,9 +70,9 @@ This package contains documentation for u-boot firmware
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 # Any custom patches to be applied on top of mainline u-boot
-%patch1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3
 %patch99 -p1
 
 %build

u-boot-snow.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 18 12:07:10 UTC 2015 - guillaume@opensuse.org
+
+- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi
+- Rework patches (to be upstreamable):
+  * enable_spl_ext_support_for_ti_armv7.patch
+  * mx53loco-bootscr.patch
+- Remove fix_beagle_spl_build.patch
+
 -------------------------------------------------------------------
 Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org
 

u-boot-snow.spec

@@ -35,9 +35,9 @@ Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-2015.07-rc2.tar.bz2
 Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
+Patch0:         fix_slow_mmc_on_rpi.patch
 Patch1:         enable_spl_ext_support_for_ti_armv7.patch
-Patch2:         fix_beagle_spl_build.patch
+Patch2:         mx53loco-bootscr.patch
-Patch3:         mx53loco-bootscr.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
@@ -70,9 +70,9 @@ This package contains documentation for u-boot firmware
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 # Any custom patches to be applied on top of mainline u-boot
-%patch1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3
 %patch99 -p1
 
 %build

u-boot.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 18 12:07:10 UTC 2015 - guillaume@opensuse.org
+
+- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi
+- Rework patches (to be upstreamable):
+  * enable_spl_ext_support_for_ti_armv7.patch
+  * mx53loco-bootscr.patch
+- Remove fix_beagle_spl_build.patch
+
 -------------------------------------------------------------------
 Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org
 

u-boot.spec.in

@@ -35,9 +35,9 @@ Url:            http://www.denx.de/wiki/U-Boot
 Source:         ftp://ftp.denx.de/pub/u-boot/u-boot-2015.07-rc2.tar.bz2
 Source2:        arndale-bl1.img
 Source300:      u-boot-rpmlintrc
+Patch0:         fix_slow_mmc_on_rpi.patch
 Patch1:         enable_spl_ext_support_for_ti_armv7.patch
-Patch2:         fix_beagle_spl_build.patch
+Patch2:         mx53loco-bootscr.patch
-Patch3:         mx53loco-bootscr.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
@@ -70,9 +70,9 @@ This package contains documentation for u-boot firmware
 # is non-free licensed, and we don't need it (bnc#773824)
 rm -rf board/Marvell
 # Any custom patches to be applied on top of mainline u-boot
-%patch1
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3
 %patch99 -p1
 
 %build