Hello community,
here is the log from the commit of package u-boot for openSUSE:Factory checked in at 2013-12-22 19:38:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/u-boot (Old)
and /work/SRC/openSUSE:Factory/.u-boot.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "u-boot"
Changes:
--------
New Changes file:
--- /dev/null 2013-11-25 01:44:08.036031256 +0100
+++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-am335xevm.changes 2013-12-22 19:38:13.000000000 +0100
@@ -0,0 +1,298 @@
+-------------------------------------------------------------------
+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
+
+- autoload boot.scr on beagle, so we can boot again
+
+-------------------------------------------------------------------
+Thu Jul 12 08:12:15 UTC 2012 - agraf@suse.com
+
+- update to upstream u-boot 2012.04
+ -> gets rid of linaro fork, only mainline now
+ -> gets us omap3 MLO support, no more need for x-loader
+ -> potentially fixes voltage issues on omap4
+
+-------------------------------------------------------------------
+Thu Jun 14 09:04:53 UTC 2012 - adrian@suse.de
+
+- add SUSE style conflicts to avoid installation of multiple
+ boot loaders
+
+-------------------------------------------------------------------
+Tue Apr 17 11:59:55 UTC 2012 - joop.boonen@opensuse.org
+
+- Included u-boot.spec.in and gen_spec.sh in the spec file
+
+-------------------------------------------------------------------
+Mon Feb 6 13:25:09 UTC 2012 - agraf@suse.com
+
+- use ext2 on panda
+
+-------------------------------------------------------------------
+Tue Dec 20 02:36:05 UTC 2011 - agraf@suse.com
+
+- use ttyO2 as default console= on OMAP boards
+
+-------------------------------------------------------------------
+Mon Dec 19 20:21:21 UTC 2011 - agraf@suse.com
+
+- add u8500_href and origen configs
+
+-------------------------------------------------------------------
++++ 101 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-am335xevm.changes
New Changes file:
u-boot-arndale.changes: same change
--- /work/SRC/openSUSE:Factory/u-boot/u-boot-cubieboard.changes 2013-09-14 20:31:36.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-cubieboard.changes 2013-12-22 19:38:13.000000000 +0100
@@ -1,0 +2,52 @@
+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
+
+-------------------------------------------------------------------
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
u-boot-origen.changes: same change
u-boot-rpib.changes: same change
u-boot.changes: same change
Old:
----
exynos-ext2.patch
loadaddr-defaults.patch
u-boot-2013.04.tar.bz2
v2013.04-sunxi.patch
New:
----
arndale-bl1.img
arndale.patch
origen-ext2.patch
ti_common_initrd_support.patch
u-boot-2013.10.tar.bz2
u-boot-am335xevm.changes
u-boot-am335xevm.spec
u-boot-arndale.changes
u-boot-arndale.spec
v2013.10-sunxi.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ u-boot-am335xevm.spec ++++++
#
# spec file for package u-boot-am335xevm
#
# Copyright (c) 2013 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 1
%define origen_spl 0
%define sunxi_spl 0
%define arndale_spl 0
Name: u-boot-am335xevm
Version: 2013.10
Release: 0
Summary: The u-boot firmware for the am335xevm 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
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-am335xevm
Provides: x-loader-am335xevm
%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 am335xevm 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
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" am335x_evm_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
%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/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
%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-arndale.spec ++++++
#
# spec file for package u-boot-arndale
#
# Copyright (c) 2013 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 1
Name: u-boot-arndale
Version: 2013.10
Release: 0
Summary: The u-boot firmware for the arndale 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
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-arndale
Provides: x-loader-arndale
%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 arndale 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
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" arndale_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
%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/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
%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.0FdSCq/_old 2013-12-22 19:38:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0FdSCq/_new 2013-12-22 19:38:17.000000000 +0100
@@ -21,9 +21,10 @@
%define x_loader 0
%define origen_spl 0
%define sunxi_spl 1
+%define arndale_spl 0
Name: u-boot-cubieboard
-Version: 2013.04
+Version: 2013.10
Release: 0
Summary: The u-boot firmware for the cubieboard arm platform
License: GPL-2.0
@@ -31,15 +32,19 @@
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: loadaddr-defaults.patch
+Patch3: ti_common_initrd_support.patch
Patch4: beagle-bootscr.patch
Patch5: mx53loco-bootscr.patch
-Patch6: exynos-ext2.patch
-Patch7: v2013.04-sunxi.patch
+Patch6: origen-ext2.patch
+Patch7: arndale.patch
+Patch8: v2013.10-sunxi.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
@@ -65,13 +70,14 @@
# 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 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%patch1
+%patch2
+%patch3
+%patch4
+%patch5
+%patch6
%patch7
+%patch8 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" cubieboard_config
@@ -87,13 +93,14 @@
%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
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root)
/boot/u-boot.bin
@@ -103,10 +110,14 @@
%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
-%doc COPYING CREDITS README
+%doc Licenses/gpl-2.0.txt CREDITS README
%files doc
%defattr(-,root,root)
++++++ u-boot-highbank.spec ++++++
--- /var/tmp/diff_new_pack.0FdSCq/_old 2013-12-22 19:38:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0FdSCq/_new 2013-12-22 19:38:17.000000000 +0100
@@ -21,9 +21,10 @@
%define x_loader 0
%define origen_spl 0
%define sunxi_spl 0
+%define arndale_spl 0
Name: u-boot-highbank
-Version: 2013.04
+Version: 2013.10
Release: 0
Summary: The u-boot firmware for the highbank arm platform
License: GPL-2.0
@@ -31,15 +32,19 @@
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: loadaddr-defaults.patch
+Patch3: ti_common_initrd_support.patch
Patch4: beagle-bootscr.patch
Patch5: mx53loco-bootscr.patch
-Patch6: exynos-ext2.patch
-Patch7: v2013.04-sunxi.patch
+Patch6: origen-ext2.patch
+Patch7: arndale.patch
+Patch8: v2013.10-sunxi.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
@@ -65,13 +70,14 @@
# 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 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%patch1
+%patch2
+%patch3
+%patch4
+%patch5
+%patch6
%patch7
+%patch8 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" highbank_config
@@ -87,13 +93,14 @@
%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
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root)
/boot/u-boot.bin
@@ -103,10 +110,14 @@
%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
-%doc COPYING CREDITS README
+%doc Licenses/gpl-2.0.txt CREDITS README
%files doc
%defattr(-,root,root)
++++++ u-boot-hyundaia7hd.spec ++++++
--- /var/tmp/diff_new_pack.0FdSCq/_old 2013-12-22 19:38:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0FdSCq/_new 2013-12-22 19:38:17.000000000 +0100
@@ -21,9 +21,10 @@
%define x_loader 0
%define origen_spl 0
%define sunxi_spl 1
+%define arndale_spl 0
Name: u-boot-hyundaia7hd
-Version: 2013.04
+Version: 2013.10
Release: 0
Summary: The u-boot firmware for the hyundaia7hd arm platform
License: GPL-2.0
@@ -31,15 +32,19 @@
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: loadaddr-defaults.patch
+Patch3: ti_common_initrd_support.patch
Patch4: beagle-bootscr.patch
Patch5: mx53loco-bootscr.patch
-Patch6: exynos-ext2.patch
-Patch7: v2013.04-sunxi.patch
+Patch6: origen-ext2.patch
+Patch7: arndale.patch
+Patch8: v2013.10-sunxi.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
@@ -65,13 +70,14 @@
# 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 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%patch1
+%patch2
+%patch3
+%patch4
+%patch5
+%patch6
%patch7
+%patch8 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" hyundai_a7hd_config
@@ -87,13 +93,14 @@
%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
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root)
/boot/u-boot.bin
@@ -103,10 +110,14 @@
%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
-%doc COPYING CREDITS README
+%doc Licenses/gpl-2.0.txt CREDITS README
%files doc
%defattr(-,root,root)
++++++ u-boot-melea1000.spec ++++++
--- /var/tmp/diff_new_pack.0FdSCq/_old 2013-12-22 19:38:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0FdSCq/_new 2013-12-22 19:38:17.000000000 +0100
@@ -21,9 +21,10 @@
%define x_loader 0
%define origen_spl 0
%define sunxi_spl 1
+%define arndale_spl 0
Name: u-boot-melea1000
-Version: 2013.04
+Version: 2013.10
Release: 0
Summary: The u-boot firmware for the melea1000 arm platform
License: GPL-2.0
@@ -31,15 +32,19 @@
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: loadaddr-defaults.patch
+Patch3: ti_common_initrd_support.patch
Patch4: beagle-bootscr.patch
Patch5: mx53loco-bootscr.patch
-Patch6: exynos-ext2.patch
-Patch7: v2013.04-sunxi.patch
+Patch6: origen-ext2.patch
+Patch7: arndale.patch
+Patch8: v2013.10-sunxi.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
@@ -65,13 +70,14 @@
# 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 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%patch1
+%patch2
+%patch3
+%patch4
+%patch5
+%patch6
%patch7
+%patch8 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" mele_a1000_config
@@ -87,13 +93,14 @@
%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
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root)
/boot/u-boot.bin
@@ -103,10 +110,14 @@
%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
-%doc COPYING CREDITS README
+%doc Licenses/gpl-2.0.txt CREDITS README
%files doc
%defattr(-,root,root)
++++++ u-boot-mx53loco.spec ++++++
--- /var/tmp/diff_new_pack.0FdSCq/_old 2013-12-22 19:38:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0FdSCq/_new 2013-12-22 19:38:17.000000000 +0100
@@ -21,9 +21,10 @@
%define x_loader 0
%define origen_spl 0
%define sunxi_spl 0
+%define arndale_spl 0
Name: u-boot-mx53loco
-Version: 2013.04
+Version: 2013.10
Release: 0
Summary: The u-boot firmware for the mx53loco arm platform
License: GPL-2.0
@@ -31,15 +32,19 @@
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: loadaddr-defaults.patch
+Patch3: ti_common_initrd_support.patch
Patch4: beagle-bootscr.patch
Patch5: mx53loco-bootscr.patch
-Patch6: exynos-ext2.patch
-Patch7: v2013.04-sunxi.patch
+Patch6: origen-ext2.patch
+Patch7: arndale.patch
+Patch8: v2013.10-sunxi.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
@@ -65,13 +70,14 @@
# 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 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%patch1
+%patch2
+%patch3
+%patch4
+%patch5
+%patch6
%patch7
+%patch8 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" mx53loco_config
@@ -87,13 +93,14 @@
%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
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root)
/boot/u-boot.imx
@@ -103,10 +110,14 @@
%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
-%doc COPYING CREDITS README
+%doc Licenses/gpl-2.0.txt CREDITS README
%files doc
%defattr(-,root,root)
++++++ u-boot-omap3beagle.spec ++++++
--- /var/tmp/diff_new_pack.0FdSCq/_old 2013-12-22 19:38:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0FdSCq/_new 2013-12-22 19:38:17.000000000 +0100
@@ -21,9 +21,10 @@
%define x_loader 1
%define origen_spl 0
%define sunxi_spl 0
+%define arndale_spl 0
Name: u-boot-omap3beagle
-Version: 2013.04
+Version: 2013.10
Release: 0
Summary: The u-boot firmware for the omap3beagle arm platform
License: GPL-2.0
@@ -31,15 +32,19 @@
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: loadaddr-defaults.patch
+Patch3: ti_common_initrd_support.patch
Patch4: beagle-bootscr.patch
Patch5: mx53loco-bootscr.patch
-Patch6: exynos-ext2.patch
-Patch7: v2013.04-sunxi.patch
+Patch6: origen-ext2.patch
+Patch7: arndale.patch
+Patch8: v2013.10-sunxi.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
@@ -65,13 +70,14 @@
# 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 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%patch1
+%patch2
+%patch3
+%patch4
+%patch5
+%patch6
%patch7
+%patch8 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" omap3_beagle_config
@@ -87,13 +93,14 @@
%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
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root)
/boot/u-boot.bin
@@ -103,10 +110,14 @@
%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
-%doc COPYING CREDITS README
+%doc Licenses/gpl-2.0.txt CREDITS README
%files doc
%defattr(-,root,root)
++++++ u-boot-omap4panda.spec ++++++
--- /var/tmp/diff_new_pack.0FdSCq/_old 2013-12-22 19:38:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0FdSCq/_new 2013-12-22 19:38:17.000000000 +0100
@@ -21,9 +21,10 @@
%define x_loader 1
%define origen_spl 0
%define sunxi_spl 0
+%define arndale_spl 0
Name: u-boot-omap4panda
-Version: 2013.04
+Version: 2013.10
Release: 0
Summary: The u-boot firmware for the omap4panda arm platform
License: GPL-2.0
@@ -31,15 +32,19 @@
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: loadaddr-defaults.patch
+Patch3: ti_common_initrd_support.patch
Patch4: beagle-bootscr.patch
Patch5: mx53loco-bootscr.patch
-Patch6: exynos-ext2.patch
-Patch7: v2013.04-sunxi.patch
+Patch6: origen-ext2.patch
+Patch7: arndale.patch
+Patch8: v2013.10-sunxi.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
@@ -65,13 +70,14 @@
# 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 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%patch1
+%patch2
+%patch3
+%patch4
+%patch5
+%patch6
%patch7
+%patch8 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" omap4_panda_config
@@ -87,13 +93,14 @@
%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
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root)
/boot/u-boot.bin
@@ -103,10 +110,14 @@
%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
-%doc COPYING CREDITS README
+%doc Licenses/gpl-2.0.txt CREDITS README
%files doc
%defattr(-,root,root)
++++++ u-boot-origen.spec ++++++
--- /var/tmp/diff_new_pack.0FdSCq/_old 2013-12-22 19:38:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0FdSCq/_new 2013-12-22 19:38:17.000000000 +0100
@@ -21,9 +21,10 @@
%define x_loader 0
%define origen_spl 1
%define sunxi_spl 0
+%define arndale_spl 0
Name: u-boot-origen
-Version: 2013.04
+Version: 2013.10
Release: 0
Summary: The u-boot firmware for the origen arm platform
License: GPL-2.0
@@ -31,15 +32,19 @@
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: loadaddr-defaults.patch
+Patch3: ti_common_initrd_support.patch
Patch4: beagle-bootscr.patch
Patch5: mx53loco-bootscr.patch
-Patch6: exynos-ext2.patch
-Patch7: v2013.04-sunxi.patch
+Patch6: origen-ext2.patch
+Patch7: arndale.patch
+Patch8: v2013.10-sunxi.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
@@ -65,13 +70,14 @@
# 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 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%patch1
+%patch2
+%patch3
+%patch4
+%patch5
+%patch6
%patch7
+%patch8 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" origen_config
@@ -87,13 +93,14 @@
%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
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root)
/boot/u-boot.bin
@@ -103,10 +110,14 @@
%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
-%doc COPYING CREDITS README
+%doc Licenses/gpl-2.0.txt CREDITS README
%files doc
%defattr(-,root,root)
++++++ u-boot-rpib.spec ++++++
--- /var/tmp/diff_new_pack.0FdSCq/_old 2013-12-22 19:38:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0FdSCq/_new 2013-12-22 19:38:17.000000000 +0100
@@ -21,9 +21,10 @@
%define x_loader 0
%define origen_spl 0
%define sunxi_spl 0
+%define arndale_spl 0
Name: u-boot-rpib
-Version: 2013.04
+Version: 2013.10
Release: 0
Summary: The u-boot firmware for the rpib arm platform
License: GPL-2.0
@@ -31,15 +32,19 @@
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: loadaddr-defaults.patch
+Patch3: ti_common_initrd_support.patch
Patch4: beagle-bootscr.patch
Patch5: mx53loco-bootscr.patch
-Patch6: exynos-ext2.patch
-Patch7: v2013.04-sunxi.patch
+Patch6: origen-ext2.patch
+Patch7: arndale.patch
+Patch8: v2013.10-sunxi.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
@@ -65,13 +70,14 @@
# 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 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%patch1
+%patch2
+%patch3
+%patch4
+%patch5
+%patch6
%patch7
+%patch8 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" rpi_b_config
@@ -87,13 +93,14 @@
%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
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root)
/boot/u-boot.bin
@@ -103,10 +110,14 @@
%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
-%doc COPYING CREDITS README
+%doc Licenses/gpl-2.0.txt CREDITS README
%files doc
%defattr(-,root,root)
++++++ u-boot.spec ++++++
--- /var/tmp/diff_new_pack.0FdSCq/_old 2013-12-22 19:38:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0FdSCq/_new 2013-12-22 19:38:17.000000000 +0100
@@ -19,14 +19,13 @@
Name: u-boot
-Version: 2013.04
+Version: 2013.10
Release: 0
Summary: Tools for the u-boot Firmware
License: GPL-2.0
Group: System/Boot
Url: http://www.denx.de/wiki/U-Boot
Source: u-boot-%{version}.tar.bz2
-Patch5: 0006-ARMV7-hardfp-build-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -46,7 +45,6 @@
%prep
%setup -q -n u-boot-%{version}
-%patch5 -p1
%build
make USE_PRIVATE_LIBGG=yes tools
++++++ 0006-ARMV7-hardfp-build-fix.patch ++++++
--- /var/tmp/diff_new_pack.0FdSCq/_old 2013-12-22 19:38:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0FdSCq/_new 2013-12-22 19:38:17.000000000 +0100
@@ -1,13 +1,11 @@
-Index: u-boot-2012.10/arch/arm/cpu/armv7/config.mk
-===================================================================
---- u-boot-2012.10.orig/arch/arm/cpu/armv7/config.mk
-+++ u-boot-2012.10/arch/arm/cpu/armv7/config.mk
-@@ -20,7 +20,7 @@
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- # MA 02111-1307 USA
- #
--PLATFORM_RELFLAGS += -fno-common -ffixed-r8 -msoft-float
-+PLATFORM_RELFLAGS += -fno-common -ffixed-r8
+--- ./arch/arm/config.mk.orig 2013-11-21 15:32:54.101087262 +0100
++++ ./arch/arm/config.mk 2013-11-21 15:33:03.803861493 +0100
+@@ -17,7 +17,7 @@ endif
- # If armv7-a is not supported by GCC fall-back to armv5, which is
- # supported by more tool-chains
+ LDFLAGS_FINAL += --gc-sections
+ PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections \
+- -fno-common -ffixed-r9 -msoft-float
++ -fno-common -ffixed-r9
+
+ # Support generic board on ARM
+ __HAVE_ARCH_GENERIC_BOARD := y
++++++ arndale.patch ++++++
--- ./include/configs/arndale.h.orig 2013-11-26 14:20:52.645451329 +0100
+++ ./include/configs/arndale.h 2013-11-26 15:05:07.495703179 +0100
@@ -74,9 +74,6 @@
"stdout=serial\0" \
"stderr=serial\0"
-#define CONFIG_EXTRA_ENV_SETTINGS \
- EXYNOS_DEVICE_SETTINGS
-
/* SD/MMC configuration */
#define CONFIG_GENERIC_MMC
#define CONFIG_MMC
@@ -106,6 +103,8 @@
#define CONFIG_CMD_FAT
#define CONFIG_CMD_NET
#define CONFIG_CMD_HASH
+#define CONFIG_SUPPORT_RAW_INITRD
+#define CONFIG_CMD_BOOTZ
#define CONFIG_BOOTDELAY 3
#define CONFIG_ZERO_BOOTDELAY_CHECK
@@ -127,7 +126,36 @@
#define CONFIG_SPL_TEXT_BASE 0x02023400
#define CONFIG_SPL_MAX_FOOTPRINT (14 * 1024)
-#define CONFIG_BOOTCOMMAND "mmc read 40007000 451 2000; bootm 40007000"
+#define CONFIG_EXTRA_ENV_SETTINGS \
+ EXYNOS_DEVICE_SETTINGS \
+ "loadaddr=0x40007000\0" \
+ "rdaddr=0x4f000000\0" \
+ "kerneladdr=0x40007000\0" \
+ "ramdiskaddr=0x4f000000\0" \
+ "console=ttySAC2,115200n8\0" \
+ "mmcdev=0\0" \
+ "bootenv=uEnv.txt\0" \
+ "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
+ "importbootenv=echo Importing environment from mmc ...; " \
+ "env import -t $loadaddr $filesize\0" \
+ "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot/boot.scr\0" \
+ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
+ "source ${loadaddr}\0"
+#define CONFIG_BOOTCOMMAND \
+ "if mmc rescan ${mmcdev}; then " \
+ "echo SD/MMC found on device ${mmcdev};" \
+ "if run loadbootenv; then " \
+ "echo Loaded environment from ${bootenv};" \
+ "run importbootenv;" \
+ "fi;" \
+ "if test -n $uenvcmd; then " \
+ "echo Running uenvcmd ...;" \
+ "run uenvcmd;" \
+ "fi;" \
+ "if run loadbootscript; then " \
+ "run bootscript; " \
+ "fi; " \
+ "fi;"
/* Miscellaneous configurable options */
#define CONFIG_SYS_LONGHELP /* undef to save memory */
++++++ beagle-bootscr.patch ++++++
--- /var/tmp/diff_new_pack.0FdSCq/_old 2013-12-22 19:38:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0FdSCq/_new 2013-12-22 19:38:17.000000000 +0100
@@ -1,38 +1,29 @@
-From 7ac25bef0f5d49410705e5e576c114bb2bdf7a2d Mon Sep 17 00:00:00 2001
-From: Alexander Graf
-Date: Thu, 12 Jul 2012 14:51:05 +0200
-Subject: [PATCH] OMAP: Add autorun support for boot.scr
-
-Signed-off-by: Alexander Graf
-
-Index: u-boot-2013.04rc2/include/configs/omap3_beagle.h
-===================================================================
---- u-boot-2013.04rc2.orig/include/configs/omap3_beagle.h
-+++ u-boot-2013.04rc2/include/configs/omap3_beagle.h
-@@ -273,6 +273,9 @@
- "loadramdisk=ext2load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
- "loaduimagefat=ext2load mmc ${mmcdev} ${loadaddr} uImage\0" \
- "loaduimage=ext2load mmc ${mmcdev}:2 ${loadaddr} /boot/uImage\0" \
-+ "loadbootscript=ext2load mmc ${mmcdev} ${loadaddr} boot/boot.scr\0" \
-+ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
-+ "source ${loadaddr}\0" \
+--- include/configs/omap3_beagle.h.orig 2013-11-21 15:44:37.041667288 +0100
++++ include/configs/omap3_beagle.h 2013-11-21 15:47:25.589580653 +0100
+@@ -264,6 +264,9 @@
+ "rootfstype=${ramrootfstype}\0" \
+ "loadramdisk=load mmc ${bootpart} ${rdaddr} ${bootdir}/${ramdisk}\0" \
+ "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
++ "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot/boot.scr\0" \
++ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
++ "source ${loadaddr}\0" \
+ "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
"mmcboot=echo Booting from mmc ...; " \
"run mmcargs; " \
- "bootm ${loadaddr}\0" \
-@@ -304,9 +307,13 @@
+@@ -300,9 +303,13 @@
"echo Running uenvcmd ...;" \
"run uenvcmd;" \
"fi;" \
-- "if run loaduimage; then " \
+- "if run loadimage; then " \
- "run mmcboot;" \
- "fi;" \
+ "if run loadbootscript; then " \
+ "run bootscript; " \
+ "else " \
-+ "if run loaduimage; then " \
-+ "run mmcboot; " \
-+ "fi; " \
++ "if run loadimage; then " \
++ "run mmcboot;" \
++ "fi;" \
+ "fi; " \
"fi;" \
"run nandboot;" \
-
+ "setenv bootfile zImage;" \
++++++ mlo-ext2.patch ++++++
--- /var/tmp/diff_new_pack.0FdSCq/_old 2013-12-22 19:38:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0FdSCq/_new 2013-12-22 19:38:17.000000000 +0100
@@ -1,16 +1,21 @@
-Index: u-boot-2013.04/drivers/mmc/spl_mmc.c
-===================================================================
---- u-boot-2013.04.orig/drivers/mmc/spl_mmc.c
-+++ u-boot-2013.04/drivers/mmc/spl_mmc.c
-@@ -67,6 +67,59 @@ end:
- }
+--- ./common/spl/spl_mmc.c.orig 2013-11-25 10:36:58.994214337 +0100
++++ ./common/spl/spl_mmc.c 2013-11-25 10:53:09.983264655 +0100
+@@ -11,6 +11,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+
+@@ -70,6 +71,58 @@ static int mmc_load_image_raw_os(struct
+ #endif
#ifdef CONFIG_SPL_FAT_SUPPORT
-+static void mmc_load_image_ext2(struct mmc *mmc)
++static int mmc_load_image_ext2(struct mmc *mmc, const char *filename)
+{
+ s32 err;
+ struct image_header *header;
-+ char *payloadname;
+ int filelen;
+ disk_partition_t part_info = {};
+
@@ -20,30 +25,30 @@
+ if (get_partition_info(&mmc->block_dev,
+ CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION, &part_info)) {
+ printf("spl: no partition table found\n");
-+ hang();
++ goto end;
+ }
+
-+ err = ext4fs_set_blk_dev(&mmc->block_dev, &part_info);
-+ if (!err) {
-+ printf("spl: ext4fs register err - %d\n", err);
-+ hang();
-+ }
++ ext4fs_set_blk_dev(&mmc->block_dev, &part_info);
++// err = ext4fs_set_blk_dev(&mmc->block_dev, &part_info);
++// if (!err) {
++// printf("spl: ext4fs register err - %d\n", err);
++// goto end;
++// }
+
+ err = ext4fs_mount(0);
+ if (!err) {
+ printf("spl: ext4fs mount err - %d\n", err);
-+ hang();
++ goto end;
+ }
+
-+
-+ payloadname = "boot/u-boot.bin";
-+
-+ filelen = err = ext4fs_open(payloadname);
++ filelen = err = ext4fs_open(filename);
+ if (err < 0) {
++ puts("spl: ext4fs_open failed\n");
+ goto end;
+ }
+ err = ext4fs_read((u8 *)header, sizeof(struct image_header));
+ if (err <= 0) {
++ puts("spl: ext4fs_read failed\n");
+ goto end;
+ }
+
@@ -54,61 +59,73 @@
+end:
+ if (err <= 0) {
+ printf("spl: error reading image %s, err - %d\n",
-+ payloadname, err);
-+ hang();
++ filename, err);
+ }
++ return (err <= 0);
+}
+
- static void mmc_load_image_fat(struct mmc *mmc)
+ static int mmc_load_image_fat(struct mmc *mmc, const char *filename)
{
- s32 err;
-@@ -127,7 +180,8 @@ void spl_mmc_load_image(void)
- #ifdef CONFIG_SPL_FAT_SUPPORT
+ int err;
+@@ -142,6 +195,8 @@ void spl_mmc_load_image(void)
+ }
+
+ boot_mode = spl_boot_mode();
++ boot_mode = MMCSD_MODE_FAT; /* Fix OMAP4 boot */
++
+ if (boot_mode == MMCSD_MODE_RAW) {
+ debug("boot mode - RAW\n");
+ #ifdef CONFIG_SPL_OS_BOOT
+@@ -153,19 +208,20 @@ void spl_mmc_load_image(void)
} else if (boot_mode == MMCSD_MODE_FAT) {
debug("boot mode - FAT\n");
-- mmc_load_image_fat(mmc);
-+// mmc_load_image_fat(mmc);
-+ mmc_load_image_ext2(mmc);
+
+- err = fat_register_device(&mmc->block_dev,
+- CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION);
+- if (err) {
++// err = fat_register_device(&mmc->block_dev,
++// CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION);
++// if (err) {
+ #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
+- printf("spl: fat register err - %d\n", err);
++// printf("spl: fat register err - %d\n", err);
+ #endif
+- hang();
+- }
++// hang();
++// }
+
+ #ifdef CONFIG_SPL_OS_BOOT
+ if (spl_start_uboot() || mmc_load_image_fat_os(mmc))
+ #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 */
#endif
} else {
- puts("spl: wrong MMC boot mode\n");
-Index: u-boot-2013.04/include/configs/omap3_beagle.h
-===================================================================
---- u-boot-2013.04.orig/include/configs/omap3_beagle.h
-+++ u-boot-2013.04/include/configs/omap3_beagle.h
-@@ -55,6 +55,7 @@
+ #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
+--- ./include/configs/omap3_beagle.h.orig 2013-11-21 14:01:46.884722728 +0100
++++ ./include/configs/omap3_beagle.h 2013-11-21 14:05:56.469711684 +0100
+@@ -40,6 +40,7 @@
#define CONFIG_OF_LIBFDT
#define CONFIG_CMD_BOOTZ
-+#define CONFIG_SUPPORT_RAW_INITRD /* bootz raw initrd support */
++#define CONFIG_SUPPORT_RAW_INITRD /* bootz raw initrd support */
#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
#define CONFIG_SETUP_MEMORY_TAGS 1
-@@ -255,7 +256,7 @@
- "root=${nandroot} " \
- "rootfstype=${nandrootfstype}\0" \
+@@ -249,7 +250,7 @@
+ "if test $fdtfile = undefined; then " \
+ "echo WARNING: Could not determine device tree to use; fi; \0" \
"bootenv=uEnv.txt\0" \
- "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
-+ "loadbootenv=ext2load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
++ "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
"importbootenv=echo Importing environment from mmc ...; " \
"env import -t $loadaddr $filesize\0" \
"ramargs=setenv bootargs console=${console} " \
-@@ -267,8 +268,8 @@
- "omapdss.def_disp=${defaultdisplay} " \
- "root=${ramroot} " \
- "rootfstype=${ramrootfstype}\0" \
-- "loadramdisk=fatload mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
-- "loaduimagefat=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
-+ "loadramdisk=ext2load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
-+ "loaduimagefat=ext2load mmc ${mmcdev} ${loadaddr} uImage\0" \
- "loaduimage=ext2load mmc ${mmcdev}:2 ${loadaddr} /boot/uImage\0" \
- "mmcboot=echo Booting from mmc ...; " \
- "run mmcargs; " \
-Index: u-boot-2013.04/include/configs/omap4_common.h
-===================================================================
---- u-boot-2013.04.orig/include/configs/omap4_common.h
-+++ u-boot-2013.04/include/configs/omap4_common.h
-@@ -126,6 +126,7 @@
+--- ./include/configs/omap4_common.h.orig 2013-11-21 14:05:29.066372667 +0100
++++ ./include/configs/omap4_common.h 2013-11-21 14:06:39.260679071 +0100
+@@ -111,6 +111,7 @@
#define CONFIG_CMD_FAT /* FAT support */
#define CONFIG_CMD_I2C /* I2C serial bus support */
#define CONFIG_CMD_MMC /* MMC support */
@@ -116,41 +133,37 @@
/* Disabled commands */
#undef CONFIG_CMD_NET
-@@ -162,10 +163,10 @@
+@@ -148,10 +149,10 @@
"vram=${vram} " \
"root=${mmcroot} " \
"rootfstype=${mmcrootfstype}\0" \
- "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
-+ "loadbootscript=ext2load mmc ${mmcdev} ${loadaddr} boot/boot.scr\0" \
++ "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot/boot.scr\0" \
"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
"source ${loadaddr}\0" \
- "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
-+ "loadbootenv=ext2load mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
++ "loadbootenv=load mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
"env import -t ${loadaddr} ${filesize}\0" \
"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
-Index: u-boot-2013.04/spl/Makefile
-===================================================================
---- u-boot-2013.04.orig/spl/Makefile
-+++ u-boot-2013.04/spl/Makefile
-@@ -72,6 +72,7 @@ LIBS-$(CONFIG_SPL_SERIAL_SUPPORT) += dri
+--- ./spl/Makefile.orig 2013-11-21 14:10:09.094607542 +0100
++++ ./spl/Makefile 2013-11-21 14:10:21.476307890 +0100
+@@ -86,6 +86,7 @@ LIBS-$(CONFIG_SPL_SERIAL_SUPPORT) += dri
LIBS-$(CONFIG_SPL_SPI_FLASH_SUPPORT) += drivers/mtd/spi/libspi_flash.o
LIBS-$(CONFIG_SPL_SPI_SUPPORT) += drivers/spi/libspi.o
LIBS-$(CONFIG_SPL_FAT_SUPPORT) += fs/fat/libfat.o
+LIBS-$(CONFIG_SPL_FAT_SUPPORT) += fs/ext4/libext4fs.o
LIBS-$(CONFIG_SPL_LIBGENERIC_SUPPORT) += lib/libgeneric.o
- LIBS-$(CONFIG_SPL_POWER_SUPPORT) += drivers/power/libpower.o
- LIBS-$(CONFIG_SPL_NAND_SUPPORT) += drivers/mtd/nand/libnand.o
-Index: u-boot-2013.04/arch/arm/cpu/armv7/omap3/board.c
-===================================================================
---- u-boot-2013.04.orig/arch/arm/cpu/armv7/omap3/board.c
-+++ u-boot-2013.04/arch/arm/cpu/armv7/omap3/board.c
-@@ -77,6 +77,8 @@ u32 omap3_boot_device = BOOT_DEVICE_NAND
+ LIBS-$(CONFIG_SPL_POWER_SUPPORT) += drivers/power/libpower.o \
+ drivers/power/pmic/libpmic.o
+--- arch/arm/cpu/armv7/omap3/board.c.orig 2013-11-21 15:21:32.962225786 +0100
++++ arch/arm/cpu/armv7/omap3/board.c 2013-11-21 15:22:26.797911840 +0100
+@@ -61,6 +61,8 @@ u32 omap3_boot_device = BOOT_DEVICE_NAND
/* auto boot mode detection is not possible for OMAP3 - hard code */
u32 spl_boot_mode(void)
{
-+ return MMCSD_MODE_FAT;
-+
++ return MMCSD_MODE_FAT;
++
switch (spl_boot_device()) {
case BOOT_DEVICE_MMC2:
return MMCSD_MODE_RAW;
++++++ mx53loco-bootscr.patch ++++++
--- /var/tmp/diff_new_pack.0FdSCq/_old 2013-12-22 19:38:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0FdSCq/_new 2013-12-22 19:38:17.000000000 +0100
@@ -1,8 +1,6 @@
-Index: u-boot-2013.04rc2/include/configs/mx53loco.h
-===================================================================
---- u-boot-2013.04rc2.orig/include/configs/mx53loco.h
-+++ u-boot-2013.04rc2/include/configs/mx53loco.h
-@@ -106,6 +106,7 @@
+--- include/configs/mx53loco.h.orig 2013-11-21 16:01:18.084423858 +0100
++++ include/configs/mx53loco.h 2013-11-21 16:05:47.301100793 +0100
+@@ -93,6 +93,7 @@
/* Command definition */
#include
#define CONFIG_CMD_BOOTZ
@@ -10,31 +8,27 @@
#undef CONFIG_CMD_IMLS
-@@ -119,20 +120,22 @@
+@@ -104,7 +105,7 @@
+ #define CONFIG_SYS_TEXT_BASE 0x77800000
+
#define CONFIG_EXTRA_ENV_SETTINGS \
- "script=boot.scr\0" \
+- "script=boot.scr\0" \
++ "script=boot/boot.scr\0" \
"uimage=uImage\0" \
-+ "kerneladdr=0x70800000\0" \
-+ "ramdiskaddr=0x7e000000\0" \
"fdt_file=imx53-qsb.dtb\0" \
-- "fdt_addr=0x71000000\0" \
-+ "fdt_addr=0x7d800000\0" \
- "boot_fdt=try\0" \
- "ip_dyn=yes\0" \
- "mmcdev=0\0" \
-- "mmcpart=2\0" \
-+ "mmcpart=1\0" \
- "mmcroot=/dev/mmcblk0p3 rw rootwait\0" \
+ "fdt_addr=0x71000000\0" \
+@@ -115,11 +116,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" \
- "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
-+ "loaduimage=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
-+ "loadfdt=ext2load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
++ "loaduimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\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 " \
++++++ origen-ext2.patch ++++++
--- include/configs/origen.h.orig 2013-10-16 19:08:12.000000000 +0200
+++ include/configs/origen.h 2013-11-21 15:57:25.724045492 +0100
@@ -74,8 +74,11 @@
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_MMC
#define CONFIG_CMD_FAT
+#define CONFIG_CMD_EXT2 /* EXT2 Support */
#undef CONFIG_CMD_NET
#undef CONFIG_CMD_NFS
+#define CONFIG_CMD_BOOTZ /* bootz zImage support */
+#define CONFIG_SUPPORT_RAW_INITRD /* bootz raw initrd support */
#define CONFIG_BOOTDELAY 3
#define CONFIG_ZERO_BOOTDELAY_CHECK
@@ -85,7 +88,35 @@
#define CONFIG_SPL_TEXT_BASE 0x02021410
-#define CONFIG_BOOTCOMMAND "fatload mmc 0 40007000 uImage; bootm 40007000"
+#define CONFIG_EXTRA_ENV_SETTINGS \
+ "loadaddr=0x40007000\0" \
+ "rdaddr=0x48000000\0" \
+ "kerneladdr=0x40007000\0" \
+ "ramdiskaddr=0x48000000\0" \
+ "console=ttySAC2,115200n8\0" \
+ "mmcdev=0\0" \
+ "bootenv=uEnv.txt\0" \
+ "loadbootenv=ext2load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
+ "importbootenv=echo Importing environment from mmc ...; " \
+ "env import -t $loadaddr $filesize\0" \
+ "loadbootscript=ext2load mmc ${mmcdev} ${loadaddr} boot/boot.scr\0" \
+ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
+ "source ${loadaddr}\0"
+#define CONFIG_BOOTCOMMAND \
+ "if mmc rescan; then " \
+ "echo SD/MMC found on device ${mmcdev};" \
+ "if run loadbootenv; then " \
+ "echo Loaded environment from ${bootenv};" \
+ "run importbootenv;" \
+ "fi;" \
+ "if test -n $uenvcmd; then " \
+ "echo Running uenvcmd ...;" \
+ "run uenvcmd;" \
+ "fi;" \
+ "if run loadbootscript; then " \
+ "run bootscript; " \
+ "fi; " \
+ "fi;"
/* Miscellaneous configurable options */
#define CONFIG_SYS_LONGHELP /* undef to save memory */
++++++ pre_checkin.sh ++++++
--- /var/tmp/diff_new_pack.0FdSCq/_old 2013-12-22 19:38:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0FdSCq/_new 2013-12-22 19:38:17.000000000 +0100
@@ -4,7 +4,7 @@
BOARDCONFIG="$2"
if [ ! "$1" -o ! "$2" ]; then
- for BOARDCONFIG in omap3_beagle omap4_panda origen highbank mx53loco rpi_b cubieboard hyundai_a7hd mele_a1000; do
+ for BOARDCONFIG in omap3_beagle omap4_panda am335x_evm origen arndale highbank mx53loco rpi_b cubieboard hyundai_a7hd mele_a1000; do
BOARDNAME="$(echo $BOARDCONFIG | tr -d '_')"
BOARDCONFIG=${BOARDCONFIG}_config
bash $0 $BOARDNAME $BOARDCONFIG
@@ -15,12 +15,15 @@
XLOADER=0
ORIGEN_SPL=0
SUNXI_SPL=0
+ARNDALE_SPL=0
case "$BOARDCONFIG" in
mx*|efika*) BINEND=imx ;;
-*omap*) BINEND=bin
+*omap*|*am335x*) BINEND=bin
XLOADER=1 ;;
*origen*) BINEND=bin
ORIGEN_SPL=1 ;;
+*arndale*) BINEND=bin
+ ARNDALE_SPL=1 ;;
*cubieboard*) BINEND=bin
SUNXI_SPL=1 ;;
*mele_a1000*) BINEND=bin
@@ -34,6 +37,7 @@
s/BOARDNAME/$BOARDNAME/g
s/BINEND/$BINEND/g
s/ORIGEN_SPL/$ORIGEN_SPL/g
+s/ARNDALE_SPL/$ARNDALE_SPL/g
s/SUNXI_SPL/$SUNXI_SPL/g
s/XLOADER/$XLOADER/g" < u-boot.spec.in > u-boot-$BOARDNAME.spec
++++++ ti_common_initrd_support.patch ++++++
--- ./include/configs/ti_armv7_common.h.orig 2013-12-17 15:08:07.380596872 +0100
+++ ./include/configs/ti_armv7_common.h 2013-12-17 15:08:30.370055488 +0100
@@ -149,6 +149,7 @@
#define CONFIG_CMD_ASKENV
#define CONFIG_CMD_ECHO
#define CONFIG_CMD_BOOTZ
+#define CONFIG_SUPPORT_RAW_INITRD
/*
* Common filesystems support. When we have removable storage we
++++++ u-boot-2013.04.tar.bz2 -> u-boot-2013.10.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/u-boot/u-boot-2013.04.tar.bz2 /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-2013.10.tar.bz2 differ: char 11, line 1
++++++ u-boot.spec.in ++++++
--- /var/tmp/diff_new_pack.0FdSCq/_old 2013-12-22 19:38:17.000000000 +0100
+++ /var/tmp/diff_new_pack.0FdSCq/_new 2013-12-22 19:38:17.000000000 +0100
@@ -21,9 +21,10 @@
%define x_loader XLOADER
%define origen_spl ORIGEN_SPL
%define sunxi_spl SUNXI_SPL
+%define arndale_spl ARNDALE_SPL
Name: u-boot-BOARDNAME
-Version: 2013.04
+Version: 2013.10
Release: 0
Summary: The u-boot firmware for the BOARDNAME arm platform
License: GPL-2.0
@@ -31,15 +32,19 @@
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: loadaddr-defaults.patch
+Patch3: ti_common_initrd_support.patch
Patch4: beagle-bootscr.patch
Patch5: mx53loco-bootscr.patch
-Patch6: exynos-ext2.patch
-Patch7: v2013.04-sunxi.patch
+Patch6: origen-ext2.patch
+Patch7: arndale.patch
+Patch8: v2013.10-sunxi.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
@@ -65,13 +70,14 @@
# 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 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%patch1
+%patch2
+%patch3
+%patch4
+%patch5
+%patch6
%patch7
+%patch8 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" BOARDCONFIG
@@ -87,13 +93,14 @@
%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
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root)
/boot/u-boot.BINEND
@@ -103,10 +110,14 @@
%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
-%doc COPYING CREDITS README
+%doc Licenses/gpl-2.0.txt CREDITS README
%files doc
%defattr(-,root,root)
++++++ v2013.04-sunxi.patch -> v2013.10-sunxi.patch ++++++
++++ 7010 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/u-boot/v2013.04-sunxi.patch
++++ and /work/SRC/openSUSE:Factory/.u-boot.new/v2013.10-sunxi.patch
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org