diff --git a/u-boot-am335xevm.changes b/u-boot-am335xevm.changes
index cb312c1..2fe0b64 100644
--- a/u-boot-am335xevm.changes
+++ b/u-boot-am335xevm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov  3 10:19:42 UTC 2014 - guillaume@opensuse.org
+
+- Apply fix_omap_boot_mode.patch only for omap3/omap4 boards
+
 -------------------------------------------------------------------
 Tue Oct 14 13:22:44 UTC 2014 - guillaume@opensuse.org
 
diff --git a/u-boot-am335xevm.spec b/u-boot-am335xevm.spec
index 961c377..2eb933d 100644
--- a/u-boot-am335xevm.spec
+++ b/u-boot-am335xevm.spec
@@ -79,7 +79,10 @@ rm -rf board/Marvell
 %patch0 -p1
 %patch1
 %patch2 -p1
+# Fix SPL boot mode for OMAP3 and OMAP4 boards only
+%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
 %patch3
+%endif
 %patch4
 %patch5
 %patch6
diff --git a/u-boot-arndale.changes b/u-boot-arndale.changes
index cb312c1..2fe0b64 100644
--- a/u-boot-arndale.changes
+++ b/u-boot-arndale.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov  3 10:19:42 UTC 2014 - guillaume@opensuse.org
+
+- Apply fix_omap_boot_mode.patch only for omap3/omap4 boards
+
 -------------------------------------------------------------------
 Tue Oct 14 13:22:44 UTC 2014 - guillaume@opensuse.org
 
diff --git a/u-boot-arndale.spec b/u-boot-arndale.spec
index 53f8c34..333893b 100644
--- a/u-boot-arndale.spec
+++ b/u-boot-arndale.spec
@@ -79,7 +79,10 @@ rm -rf board/Marvell
 %patch0 -p1
 %patch1
 %patch2 -p1
+# Fix SPL boot mode for OMAP3 and OMAP4 boards only
+%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
 %patch3
+%endif
 %patch4
 %patch5
 %patch6
diff --git a/u-boot-colibrit20iris.changes b/u-boot-colibrit20iris.changes
index cb312c1..2fe0b64 100644
--- a/u-boot-colibrit20iris.changes
+++ b/u-boot-colibrit20iris.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov  3 10:19:42 UTC 2014 - guillaume@opensuse.org
+
+- Apply fix_omap_boot_mode.patch only for omap3/omap4 boards
+
 -------------------------------------------------------------------
 Tue Oct 14 13:22:44 UTC 2014 - guillaume@opensuse.org
 
diff --git a/u-boot-colibrit20iris.spec b/u-boot-colibrit20iris.spec
index 701d113..10258f1 100644
--- a/u-boot-colibrit20iris.spec
+++ b/u-boot-colibrit20iris.spec
@@ -79,7 +79,10 @@ rm -rf board/Marvell
 %patch0 -p1
 %patch1
 %patch2 -p1
+# Fix SPL boot mode for OMAP3 and OMAP4 boards only
+%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
 %patch3
+%endif
 %patch4
 %patch5
 %patch6
diff --git a/u-boot-cubieboard.changes b/u-boot-cubieboard.changes
index cb312c1..2fe0b64 100644
--- a/u-boot-cubieboard.changes
+++ b/u-boot-cubieboard.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov  3 10:19:42 UTC 2014 - guillaume@opensuse.org
+
+- Apply fix_omap_boot_mode.patch only for omap3/omap4 boards
+
 -------------------------------------------------------------------
 Tue Oct 14 13:22:44 UTC 2014 - guillaume@opensuse.org
 
diff --git a/u-boot-cubieboard.spec b/u-boot-cubieboard.spec
index c9fe505..45b2424 100644
--- a/u-boot-cubieboard.spec
+++ b/u-boot-cubieboard.spec
@@ -79,7 +79,10 @@ rm -rf board/Marvell
 %patch0 -p1
 %patch1
 %patch2 -p1
+# Fix SPL boot mode for OMAP3 and OMAP4 boards only
+%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
 %patch3
+%endif
 %patch4
 %patch5
 %patch6
diff --git a/u-boot-cubieboard2.changes b/u-boot-cubieboard2.changes
index cb312c1..2fe0b64 100644
--- a/u-boot-cubieboard2.changes
+++ b/u-boot-cubieboard2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov  3 10:19:42 UTC 2014 - guillaume@opensuse.org
+
+- Apply fix_omap_boot_mode.patch only for omap3/omap4 boards
+
 -------------------------------------------------------------------
 Tue Oct 14 13:22:44 UTC 2014 - guillaume@opensuse.org
 
