Hello community,
here is the log from the commit of package u-boot for openSUSE:Factory checked in at 2014-01-08 20:09:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/u-boot (Old)
and /work/SRC/openSUSE:Factory/.u-boot.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "u-boot"
Changes:
--------
--- /work/SRC/openSUSE:Factory/u-boot/u-boot-am335xevm.changes 2014-01-03 19:52:01.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-am335xevm.changes 2014-01-08 20:09:40.000000000 +0100
@@ -1,0 +2,32 @@
+Wed Jan 8 02:07:44 UTC 2014 - afaerber@suse.de
+
+- rpi_b-bootscr.patch: Change rpi_b to use boot.scr
+
+-------------------------------------------------------------------
+Tue Jan 7 16:01:13 UTC 2014 - dmueller@suse.com
+
+- remove origin flavor
+
+-------------------------------------------------------------------
+Mon Jan 6 22:57:05 UTC 2014 - afaerber@suse.de
+
+- Enable paz00 config (Toshiba AC100)
+
+-------------------------------------------------------------------
+Mon Jan 6 21:34:03 UTC 2014 - afaerber@suse.de
+
+- Enable colibri_t20_iris config (Toradex Colibri-T20 on Iris)
+- Update u-boot.spec.in copyright and fix typo in comment
+
+-------------------------------------------------------------------
+Sat Jan 4 01:47:50 UTC 2014 - agraf@suse.com
+
+- prefer u-boot-dtb.bin over u-boot.bin
+- simplify files section
+
+-------------------------------------------------------------------
+Fri Jan 3 16:54:30 UTC 2014 - dmueller@suse.com
+
+- mlo-ext2.patch: Search for files in /boot, not in /boot/boot
+
+-------------------------------------------------------------------
u-boot-arndale.changes: same change
New Changes file:
--- /dev/null 2013-11-25 01:44:08.036031256 +0100
+++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-colibrit20iris.changes 2014-01-08 20:09:40.000000000 +0100
@@ -0,0 +1,336 @@
+-------------------------------------------------------------------
+Wed Jan 8 02:07:44 UTC 2014 - afaerber@suse.de
+
+- rpi_b-bootscr.patch: Change rpi_b to use boot.scr
+
+-------------------------------------------------------------------
+Tue Jan 7 16:01:13 UTC 2014 - dmueller@suse.com
+
+- remove origin flavor
+
+-------------------------------------------------------------------
+Mon Jan 6 22:57:05 UTC 2014 - afaerber@suse.de
+
+- Enable paz00 config (Toshiba AC100)
+
+-------------------------------------------------------------------
+Mon Jan 6 21:34:03 UTC 2014 - afaerber@suse.de
+
+- Enable colibri_t20_iris config (Toradex Colibri-T20 on Iris)
+- Update u-boot.spec.in copyright and fix typo in comment
+
+-------------------------------------------------------------------
+Sat Jan 4 01:47:50 UTC 2014 - agraf@suse.com
+
+- prefer u-boot-dtb.bin over u-boot.bin
+- simplify files section
+
+-------------------------------------------------------------------
+Fri Jan 3 16:54:30 UTC 2014 - dmueller@suse.com
+
+- mlo-ext2.patch: Search for files in /boot, not in /boot/boot
+
+-------------------------------------------------------------------
+Mon Dec 30 18:37:50 UTC 2013 - matwey.kornilov@gmail.com
+
+- Add am335x_evm-bootscr.patch: Add bootscr to AM335x
+ platform based devices
+
+-------------------------------------------------------------------
+Tue Dec 17 14:33:52 UTC 2013 - guillaume@opensuse.org
+
+- Remove old unused patches:
+ * v2013.04-sunxi.patch
+ * loadaddr-defaults.patch
+
+-------------------------------------------------------------------
+Tue Dec 17 14:10:51 UTC 2013 - guillaume@opensuse.org
+
+- Add ti_common_initrd_support.patch to enable initrd support for
+ AM335x boards
+
+-------------------------------------------------------------------
+Tue Dec 17 14:03:50 UTC 2013 - guillaume@opensuse.org
+
+- Add am335x_evm support which includes: Beagle Bone,
+ Beagle Bone Black, TI AM335x EVM, TI AM335x EVM-SK
+
+-------------------------------------------------------------------
+Tue Nov 26 13:46:22 UTC 2013 - guillaume@opensuse.org
+
+- Add Arndale support
+
+-------------------------------------------------------------------
+Tue Nov 26 13:05:10 UTC 2013 - guillaume@opensuse.org
+
+- Update v2013.04-sunxi.patch to v2013.10-sunxi.patch
+
+-------------------------------------------------------------------
+Mon Nov 25 10:05:48 UTC 2013 - guillaume@opensuse.org
+
+- Remove kerneladdr and ramdiskaddr definition in u-boot patches
+ (now done in JeOS image with u-boot hooks)
+- Update patches to current version:
+ * 0006-ARMV7-hardfp-build-fix.patch
+ * beagle-bootscr.patch
+ * mx53loco-bootscr.patch
+ * mlo-ext2.patch
+- Merge fix_omap4_ext2_boot.patch in mlo-ext2.patch
+- Rename exynos-ext2.patch in origen-ext2.patch
+
+-------------------------------------------------------------------
+Mon Nov 25 09:57:12 UTC 2013 - guillaume@opensuse.org
+
+- Update to 2013.10
+
+-------------------------------------------------------------------
+Fri Nov 22 16:25:36 UTC 2013 - guillaume@opensuse.org
+
+- Fix OMAP4 pandaboard EXT2 boot
+
+-------------------------------------------------------------------
+Fri Sep 13 11:31:14 UTC 2013 - guillaume@opensuse.org
+
+- Fix u-boot.bin and boot.scr place since they are now in boot/ folder.
+
+-------------------------------------------------------------------
+Wed May 1 20:48:30 UTC 2013 - dmueller@suse.com
+
+- add support for cubieboard, hyundaia7hd, melea1000
+
+-------------------------------------------------------------------
+Wed May 1 08:18:26 UTC 2013 - dmueller@suse.com
+
+- update to 2013.04
+ * no upstream changelog available
+- remove dead u-boot-raspberrypi* (actually called rpib now)
+- add rpib variant
+
+-------------------------------------------------------------------
+Thu Apr 11 17:05:58 UTC 2013 - guillaume.gardet@opensuse.org
+
+- add omap3_beagle to targets
+
+-------------------------------------------------------------------
+Thu Apr 11 16:05:41 UTC 2013 - dmueller@suse.com
+
+- remove u8500href subpackage, kernel got dropped
+
+-------------------------------------------------------------------
+Sun Apr 7 14:32:20 UTC 2013 - agraf@suse.com
+
+- update to 2013.04rc2
+- enable bootz support on all boards
+
+-------------------------------------------------------------------
+Wed Mar 20 07:21:06 UTC 2013 - agraf@suse.com
+
+- fix mlo-ext2.patch to actually use the ext4 infrastructure
+
+-------------------------------------------------------------------
+Sat Jan 26 10:38:07 UTC 2013 - dmueller@suse.com
+
+- update mlo-ext2.patch:
+ * use the ext4 driver now since ext2 got removed
+
+-------------------------------------------------------------------
+Wed Oct 24 22:33:13 UTC 2012 - agraf@suse.com
+
+- add sdhc-1.patch, sdhc-2.patch, sdhc-3.patch:
+ * backport upstream sdhc fixes
+
+-------------------------------------------------------------------
+Wed Oct 24 01:37:36 CEST 2012 - agraf@suse.de
+
+- update to 2012.10:
+ - refresh patches 0006-ARMV7-hardfp-build-fix.patch, mlo-ext2.patch,
+ loadaddr-defaults.patch, mx53loco-bootscr.patch
+
+-------------------------------------------------------------------
+Mon Oct 22 12:00:22 UTC 2012 - agraf@suse.com
+
+- fix origen by putting the ramdisk higher
+
+-------------------------------------------------------------------
+Mon Aug 6 09:39:54 UTC 2012 - dmueller@suse.com
+
+- remove Marvell sources as they are non-free licensed (bnc#773824)
+
+-------------------------------------------------------------------
+Thu Jul 26 18:21:44 UTC 2012 - agraf@suse.com
+
+- fix ext2 support for origen
+- add origen-spl.bin for origen
+
+-------------------------------------------------------------------
+Thu Jul 26 09:47:31 UTC 2012 - dmueller@suse.com
+
+- merge u-boot-tools
+
+-------------------------------------------------------------------
+Wed Jul 25 21:05:08 UTC 2012 - agraf@suse.com
+
+- add ext2 support by default in mx53loco
+
+-------------------------------------------------------------------
+Tue Jul 24 21:28:59 UTC 2012 - agraf@suse.com
+
+- add support for mx53loco
+
+-------------------------------------------------------------------
+Tue Jul 24 11:25:42 UTC 2012 - dmueller@suse.com
+
+- remove u-boot-omap3beagle
+
+-------------------------------------------------------------------
+Mon Jul 23 22:34:04 UTC 2012 - agraf@suse.com
+
+- bump to 2012.04.01
+ - fixes bug in cmdline parsing
+
+-------------------------------------------------------------------
+Mon Jul 23 22:26:47 UTC 2012 - agraf@suse.com
+
+- add calxeda highbank support
+
+-------------------------------------------------------------------
+Thu Jul 12 12:51:56 UTC 2012 - agraf@suse.com
++++ 139 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-colibrit20iris.changes
--- /work/SRC/openSUSE:Factory/u-boot/u-boot-cubieboard.changes 2014-01-03 19:52:01.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-cubieboard.changes 2014-01-08 20:09:40.000000000 +0100
@@ -1,0 +2,32 @@
+Wed Jan 8 02:07:44 UTC 2014 - afaerber@suse.de
+
+- rpi_b-bootscr.patch: Change rpi_b to use boot.scr
+
+-------------------------------------------------------------------
+Tue Jan 7 16:01:13 UTC 2014 - dmueller@suse.com
+
+- remove origin flavor
+
+-------------------------------------------------------------------
+Mon Jan 6 22:57:05 UTC 2014 - afaerber@suse.de
+
+- Enable paz00 config (Toshiba AC100)
+
+-------------------------------------------------------------------
+Mon Jan 6 21:34:03 UTC 2014 - afaerber@suse.de
+
+- Enable colibri_t20_iris config (Toradex Colibri-T20 on Iris)
+- Update u-boot.spec.in copyright and fix typo in comment
+
+-------------------------------------------------------------------
+Sat Jan 4 01:47:50 UTC 2014 - agraf@suse.com
+
+- prefer u-boot-dtb.bin over u-boot.bin
+- simplify files section
+
+-------------------------------------------------------------------
+Fri Jan 3 16:54:30 UTC 2014 - dmueller@suse.com
+
+- mlo-ext2.patch: Search for files in /boot, not in /boot/boot
+
+-------------------------------------------------------------------
u-boot-highbank.changes: same change
u-boot-hyundaia7hd.changes: same change
u-boot-melea1000.changes: same change
u-boot-mx53loco.changes: same change
u-boot-omap3beagle.changes: same change
u-boot-omap4panda.changes: same change
New Changes file:
--- /dev/null 2013-11-25 01:44:08.036031256 +0100
+++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-paz00.changes 2014-01-08 20:09:40.000000000 +0100
@@ -0,0 +1,336 @@
+-------------------------------------------------------------------
+Wed Jan 8 02:07:44 UTC 2014 - afaerber@suse.de
+
+- rpi_b-bootscr.patch: Change rpi_b to use boot.scr
+
+-------------------------------------------------------------------
+Tue Jan 7 16:01:13 UTC 2014 - dmueller@suse.com
+
+- remove origin flavor
+
+-------------------------------------------------------------------
+Mon Jan 6 22:57:05 UTC 2014 - afaerber@suse.de
+
+- Enable paz00 config (Toshiba AC100)
+
+-------------------------------------------------------------------
+Mon Jan 6 21:34:03 UTC 2014 - afaerber@suse.de
+
+- Enable colibri_t20_iris config (Toradex Colibri-T20 on Iris)
+- Update u-boot.spec.in copyright and fix typo in comment
+
+-------------------------------------------------------------------
+Sat Jan 4 01:47:50 UTC 2014 - agraf@suse.com
+
+- prefer u-boot-dtb.bin over u-boot.bin
+- simplify files section
+
+-------------------------------------------------------------------
+Fri Jan 3 16:54:30 UTC 2014 - dmueller@suse.com
+
+- mlo-ext2.patch: Search for files in /boot, not in /boot/boot
+
+-------------------------------------------------------------------
+Mon Dec 30 18:37:50 UTC 2013 - matwey.kornilov@gmail.com
+
+- Add am335x_evm-bootscr.patch: Add bootscr to AM335x
+ platform based devices
+
+-------------------------------------------------------------------
+Tue Dec 17 14:33:52 UTC 2013 - guillaume@opensuse.org
+
+- Remove old unused patches:
+ * v2013.04-sunxi.patch
+ * loadaddr-defaults.patch
+
+-------------------------------------------------------------------
+Tue Dec 17 14:10:51 UTC 2013 - guillaume@opensuse.org
+
+- Add ti_common_initrd_support.patch to enable initrd support for
+ AM335x boards
+
+-------------------------------------------------------------------
+Tue Dec 17 14:03:50 UTC 2013 - guillaume@opensuse.org
+
+- Add am335x_evm support which includes: Beagle Bone,
+ Beagle Bone Black, TI AM335x EVM, TI AM335x EVM-SK
+
+-------------------------------------------------------------------
+Tue Nov 26 13:46:22 UTC 2013 - guillaume@opensuse.org
+
+- Add Arndale support
+
+-------------------------------------------------------------------
+Tue Nov 26 13:05:10 UTC 2013 - guillaume@opensuse.org
+
+- Update v2013.04-sunxi.patch to v2013.10-sunxi.patch
+
+-------------------------------------------------------------------
+Mon Nov 25 10:05:48 UTC 2013 - guillaume@opensuse.org
+
+- Remove kerneladdr and ramdiskaddr definition in u-boot patches
+ (now done in JeOS image with u-boot hooks)
+- Update patches to current version:
+ * 0006-ARMV7-hardfp-build-fix.patch
+ * beagle-bootscr.patch
+ * mx53loco-bootscr.patch
+ * mlo-ext2.patch
+- Merge fix_omap4_ext2_boot.patch in mlo-ext2.patch
+- Rename exynos-ext2.patch in origen-ext2.patch
+
+-------------------------------------------------------------------
+Mon Nov 25 09:57:12 UTC 2013 - guillaume@opensuse.org
+
+- Update to 2013.10
+
+-------------------------------------------------------------------
+Fri Nov 22 16:25:36 UTC 2013 - guillaume@opensuse.org
+
+- Fix OMAP4 pandaboard EXT2 boot
+
+-------------------------------------------------------------------
+Fri Sep 13 11:31:14 UTC 2013 - guillaume@opensuse.org
+
+- Fix u-boot.bin and boot.scr place since they are now in boot/ folder.
+
+-------------------------------------------------------------------
+Wed May 1 20:48:30 UTC 2013 - dmueller@suse.com
+
+- add support for cubieboard, hyundaia7hd, melea1000
+
+-------------------------------------------------------------------
+Wed May 1 08:18:26 UTC 2013 - dmueller@suse.com
+
+- update to 2013.04
+ * no upstream changelog available
+- remove dead u-boot-raspberrypi* (actually called rpib now)
+- add rpib variant
+
+-------------------------------------------------------------------
+Thu Apr 11 17:05:58 UTC 2013 - guillaume.gardet@opensuse.org
+
+- add omap3_beagle to targets
+
+-------------------------------------------------------------------
+Thu Apr 11 16:05:41 UTC 2013 - dmueller@suse.com
+
+- remove u8500href subpackage, kernel got dropped
+
+-------------------------------------------------------------------
+Sun Apr 7 14:32:20 UTC 2013 - agraf@suse.com
+
+- update to 2013.04rc2
+- enable bootz support on all boards
+
+-------------------------------------------------------------------
+Wed Mar 20 07:21:06 UTC 2013 - agraf@suse.com
+
+- fix mlo-ext2.patch to actually use the ext4 infrastructure
+
+-------------------------------------------------------------------
+Sat Jan 26 10:38:07 UTC 2013 - dmueller@suse.com
+
+- update mlo-ext2.patch:
+ * use the ext4 driver now since ext2 got removed
+
+-------------------------------------------------------------------
+Wed Oct 24 22:33:13 UTC 2012 - agraf@suse.com
+
+- add sdhc-1.patch, sdhc-2.patch, sdhc-3.patch:
+ * backport upstream sdhc fixes
+
+-------------------------------------------------------------------
+Wed Oct 24 01:37:36 CEST 2012 - agraf@suse.de
+
+- update to 2012.10:
+ - refresh patches 0006-ARMV7-hardfp-build-fix.patch, mlo-ext2.patch,
+ loadaddr-defaults.patch, mx53loco-bootscr.patch
+
+-------------------------------------------------------------------
+Mon Oct 22 12:00:22 UTC 2012 - agraf@suse.com
+
+- fix origen by putting the ramdisk higher
+
+-------------------------------------------------------------------
+Mon Aug 6 09:39:54 UTC 2012 - dmueller@suse.com
+
+- remove Marvell sources as they are non-free licensed (bnc#773824)
+
+-------------------------------------------------------------------
+Thu Jul 26 18:21:44 UTC 2012 - agraf@suse.com
+
+- fix ext2 support for origen
+- add origen-spl.bin for origen
+
+-------------------------------------------------------------------
+Thu Jul 26 09:47:31 UTC 2012 - dmueller@suse.com
+
+- merge u-boot-tools
+
+-------------------------------------------------------------------
+Wed Jul 25 21:05:08 UTC 2012 - agraf@suse.com
+
+- add ext2 support by default in mx53loco
+
+-------------------------------------------------------------------
+Tue Jul 24 21:28:59 UTC 2012 - agraf@suse.com
+
+- add support for mx53loco
+
+-------------------------------------------------------------------
+Tue Jul 24 11:25:42 UTC 2012 - dmueller@suse.com
+
+- remove u-boot-omap3beagle
+
+-------------------------------------------------------------------
+Mon Jul 23 22:34:04 UTC 2012 - agraf@suse.com
+
+- bump to 2012.04.01
+ - fixes bug in cmdline parsing
+
+-------------------------------------------------------------------
+Mon Jul 23 22:26:47 UTC 2012 - agraf@suse.com
+
+- add calxeda highbank support
+
+-------------------------------------------------------------------
+Thu Jul 12 12:51:56 UTC 2012 - agraf@suse.com
++++ 139 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-paz00.changes
--- /work/SRC/openSUSE:Factory/u-boot/u-boot-rpib.changes 2014-01-03 19:52:01.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-rpib.changes 2014-01-08 20:09:40.000000000 +0100
@@ -1,0 +2,32 @@
+Wed Jan 8 02:07:44 UTC 2014 - afaerber@suse.de
+
+- rpi_b-bootscr.patch: Change rpi_b to use boot.scr
+
+-------------------------------------------------------------------
+Tue Jan 7 16:01:13 UTC 2014 - dmueller@suse.com
+
+- remove origin flavor
+
+-------------------------------------------------------------------
+Mon Jan 6 22:57:05 UTC 2014 - afaerber@suse.de
+
+- Enable paz00 config (Toshiba AC100)
+
+-------------------------------------------------------------------
+Mon Jan 6 21:34:03 UTC 2014 - afaerber@suse.de
+
+- Enable colibri_t20_iris config (Toradex Colibri-T20 on Iris)
+- Update u-boot.spec.in copyright and fix typo in comment
+
+-------------------------------------------------------------------
+Sat Jan 4 01:47:50 UTC 2014 - agraf@suse.com
+
+- prefer u-boot-dtb.bin over u-boot.bin
+- simplify files section
+
+-------------------------------------------------------------------
+Fri Jan 3 16:54:30 UTC 2014 - dmueller@suse.com
+
+- mlo-ext2.patch: Search for files in /boot, not in /boot/boot
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/u-boot/u-boot.changes 2014-01-03 19:52:01.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot.changes 2014-01-08 20:09:40.000000000 +0100
@@ -1,0 +2,37 @@
+Wed Jan 8 13:41:32 UTC 2014 - matwey.kornilov@gmail.com
+
+- am335x_evm-bootscr.patch: Search for files in /boot, not in /boot/boot
+
+-------------------------------------------------------------------
+Wed Jan 8 02:07:44 UTC 2014 - afaerber@suse.de
+
+- rpi_b-bootscr.patch: Change rpi_b to use boot.scr
+
+-------------------------------------------------------------------
+Tue Jan 7 16:01:13 UTC 2014 - dmueller@suse.com
+
+- remove origin flavor
+
+-------------------------------------------------------------------
+Mon Jan 6 22:57:05 UTC 2014 - afaerber@suse.de
+
+- Enable paz00 config (Toshiba AC100)
+
+-------------------------------------------------------------------
+Mon Jan 6 21:34:03 UTC 2014 - afaerber@suse.de
+
+- Enable colibri_t20_iris config (Toradex Colibri-T20 on Iris)
+- Update u-boot.spec.in copyright and fix typo in comment
+
+-------------------------------------------------------------------
+Sat Jan 4 01:47:50 UTC 2014 - agraf@suse.com
+
+- prefer u-boot-dtb.bin over u-boot.bin
+- simplify files section
+
+-------------------------------------------------------------------
+Fri Jan 3 16:54:30 UTC 2014 - dmueller@suse.com
+
+- mlo-ext2.patch: Search for files in /boot, not in /boot/boot
+
+-------------------------------------------------------------------
Old:
----
u-boot-origen.changes
u-boot-origen.spec
New:
----
rpi_b-bootscr.patch
u-boot-colibrit20iris.changes
u-boot-colibrit20iris.spec
u-boot-paz00.changes
u-boot-paz00.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ u-boot-am335xevm.spec ++++++
--- /var/tmp/diff_new_pack.pTNEXl/_old 2014-01-08 20:09:43.000000000 +0100
+++ /var/tmp/diff_new_pack.pTNEXl/_new 2014-01-08 20:09:43.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package u-boot-am335xevm
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon
# Copyright (c) 2007-2010 by Silvan Calarco
#
@@ -43,6 +43,7 @@
Patch7: arndale.patch
Patch8: v2013.10-sunxi.patch
Patch9: am335x_evm-bootscr.patch
+Patch10: rpi_b-bootscr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Arndale board need DTC >= 1.4
BuildRequires: dtc >= 1.4.0
@@ -80,6 +81,7 @@
%patch7
%patch8 -p1
%patch9 -p1
+%patch10 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" am335x_evm_config
@@ -89,6 +91,13 @@
%install
install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin
+# Some times u-boot needs a dtb to configure itself appended to the binary.
+# In that case prefer the one with a working dtb already appended.
+if [ -f u-boot-dtb.bin ]; then
+ install -D -m 0644 u-boot-dtb.bin %{buildroot}/boot/u-boot.bin
+else
+ install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin
+fi
%if %x_loader == 1
install -D -m 0755 MLO %{buildroot}/boot/MLO
%endif
@@ -105,20 +114,7 @@
%files
%defattr(-,root,root)
-/boot/u-boot.bin
-%if %x_loader == 1
-/boot/MLO
-%endif
-%if %origen_spl == 1
-/boot/origen-spl.bin
-%endif
-%if %arndale_spl == 1
-/boot/arndale-spl.bin
-/boot/arndale-bl1.img
-%endif
-%if %sunxi_spl == 1
-/boot/sunxi-spl.bin
-%endif
+/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%files doc
++++++ u-boot-arndale.spec ++++++
--- /var/tmp/diff_new_pack.pTNEXl/_old 2014-01-08 20:09:43.000000000 +0100
+++ /var/tmp/diff_new_pack.pTNEXl/_new 2014-01-08 20:09:43.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package u-boot-arndale
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon
# Copyright (c) 2007-2010 by Silvan Calarco
#
@@ -43,6 +43,7 @@
Patch7: arndale.patch
Patch8: v2013.10-sunxi.patch
Patch9: am335x_evm-bootscr.patch
+Patch10: rpi_b-bootscr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Arndale board need DTC >= 1.4
BuildRequires: dtc >= 1.4.0
@@ -80,6 +81,7 @@
%patch7
%patch8 -p1
%patch9 -p1
+%patch10 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" arndale_config
@@ -89,6 +91,13 @@
%install
install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin
+# Some times u-boot needs a dtb to configure itself appended to the binary.
+# In that case prefer the one with a working dtb already appended.
+if [ -f u-boot-dtb.bin ]; then
+ install -D -m 0644 u-boot-dtb.bin %{buildroot}/boot/u-boot.bin
+else
+ install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin
+fi
%if %x_loader == 1
install -D -m 0755 MLO %{buildroot}/boot/MLO
%endif
@@ -105,20 +114,7 @@
%files
%defattr(-,root,root)
-/boot/u-boot.bin
-%if %x_loader == 1
-/boot/MLO
-%endif
-%if %origen_spl == 1
-/boot/origen-spl.bin
-%endif
-%if %arndale_spl == 1
-/boot/arndale-spl.bin
-/boot/arndale-bl1.img
-%endif
-%if %sunxi_spl == 1
-/boot/sunxi-spl.bin
-%endif
+/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%files doc
++++++ u-boot-colibrit20iris.spec ++++++
#
# spec file for package u-boot-colibrit20iris
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon
# Copyright (c) 2007-2010 by Silvan Calarco
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define x_loader 0
%define origen_spl 0
%define sunxi_spl 0
%define arndale_spl 0
Name: u-boot-colibrit20iris
Version: 2013.10
Release: 0
Summary: The u-boot firmware for the colibrit20iris arm platform
License: GPL-2.0
Group: System/Boot
Url: http://www.denx.de/wiki/U-Boot
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
Source1: openSUSE_panda.txt
Source2: arndale-bl1.img
Source300: rpmlintrc
Patch1: 0006-ARMV7-hardfp-build-fix.patch
Patch2: mlo-ext2.patch
Patch3: ti_common_initrd_support.patch
Patch4: beagle-bootscr.patch
Patch5: mx53loco-bootscr.patch
Patch6: origen-ext2.patch
Patch7: arndale.patch
Patch8: v2013.10-sunxi.patch
Patch9: am335x_evm-bootscr.patch
Patch10: rpi_b-bootscr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Arndale board need DTC >= 1.4
BuildRequires: dtc >= 1.4.0
Provides: u-boot-loader
Conflicts: otherproviders(u-boot-loader)
%if %x_loader == 1
Obsoletes: x-loader-colibrit20iris
Provides: x-loader-colibrit20iris
%endif
ExclusiveArch: %arm
%description
Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors.
This package contains the firmware for the colibrit20iris arm platform.
%package doc
Summary: Documentation for the u-boot Firmware
Group: Documentation/Other
%description doc
Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors.
This package contains documentation for u-boot firmware
%prep
%setup -q -n u-boot-%{version}
# 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
%patch2
%patch3
%patch4
%patch5
%patch6
%patch7
%patch8 -p1
%patch9 -p1
%patch10 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" colibri_t20_iris_config
# temporary disable of --build-id
#make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes
%install
install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin
# Some times u-boot needs a dtb to configure itself appended to the binary.
# In that case prefer the one with a working dtb already appended.
if [ -f u-boot-dtb.bin ]; then
install -D -m 0644 u-boot-dtb.bin %{buildroot}/boot/u-boot.bin
else
install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin
fi
%if %x_loader == 1
install -D -m 0755 MLO %{buildroot}/boot/MLO
%endif
%if %origen_spl == 1
install -D -m 0755 spl/origen-spl.bin %{buildroot}/boot/origen-spl.bin
%endif
%if %arndale_spl == 1
install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin
install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img
%endif
%if %sunxi_spl == 1
install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin
%endif
%files
%defattr(-,root,root)
/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%files doc
%defattr(-,root,root)
# Generic documents
%doc doc/README.JFFS2 doc/README.JFFS2_NAND doc/README.commands
%doc doc/README.autoboot doc/README.commands doc/README.console doc/README.dns
%doc doc/README.hwconfig doc/README.nand doc/README.NetConsole doc/README.serial_multi
%doc doc/README.SNTP doc/README.standalone doc/README.update doc/README.usb
%doc doc/README.video doc/README.VLAN doc/README.silent doc/README.POST doc/README.Modem
# Copy some useful kermit scripts as well
%doc tools/scripts/dot.kermrc tools/scripts/flash_param tools/scripts/send_cmd tools/scripts/send_image
# Now any h/w dependent Documentation
%doc doc/README.ARM-SoC doc/README.ARM-memory-map
%changelog
++++++ u-boot-cubieboard.spec ++++++
--- /var/tmp/diff_new_pack.pTNEXl/_old 2014-01-08 20:09:43.000000000 +0100
+++ /var/tmp/diff_new_pack.pTNEXl/_new 2014-01-08 20:09:43.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package u-boot-cubieboard
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon
# Copyright (c) 2007-2010 by Silvan Calarco
#
@@ -43,6 +43,7 @@
Patch7: arndale.patch
Patch8: v2013.10-sunxi.patch
Patch9: am335x_evm-bootscr.patch
+Patch10: rpi_b-bootscr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Arndale board need DTC >= 1.4
BuildRequires: dtc >= 1.4.0
@@ -80,6 +81,7 @@
%patch7
%patch8 -p1
%patch9 -p1
+%patch10 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" cubieboard_config
@@ -89,6 +91,13 @@
%install
install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin
+# Some times u-boot needs a dtb to configure itself appended to the binary.
+# In that case prefer the one with a working dtb already appended.
+if [ -f u-boot-dtb.bin ]; then
+ install -D -m 0644 u-boot-dtb.bin %{buildroot}/boot/u-boot.bin
+else
+ install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin
+fi
%if %x_loader == 1
install -D -m 0755 MLO %{buildroot}/boot/MLO
%endif
@@ -105,20 +114,7 @@
%files
%defattr(-,root,root)
-/boot/u-boot.bin
-%if %x_loader == 1
-/boot/MLO
-%endif
-%if %origen_spl == 1
-/boot/origen-spl.bin
-%endif
-%if %arndale_spl == 1
-/boot/arndale-spl.bin
-/boot/arndale-bl1.img
-%endif
-%if %sunxi_spl == 1
-/boot/sunxi-spl.bin
-%endif
+/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%files doc
++++++ u-boot-highbank.spec ++++++
--- /var/tmp/diff_new_pack.pTNEXl/_old 2014-01-08 20:09:43.000000000 +0100
+++ /var/tmp/diff_new_pack.pTNEXl/_new 2014-01-08 20:09:43.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package u-boot-highbank
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon
# Copyright (c) 2007-2010 by Silvan Calarco
#
@@ -43,6 +43,7 @@
Patch7: arndale.patch
Patch8: v2013.10-sunxi.patch
Patch9: am335x_evm-bootscr.patch
+Patch10: rpi_b-bootscr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Arndale board need DTC >= 1.4
BuildRequires: dtc >= 1.4.0
@@ -80,6 +81,7 @@
%patch7
%patch8 -p1
%patch9 -p1
+%patch10 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" highbank_config
@@ -89,6 +91,13 @@
%install
install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin
+# Some times u-boot needs a dtb to configure itself appended to the binary.
+# In that case prefer the one with a working dtb already appended.
+if [ -f u-boot-dtb.bin ]; then
+ install -D -m 0644 u-boot-dtb.bin %{buildroot}/boot/u-boot.bin
+else
+ install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin
+fi
%if %x_loader == 1
install -D -m 0755 MLO %{buildroot}/boot/MLO
%endif
@@ -105,20 +114,7 @@
%files
%defattr(-,root,root)
-/boot/u-boot.bin
-%if %x_loader == 1
-/boot/MLO
-%endif
-%if %origen_spl == 1
-/boot/origen-spl.bin
-%endif
-%if %arndale_spl == 1
-/boot/arndale-spl.bin
-/boot/arndale-bl1.img
-%endif
-%if %sunxi_spl == 1
-/boot/sunxi-spl.bin
-%endif
+/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%files doc
++++++ u-boot-hyundaia7hd.spec ++++++
--- /var/tmp/diff_new_pack.pTNEXl/_old 2014-01-08 20:09:43.000000000 +0100
+++ /var/tmp/diff_new_pack.pTNEXl/_new 2014-01-08 20:09:43.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package u-boot-hyundaia7hd
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon
# Copyright (c) 2007-2010 by Silvan Calarco
#
@@ -43,6 +43,7 @@
Patch7: arndale.patch
Patch8: v2013.10-sunxi.patch
Patch9: am335x_evm-bootscr.patch
+Patch10: rpi_b-bootscr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Arndale board need DTC >= 1.4
BuildRequires: dtc >= 1.4.0
@@ -80,6 +81,7 @@
%patch7
%patch8 -p1
%patch9 -p1
+%patch10 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" hyundai_a7hd_config
@@ -89,6 +91,13 @@
%install
install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin
+# Some times u-boot needs a dtb to configure itself appended to the binary.
+# In that case prefer the one with a working dtb already appended.
+if [ -f u-boot-dtb.bin ]; then
+ install -D -m 0644 u-boot-dtb.bin %{buildroot}/boot/u-boot.bin
+else
+ install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin
+fi
%if %x_loader == 1
install -D -m 0755 MLO %{buildroot}/boot/MLO
%endif
@@ -105,20 +114,7 @@
%files
%defattr(-,root,root)
-/boot/u-boot.bin
-%if %x_loader == 1
-/boot/MLO
-%endif
-%if %origen_spl == 1
-/boot/origen-spl.bin
-%endif
-%if %arndale_spl == 1
-/boot/arndale-spl.bin
-/boot/arndale-bl1.img
-%endif
-%if %sunxi_spl == 1
-/boot/sunxi-spl.bin
-%endif
+/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%files doc
++++++ u-boot-melea1000.spec ++++++
--- /var/tmp/diff_new_pack.pTNEXl/_old 2014-01-08 20:09:43.000000000 +0100
+++ /var/tmp/diff_new_pack.pTNEXl/_new 2014-01-08 20:09:43.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package u-boot-melea1000
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon
# Copyright (c) 2007-2010 by Silvan Calarco
#
@@ -43,6 +43,7 @@
Patch7: arndale.patch
Patch8: v2013.10-sunxi.patch
Patch9: am335x_evm-bootscr.patch
+Patch10: rpi_b-bootscr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Arndale board need DTC >= 1.4
BuildRequires: dtc >= 1.4.0
@@ -80,6 +81,7 @@
%patch7
%patch8 -p1
%patch9 -p1
+%patch10 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" mele_a1000_config
@@ -89,6 +91,13 @@
%install
install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin
+# Some times u-boot needs a dtb to configure itself appended to the binary.
+# In that case prefer the one with a working dtb already appended.
+if [ -f u-boot-dtb.bin ]; then
+ install -D -m 0644 u-boot-dtb.bin %{buildroot}/boot/u-boot.bin
+else
+ install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin
+fi
%if %x_loader == 1
install -D -m 0755 MLO %{buildroot}/boot/MLO
%endif
@@ -105,20 +114,7 @@
%files
%defattr(-,root,root)
-/boot/u-boot.bin
-%if %x_loader == 1
-/boot/MLO
-%endif
-%if %origen_spl == 1
-/boot/origen-spl.bin
-%endif
-%if %arndale_spl == 1
-/boot/arndale-spl.bin
-/boot/arndale-bl1.img
-%endif
-%if %sunxi_spl == 1
-/boot/sunxi-spl.bin
-%endif
+/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%files doc
++++++ u-boot-mx53loco.spec ++++++
--- /var/tmp/diff_new_pack.pTNEXl/_old 2014-01-08 20:09:43.000000000 +0100
+++ /var/tmp/diff_new_pack.pTNEXl/_new 2014-01-08 20:09:43.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package u-boot-mx53loco
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon
# Copyright (c) 2007-2010 by Silvan Calarco
#
@@ -43,6 +43,7 @@
Patch7: arndale.patch
Patch8: v2013.10-sunxi.patch
Patch9: am335x_evm-bootscr.patch
+Patch10: rpi_b-bootscr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Arndale board need DTC >= 1.4
BuildRequires: dtc >= 1.4.0
@@ -80,6 +81,7 @@
%patch7
%patch8 -p1
%patch9 -p1
+%patch10 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" mx53loco_config
@@ -89,6 +91,13 @@
%install
install -D -m 0644 u-boot.imx %{buildroot}/boot/u-boot.imx
+# Some times u-boot needs a dtb to configure itself appended to the binary.
+# In that case prefer the one with a working dtb already appended.
+if [ -f u-boot-dtb.imx ]; then
+ install -D -m 0644 u-boot-dtb.imx %{buildroot}/boot/u-boot.imx
+else
+ install -D -m 0644 u-boot.imx %{buildroot}/boot/u-boot.imx
+fi
%if %x_loader == 1
install -D -m 0755 MLO %{buildroot}/boot/MLO
%endif
@@ -105,20 +114,7 @@
%files
%defattr(-,root,root)
-/boot/u-boot.imx
-%if %x_loader == 1
-/boot/MLO
-%endif
-%if %origen_spl == 1
-/boot/origen-spl.bin
-%endif
-%if %arndale_spl == 1
-/boot/arndale-spl.bin
-/boot/arndale-bl1.img
-%endif
-%if %sunxi_spl == 1
-/boot/sunxi-spl.bin
-%endif
+/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%files doc
++++++ u-boot-omap3beagle.spec ++++++
--- /var/tmp/diff_new_pack.pTNEXl/_old 2014-01-08 20:09:43.000000000 +0100
+++ /var/tmp/diff_new_pack.pTNEXl/_new 2014-01-08 20:09:43.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package u-boot-omap3beagle
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon
# Copyright (c) 2007-2010 by Silvan Calarco
#
@@ -43,6 +43,7 @@
Patch7: arndale.patch
Patch8: v2013.10-sunxi.patch
Patch9: am335x_evm-bootscr.patch
+Patch10: rpi_b-bootscr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Arndale board need DTC >= 1.4
BuildRequires: dtc >= 1.4.0
@@ -80,6 +81,7 @@
%patch7
%patch8 -p1
%patch9 -p1
+%patch10 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" omap3_beagle_config
@@ -89,6 +91,13 @@
%install
install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin
+# Some times u-boot needs a dtb to configure itself appended to the binary.
+# In that case prefer the one with a working dtb already appended.
+if [ -f u-boot-dtb.bin ]; then
+ install -D -m 0644 u-boot-dtb.bin %{buildroot}/boot/u-boot.bin
+else
+ install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin
+fi
%if %x_loader == 1
install -D -m 0755 MLO %{buildroot}/boot/MLO
%endif
@@ -105,20 +114,7 @@
%files
%defattr(-,root,root)
-/boot/u-boot.bin
-%if %x_loader == 1
-/boot/MLO
-%endif
-%if %origen_spl == 1
-/boot/origen-spl.bin
-%endif
-%if %arndale_spl == 1
-/boot/arndale-spl.bin
-/boot/arndale-bl1.img
-%endif
-%if %sunxi_spl == 1
-/boot/sunxi-spl.bin
-%endif
+/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%files doc
++++++ u-boot-omap4panda.spec ++++++
--- /var/tmp/diff_new_pack.pTNEXl/_old 2014-01-08 20:09:43.000000000 +0100
+++ /var/tmp/diff_new_pack.pTNEXl/_new 2014-01-08 20:09:43.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package u-boot-omap4panda
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon
# Copyright (c) 2007-2010 by Silvan Calarco
#
@@ -43,6 +43,7 @@
Patch7: arndale.patch
Patch8: v2013.10-sunxi.patch
Patch9: am335x_evm-bootscr.patch
+Patch10: rpi_b-bootscr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Arndale board need DTC >= 1.4
BuildRequires: dtc >= 1.4.0
@@ -80,6 +81,7 @@
%patch7
%patch8 -p1
%patch9 -p1
+%patch10 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" omap4_panda_config
@@ -89,6 +91,13 @@
%install
install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin
+# Some times u-boot needs a dtb to configure itself appended to the binary.
+# In that case prefer the one with a working dtb already appended.
+if [ -f u-boot-dtb.bin ]; then
+ install -D -m 0644 u-boot-dtb.bin %{buildroot}/boot/u-boot.bin
+else
+ install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin
+fi
%if %x_loader == 1
install -D -m 0755 MLO %{buildroot}/boot/MLO
%endif
@@ -105,20 +114,7 @@
%files
%defattr(-,root,root)
-/boot/u-boot.bin
-%if %x_loader == 1
-/boot/MLO
-%endif
-%if %origen_spl == 1
-/boot/origen-spl.bin
-%endif
-%if %arndale_spl == 1
-/boot/arndale-spl.bin
-/boot/arndale-bl1.img
-%endif
-%if %sunxi_spl == 1
-/boot/sunxi-spl.bin
-%endif
+/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%files doc
++++++ u-boot-paz00.spec ++++++
#
# spec file for package u-boot-paz00
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon
# Copyright (c) 2007-2010 by Silvan Calarco
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define x_loader 0
%define origen_spl 0
%define sunxi_spl 0
%define arndale_spl 0
Name: u-boot-paz00
Version: 2013.10
Release: 0
Summary: The u-boot firmware for the paz00 arm platform
License: GPL-2.0
Group: System/Boot
Url: http://www.denx.de/wiki/U-Boot
Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
Source1: openSUSE_panda.txt
Source2: arndale-bl1.img
Source300: rpmlintrc
Patch1: 0006-ARMV7-hardfp-build-fix.patch
Patch2: mlo-ext2.patch
Patch3: ti_common_initrd_support.patch
Patch4: beagle-bootscr.patch
Patch5: mx53loco-bootscr.patch
Patch6: origen-ext2.patch
Patch7: arndale.patch
Patch8: v2013.10-sunxi.patch
Patch9: am335x_evm-bootscr.patch
Patch10: rpi_b-bootscr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Arndale board need DTC >= 1.4
BuildRequires: dtc >= 1.4.0
Provides: u-boot-loader
Conflicts: otherproviders(u-boot-loader)
%if %x_loader == 1
Obsoletes: x-loader-paz00
Provides: x-loader-paz00
%endif
ExclusiveArch: %arm
%description
Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors.
This package contains the firmware for the paz00 arm platform.
%package doc
Summary: Documentation for the u-boot Firmware
Group: Documentation/Other
%description doc
Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors.
This package contains documentation for u-boot firmware
%prep
%setup -q -n u-boot-%{version}
# 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
%patch2
%patch3
%patch4
%patch5
%patch6
%patch7
%patch8 -p1
%patch9 -p1
%patch10 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" paz00_config
# temporary disable of --build-id
#make CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
make %{?jobs:-j %jobs} USE_PRIVATE_LIBGG=yes
%install
install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin
# Some times u-boot needs a dtb to configure itself appended to the binary.
# In that case prefer the one with a working dtb already appended.
if [ -f u-boot-dtb.bin ]; then
install -D -m 0644 u-boot-dtb.bin %{buildroot}/boot/u-boot.bin
else
install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin
fi
%if %x_loader == 1
install -D -m 0755 MLO %{buildroot}/boot/MLO
%endif
%if %origen_spl == 1
install -D -m 0755 spl/origen-spl.bin %{buildroot}/boot/origen-spl.bin
%endif
%if %arndale_spl == 1
install -D -m 0755 spl/arndale-spl.bin %{buildroot}/boot/arndale-spl.bin
install -D -m 0755 %{SOURCE2} %{buildroot}/boot/arndale-bl1.img
%endif
%if %sunxi_spl == 1
install -D -m 0755 spl/sunxi-spl.bin %{buildroot}/boot/sunxi-spl.bin
%endif
%files
%defattr(-,root,root)
/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%files doc
%defattr(-,root,root)
# Generic documents
%doc doc/README.JFFS2 doc/README.JFFS2_NAND doc/README.commands
%doc doc/README.autoboot doc/README.commands doc/README.console doc/README.dns
%doc doc/README.hwconfig doc/README.nand doc/README.NetConsole doc/README.serial_multi
%doc doc/README.SNTP doc/README.standalone doc/README.update doc/README.usb
%doc doc/README.video doc/README.VLAN doc/README.silent doc/README.POST doc/README.Modem
# Copy some useful kermit scripts as well
%doc tools/scripts/dot.kermrc tools/scripts/flash_param tools/scripts/send_cmd tools/scripts/send_image
# Now any h/w dependent Documentation
%doc doc/README.ARM-SoC doc/README.ARM-memory-map
%changelog
++++++ u-boot-rpib.spec ++++++
--- /var/tmp/diff_new_pack.pTNEXl/_old 2014-01-08 20:09:43.000000000 +0100
+++ /var/tmp/diff_new_pack.pTNEXl/_new 2014-01-08 20:09:43.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package u-boot-rpib
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon
# Copyright (c) 2007-2010 by Silvan Calarco
#
@@ -43,6 +43,7 @@
Patch7: arndale.patch
Patch8: v2013.10-sunxi.patch
Patch9: am335x_evm-bootscr.patch
+Patch10: rpi_b-bootscr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Arndale board need DTC >= 1.4
BuildRequires: dtc >= 1.4.0
@@ -80,6 +81,7 @@
%patch7
%patch8 -p1
%patch9 -p1
+%patch10 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" rpi_b_config
@@ -89,6 +91,13 @@
%install
install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin
+# Some times u-boot needs a dtb to configure itself appended to the binary.
+# In that case prefer the one with a working dtb already appended.
+if [ -f u-boot-dtb.bin ]; then
+ install -D -m 0644 u-boot-dtb.bin %{buildroot}/boot/u-boot.bin
+else
+ install -D -m 0644 u-boot.bin %{buildroot}/boot/u-boot.bin
+fi
%if %x_loader == 1
install -D -m 0755 MLO %{buildroot}/boot/MLO
%endif
@@ -105,20 +114,7 @@
%files
%defattr(-,root,root)
-/boot/u-boot.bin
-%if %x_loader == 1
-/boot/MLO
-%endif
-%if %origen_spl == 1
-/boot/origen-spl.bin
-%endif
-%if %arndale_spl == 1
-/boot/arndale-spl.bin
-/boot/arndale-bl1.img
-%endif
-%if %sunxi_spl == 1
-/boot/sunxi-spl.bin
-%endif
+/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%files doc
++++++ u-boot.spec ++++++
--- /var/tmp/diff_new_pack.pTNEXl/_old 2014-01-08 20:09:43.000000000 +0100
+++ /var/tmp/diff_new_pack.pTNEXl/_new 2014-01-08 20:09:43.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package u-boot
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon
# Copyright (c) 2007-2010 by Silvan Calarco
#
++++++ am335x_evm-bootscr.patch ++++++
--- /var/tmp/diff_new_pack.pTNEXl/_old 2014-01-08 20:09:43.000000000 +0100
+++ /var/tmp/diff_new_pack.pTNEXl/_new 2014-01-08 20:09:43.000000000 +0100
@@ -6,7 +6,7 @@
"nfsroot=${serverip}:${rootpath},${nfsopts} rw " \
"ip=dhcp\0" \
"bootenv=uEnv.txt\0" \
-+ "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot/boot.scr\0" \
++ "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
+ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
+ "source ${loadaddr}\0" \
"loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
++++++ mlo-ext2.patch ++++++
--- /var/tmp/diff_new_pack.pTNEXl/_old 2014-01-08 20:09:43.000000000 +0100
+++ /var/tmp/diff_new_pack.pTNEXl/_new 2014-01-08 20:09:43.000000000 +0100
@@ -100,7 +100,7 @@
#endif
- err = mmc_load_image_fat(mmc, CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME);
+// err = mmc_load_image_fat(mmc, CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME);
-+ err = mmc_load_image_ext2(mmc, "boot/u-boot.bin"); /* We use u-boot.bin file in /boot/ folder */
++ err = mmc_load_image_ext2(mmc, "u-boot.bin"); /* We use u-boot.bin file on first partition */
#endif
} else {
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
@@ -138,7 +138,7 @@
"root=${mmcroot} " \
"rootfstype=${mmcrootfstype}\0" \
- "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
-+ "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot/boot.scr\0" \
++ "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
"source ${loadaddr}\0" \
- "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
++++++ pre_checkin.sh ++++++
--- /var/tmp/diff_new_pack.pTNEXl/_old 2014-01-08 20:09:43.000000000 +0100
+++ /var/tmp/diff_new_pack.pTNEXl/_new 2014-01-08 20:09:43.000000000 +0100
@@ -4,7 +4,7 @@
BOARDCONFIG="$2"
if [ ! "$1" -o ! "$2" ]; then
- for BOARDCONFIG in omap3_beagle omap4_panda am335x_evm origen arndale highbank mx53loco rpi_b cubieboard hyundai_a7hd mele_a1000; do
+ for BOARDCONFIG in omap3_beagle omap4_panda am335x_evm arndale highbank mx53loco rpi_b cubieboard hyundai_a7hd mele_a1000 colibri_t20_iris paz00; do
BOARDNAME="$(echo $BOARDCONFIG | tr -d '_')"
BOARDCONFIG=${BOARDCONFIG}_config
bash $0 $BOARDNAME $BOARDCONFIG
@@ -20,8 +20,6 @@
mx*|efika*) BINEND=imx ;;
*omap*|*am335x*) BINEND=bin
XLOADER=1 ;;
-*origen*) BINEND=bin
- ORIGEN_SPL=1 ;;
*arndale*) BINEND=bin
ARNDALE_SPL=1 ;;
*cubieboard*) BINEND=bin
++++++ rpi_b-bootscr.patch ++++++
Index: u-boot-2013.10/include/configs/rpi_b.h
===================================================================
--- u-boot-2013.10.orig/include/configs/rpi_b.h
+++ u-boot-2013.10/include/configs/rpi_b.h
@@ -131,7 +131,7 @@
\
"script_boot=" \
"if fatload ${devtype} ${devnum}:1 " \
- "${scriptaddr} boot.scr.uimg; then " \
+ "${scriptaddr} boot.scr; then " \
"source ${scriptaddr}; " \
"fi;\0" \
\
++++++ u-boot.spec.in ++++++
--- /var/tmp/diff_new_pack.pTNEXl/_old 2014-01-08 20:09:44.000000000 +0100
+++ /var/tmp/diff_new_pack.pTNEXl/_new 2014-01-08 20:09:44.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package u-boot-BOARDNAME
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon
# Copyright (c) 2007-2010 by Silvan Calarco
#
@@ -43,6 +43,7 @@
Patch7: arndale.patch
Patch8: v2013.10-sunxi.patch
Patch9: am335x_evm-bootscr.patch
+Patch10: rpi_b-bootscr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Arndale board need DTC >= 1.4
BuildRequires: dtc >= 1.4.0
@@ -80,6 +81,7 @@
%patch7
%patch8 -p1
%patch9 -p1
+%patch10 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" BOARDCONFIG
@@ -89,6 +91,13 @@
%install
install -D -m 0644 u-boot.BINEND %{buildroot}/boot/u-boot.BINEND
+# Some times u-boot needs a dtb to configure itself appended to the binary.
+# In that case prefer the one with a working dtb already appended.
+if [ -f u-boot-dtb.BINEND ]; then
+ install -D -m 0644 u-boot-dtb.BINEND %{buildroot}/boot/u-boot.BINEND
+else
+ install -D -m 0644 u-boot.BINEND %{buildroot}/boot/u-boot.BINEND
+fi
%if %x_loader == 1
install -D -m 0755 MLO %{buildroot}/boot/MLO
%endif
@@ -105,20 +114,7 @@
%files
%defattr(-,root,root)
-/boot/u-boot.BINEND
-%if %x_loader == 1
-/boot/MLO
-%endif
-%if %origen_spl == 1
-/boot/origen-spl.bin
-%endif
-%if %arndale_spl == 1
-/boot/arndale-spl.bin
-/boot/arndale-bl1.img
-%endif
-%if %sunxi_spl == 1
-/boot/sunxi-spl.bin
-%endif
+/boot/*
%doc Licenses/gpl-2.0.txt CREDITS README
%files doc
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org