diff --git a/u-boot-cubieboard2.spec b/u-boot-cubieboard2.spec
index e9604dc..8c1e92b 100644
--- a/u-boot-cubieboard2.spec
+++ b/u-boot-cubieboard2.spec
@@ -79,7 +79,10 @@ rm -rf board/Marvell
 %patch0 -p1
 %patch1
 %patch2 -p1
+# Fix SPL boot mode for OMAP3 and OMAP4 boards only
+%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
 %patch3
+%endif
 %patch4
 %patch5
 %patch6
diff --git a/u-boot-cubietruck.changes b/u-boot-cubietruck.changes
index cb312c1..2fe0b64 100644
--- a/u-boot-cubietruck.changes
+++ b/u-boot-cubietruck.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov  3 10:19:42 UTC 2014 - guillaume@opensuse.org
+
+- Apply fix_omap_boot_mode.patch only for omap3/omap4 boards
+
 -------------------------------------------------------------------
 Tue Oct 14 13:22:44 UTC 2014 - guillaume@opensuse.org
 
diff --git a/u-boot-cubietruck.spec b/u-boot-cubietruck.spec
index 893ccb8..f37889f 100644
--- a/u-boot-cubietruck.spec
+++ b/u-boot-cubietruck.spec
@@ -79,7 +79,10 @@ rm -rf board/Marvell
 %patch0 -p1
 %patch1
 %patch2 -p1
+# Fix SPL boot mode for OMAP3 and OMAP4 boards only
+%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
 %patch3
+%endif
 %patch4
 %patch5
 %patch6
diff --git a/u-boot-highbank.changes b/u-boot-highbank.changes
index cb312c1..2fe0b64 100644
--- a/u-boot-highbank.changes
+++ b/u-boot-highbank.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov  3 10:19:42 UTC 2014 - guillaume@opensuse.org
+
+- Apply fix_omap_boot_mode.patch only for omap3/omap4 boards
+
 -------------------------------------------------------------------
 Tue Oct 14 13:22:44 UTC 2014 - guillaume@opensuse.org
 
diff --git a/u-boot-highbank.spec b/u-boot-highbank.spec
index e4c398a..eb7cb77 100644
--- a/u-boot-highbank.spec
+++ b/u-boot-highbank.spec
@@ -79,7 +79,10 @@ rm -rf board/Marvell
 %patch0 -p1
 %patch1
 %patch2 -p1
+# Fix SPL boot mode for OMAP3 and OMAP4 boards only
+%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
 %patch3
+%endif
 %patch4
 %patch5
 %patch6
diff --git a/u-boot-melea1000.changes b/u-boot-melea1000.changes
index cb312c1..2fe0b64 100644
--- a/u-boot-melea1000.changes
+++ b/u-boot-melea1000.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov  3 10:19:42 UTC 2014 - guillaume@opensuse.org
+
+- Apply fix_omap_boot_mode.patch only for omap3/omap4 boards
+
 -------------------------------------------------------------------
 Tue Oct 14 13:22:44 UTC 2014 - guillaume@opensuse.org
 
diff --git a/u-boot-melea1000.spec b/u-boot-melea1000.spec
index c215948..7b80ee9 100644
--- a/u-boot-melea1000.spec
+++ b/u-boot-melea1000.spec
@@ -79,7 +79,10 @@ rm -rf board/Marvell
 %patch0 -p1
 %patch1
 %patch2 -p1
+# Fix SPL boot mode for OMAP3 and OMAP4 boards only
+%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
 %patch3
+%endif
 %patch4
 %patch5
 %patch6
diff --git a/u-boot-mx53loco.changes b/u-boot-mx53loco.changes
index cb312c1..2fe0b64 100644
--- a/u-boot-mx53loco.changes
+++ b/u-boot-mx53loco.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov  3 10:19:42 UTC 2014 - guillaume@opensuse.org
+
+- Apply fix_omap_boot_mode.patch only for omap3/omap4 boards
+
 -------------------------------------------------------------------
 Tue Oct 14 13:22:44 UTC 2014 - guillaume@opensuse.org
 
diff --git a/u-boot-mx53loco.spec b/u-boot-mx53loco.spec
index 4fc0caa..59fa5eb 100644
--- a/u-boot-mx53loco.spec
+++ b/u-boot-mx53loco.spec
@@ -79,7 +79,10 @@ rm -rf board/Marvell
 %patch0 -p1
 %patch1
 %patch2 -p1
+# Fix SPL boot mode for OMAP3 and OMAP4 boards only
+%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
 %patch3
+%endif
 %patch4
 %patch5
 %patch6
diff --git a/u-boot-mx6qsabrelite.changes b/u-boot-mx6qsabrelite.changes
index cb312c1..2fe0b64 100644
--- a/u-boot-mx6qsabrelite.changes
+++ b/u-boot-mx6qsabrelite.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov  3 10:19:42 UTC 2014 - guillaume@opensuse.org
+
+- Apply fix_omap_boot_mode.patch only for omap3/omap4 boards
+
 -------------------------------------------------------------------
 Tue Oct 14 13:22:44 UTC 2014 - guillaume@opensuse.org
 
diff --git a/u-boot-mx6qsabrelite.spec b/u-boot-mx6qsabrelite.spec
index eb2a151..8c7ae76 100644
--- a/u-boot-mx6qsabrelite.spec
+++ b/u-boot-mx6qsabrelite.spec
@@ -79,7 +79,10 @@ rm -rf board/Marvell
 %patch0 -p1
 %patch1
 %patch2 -p1
+# Fix SPL boot mode for OMAP3 and OMAP4 boards only
+%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
 %patch3
+%endif
 %patch4
 %patch5
 %patch6
diff --git a/u-boot-omap3beagle.changes b/u-boot-omap3beagle.changes
index cb312c1..2fe0b64 100644
--- a/u-boot-omap3beagle.changes
+++ b/u-boot-omap3beagle.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov  3 10:19:42 UTC 2014 - guillaume@opensuse.org
+
+- Apply fix_omap_boot_mode.patch only for omap3/omap4 boards
+
 -------------------------------------------------------------------
 Tue Oct 14 13:22:44 UTC 2014 - guillaume@opensuse.org
 
diff --git a/u-boot-omap3beagle.spec b/u-boot-omap3beagle.spec
index 7c4115b..6f37979 100644
--- a/u-boot-omap3beagle.spec
+++ b/u-boot-omap3beagle.spec
@@ -79,7 +79,10 @@ rm -rf board/Marvell
 %patch0 -p1
 %patch1
 %patch2 -p1
+# Fix SPL boot mode for OMAP3 and OMAP4 boards only
+%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
 %patch3
+%endif
 %patch4
 %patch5
 %patch6
diff --git a/u-boot-omap4panda.changes b/u-boot-omap4panda.changes
index cb312c1..2fe0b64 100644
--- a/u-boot-omap4panda.changes
+++ b/u-boot-omap4panda.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov  3 10:19:42 UTC 2014 - guillaume@opensuse.org
+
+- Apply fix_omap_boot_mode.patch only for omap3/omap4 boards
+
 -------------------------------------------------------------------
 Tue Oct 14 13:22:44 UTC 2014 - guillaume@opensuse.org
 
diff --git a/u-boot-omap4panda.spec b/u-boot-omap4panda.spec
index 8c630cf..fb13c4b 100644
--- a/u-boot-omap4panda.spec
+++ b/u-boot-omap4panda.spec
@@ -79,7 +79,10 @@ rm -rf board/Marvell
 %patch0 -p1
 %patch1
 %patch2 -p1
+# Fix SPL boot mode for OMAP3 and OMAP4 boards only
+%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
 %patch3
+%endif
 %patch4
 %patch5
 %patch6
diff --git a/u-boot-paz00.changes b/u-boot-paz00.changes
index cb312c1..2fe0b64 100644
--- a/u-boot-paz00.changes
+++ b/u-boot-paz00.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov  3 10:19:42 UTC 2014 - guillaume@opensuse.org
+
+- Apply fix_omap_boot_mode.patch only for omap3/omap4 boards
+
 -------------------------------------------------------------------
 Tue Oct 14 13:22:44 UTC 2014 - guillaume@opensuse.org
 
diff --git a/u-boot-paz00.spec b/u-boot-paz00.spec
index 1b574fd..128a0d2 100644
--- a/u-boot-paz00.spec
+++ b/u-boot-paz00.spec
@@ -79,7 +79,10 @@ rm -rf board/Marvell
 %patch0 -p1
 %patch1
 %patch2 -p1
+# Fix SPL boot mode for OMAP3 and OMAP4 boards only
+%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
 %patch3
+%endif
 %patch4
 %patch5
 %patch6
diff --git a/u-boot-rpib.changes b/u-boot-rpib.changes
index cb312c1..2fe0b64 100644
--- a/u-boot-rpib.changes
+++ b/u-boot-rpib.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov  3 10:19:42 UTC 2014 - guillaume@opensuse.org
+
+- Apply fix_omap_boot_mode.patch only for omap3/omap4 boards
+
 -------------------------------------------------------------------
 Tue Oct 14 13:22:44 UTC 2014 - guillaume@opensuse.org
 
diff --git a/u-boot-rpib.spec b/u-boot-rpib.spec
index 26f3772..105675d 100644
--- a/u-boot-rpib.spec
+++ b/u-boot-rpib.spec
@@ -79,7 +79,10 @@ rm -rf board/Marvell
 %patch0 -p1
 %patch1
 %patch2 -p1
+# Fix SPL boot mode for OMAP3 and OMAP4 boards only
+%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
 %patch3
+%endif
 %patch4
 %patch5
 %patch6
diff --git a/u-boot-snow.changes b/u-boot-snow.changes
index cb312c1..2fe0b64 100644
--- a/u-boot-snow.changes
+++ b/u-boot-snow.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov  3 10:19:42 UTC 2014 - guillaume@opensuse.org
+
+- Apply fix_omap_boot_mode.patch only for omap3/omap4 boards
+
 -------------------------------------------------------------------
 Tue Oct 14 13:22:44 UTC 2014 - guillaume@opensuse.org
 
diff --git a/u-boot-snow.spec b/u-boot-snow.spec
index 7bef05a..585b7aa 100644
--- a/u-boot-snow.spec
+++ b/u-boot-snow.spec
@@ -79,7 +79,10 @@ rm -rf board/Marvell
 %patch0 -p1
 %patch1
 %patch2 -p1
+# Fix SPL boot mode for OMAP3 and OMAP4 boards only
+%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
 %patch3
+%endif
 %patch4
 %patch5
 %patch6
diff --git a/u-boot-vexpressaemv8a.changes b/u-boot-vexpressaemv8a.changes
index cb312c1..2fe0b64 100644
--- a/u-boot-vexpressaemv8a.changes
+++ b/u-boot-vexpressaemv8a.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov  3 10:19:42 UTC 2014 - guillaume@opensuse.org
+
+- Apply fix_omap_boot_mode.patch only for omap3/omap4 boards
+
 -------------------------------------------------------------------
 Tue Oct 14 13:22:44 UTC 2014 - guillaume@opensuse.org
 
diff --git a/u-boot-vexpressaemv8a.spec b/u-boot-vexpressaemv8a.spec
index 07d826b..5a7caff 100644
--- a/u-boot-vexpressaemv8a.spec
+++ b/u-boot-vexpressaemv8a.spec
@@ -79,7 +79,10 @@ rm -rf board/Marvell
 %patch0 -p1
 %patch1
 %patch2 -p1
+# Fix SPL boot mode for OMAP3 and OMAP4 boards only
+%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
 %patch3
+%endif
 %patch4
 %patch5
 %patch6
diff --git a/u-boot.changes b/u-boot.changes
index cb312c1..2fe0b64 100644
--- a/u-boot.changes
+++ b/u-boot.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov  3 10:19:42 UTC 2014 - guillaume@opensuse.org
+
+- Apply fix_omap_boot_mode.patch only for omap3/omap4 boards
+
 -------------------------------------------------------------------
 Tue Oct 14 13:22:44 UTC 2014 - guillaume@opensuse.org
 
diff --git a/u-boot.spec.in b/u-boot.spec.in
index b745696..0f45133 100644
--- a/u-boot.spec.in
+++ b/u-boot.spec.in
@@ -79,7 +79,10 @@ rm -rf board/Marvell
 %patch0 -p1
 %patch1
 %patch2 -p1
+# Fix SPL boot mode for OMAP3 and OMAP4 boards only
+%if "%{name}" == "u-boot-omap4panda" || "%{name}" == "u-boot-omap3beagle"
 %patch3
+%endif
 %patch4
 %patch5
 %patch6