Hello community, here is the log from the commit of package u-boot for openSUSE:Factory checked in at 2015-11-08 11:26:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-a10-olinuxino-lime.changes 2015-10-20 00:04:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-a10-olinuxino-lime.changes 2015-11-08 11:26:16.000000000 +0100 @@ -1,0 +2,21 @@ +Tue Nov 3 08:14:57 UTC 2015 - matwey.korni...@gmail.com + +- Fix am335x booting + * U-Boot-image.c-Fix-non-Android-booting-with-ramdisk-and-or-device-tree.patch + +------------------------------------------------------------------- +Wed Oct 21 08:16:32 UTC 2015 - guilla...@opensuse.org + +- Add Beagle x15 support +- Fix build for Beagle x15: + * U-Boot-1-2-usb-host-xhci-omap-fix-build-break.patch + +------------------------------------------------------------------- +Tue Oct 20 11:32:30 UTC 2015 - guilla...@opensuse.org + +- Update to 2015.10 +- Remove upstreamed patches: + * 0001-odroid-replace-fatload-with-load-to-be-able-to-use-E.patch + * 0002-odroid-Add-boot-script-boot.scr-support.patch + +------------------------------------------------------------------- u-boot-a13-olinuxino.changes: same change u-boot-a13-olinuxinom.changes: same change u-boot-a20-olinuxino-lime.changes: same change u-boot-a20-olinuxino-lime2.changes: same change u-boot-a20-olinuxinomicro.changes: same change u-boot-am335xevm.changes: same change u-boot-arndale.changes: same change u-boot-bananapi.changes: same change New Changes file: --- /dev/null 2015-11-02 12:10:47.524024255 +0100 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-beaglex15.changes 2015-11-08 11:26:16.000000000 +0100 @@ -0,0 +1,875 @@ +------------------------------------------------------------------- +Tue Nov 3 08:14:57 UTC 2015 - matwey.korni...@gmail.com + +- Fix am335x booting + * U-Boot-image.c-Fix-non-Android-booting-with-ramdisk-and-or-device-tree.patch + +------------------------------------------------------------------- +Wed Oct 21 08:16:32 UTC 2015 - guilla...@opensuse.org + +- Add Beagle x15 support +- Fix build for Beagle x15: + * U-Boot-1-2-usb-host-xhci-omap-fix-build-break.patch + +------------------------------------------------------------------- +Tue Oct 20 11:32:30 UTC 2015 - guilla...@opensuse.org + +- Update to 2015.10 +- Remove upstreamed patches: + * 0001-odroid-replace-fatload-with-load-to-be-able-to-use-E.patch + * 0002-odroid-Add-boot-script-boot.scr-support.patch + +------------------------------------------------------------------- +Tue Oct 13 06:58:38 UTC 2015 - guilla...@opensuse.org + +- Update to 2015.10-rc5 +- Remove upstreamed patch: + * arndale-apply-cortex-a15-erratas.patch + +------------------------------------------------------------------- +Thu Oct 8 09:27:15 UTC 2015 - guilla...@opensuse.org + +- Add boot script support to odroid board: + * 0001-odroid-replace-fatload-with-load-to-be-able-to-use-E.patch + * 0002-odroid-Add-boot-script-boot.scr-support.patch + +------------------------------------------------------------------- +Mon Oct 5 18:04:28 UTC 2015 - afaer...@suse.de + +- Add spring and firefly-rk3288 for armv7hl + * Break overly long armv7_boards line in pre_checkin.sh + * Clean up case'ing of defconfigs to avoid excessive wildcards +- Prepare for adding qemu-ppce500 for ppc + * Allow for more than two exclusive architectures (cleanup) + +------------------------------------------------------------------- +Mon Oct 5 11:42:08 UTC 2015 - dmuel...@suse.com + +- add arndale-apply-cortex-a15-erratas.patch + +------------------------------------------------------------------- +Thu Oct 1 16:41:38 UTC 2015 - guillaume.gar...@opensuse.org + +- Update to 2015.10-rc4 +- Update drop-marvell.patch + +------------------------------------------------------------------- +Sat Sep 12 12:22:53 UTC 2015 - guilla...@opensuse.org + +- Use u-boot-2015.10-rc3.tar.bz2 package provided on FTP instead of + packaging it manually. + +------------------------------------------------------------------- +Tue Sep 8 08:52:56 UTC 2015 - guilla...@opensuse.org + +- Update to 2015.10-rc3 + +------------------------------------------------------------------- +Wed Sep 2 16:28:02 UTC 2015 - guilla...@opensuse.org + +- Add odroid and odroid-xu3 + +------------------------------------------------------------------- +Tue Aug 18 08:31:48 UTC 2015 - guilla...@opensuse.org + +- Update to 2015.10-rc2 +- Remove upstreamed patch: + * jetson-tk1-gpu-1.patch + * jetson-tk1-gpu-2.patch + +------------------------------------------------------------------- +Thu Aug 6 12:40:58 UTC 2015 - guilla...@opensuse.org + +- Update to 2015.10-rc1 +- Remove upstreamed patch: + * mx53loco-bootscr.patch +- Update patches: + * jetson-tk1-gpu-1.patch + * jetson-tk1-gpu-2.patch + +------------------------------------------------------------------- +Wed Aug 5 13:36:45 UTC 2015 - dmuel...@suse.com + +- add mx6cuboxi + +------------------------------------------------------------------- +Wed Jul 22 22:38:23 UTC 2015 - afaer...@suse.de + +- jetson-tk1-gpu-1.patch, + jetson-tk1-gpu-2.patch: Enable the Tegra124 GPU device tree node + +------------------------------------------------------------------- +Mon Jul 20 10:45:39 UTC 2015 - afaer...@suse.de + +- Add u-boot-jetson-tk1 + +------------------------------------------------------------------- +Fri Jul 17 06:42:37 UTC 2015 - afaer...@suse.de + +- Add u-boot-merriia80optimus + +------------------------------------------------------------------- +Wed Jul 15 13:05:24 UTC 2015 - guilla...@opensuse.org + +- Update to 2015.07 + +------------------------------------------------------------------- +Tue Jun 30 07:34:49 UTC 2015 - guilla...@opensuse.org + +- Update to 2015.07-rc3 +- Remove upstreamed patches: + * enable_spl_ext_support_for_ti_armv7.patch + * fix_slow_mmc_on_rpi.patch + +------------------------------------------------------------------- +Thu Jun 18 12:07:10 UTC 2015 - guilla...@opensuse.org + +- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi +- Rework patches (to be upstreamable): + * enable_spl_ext_support_for_ti_armv7.patch + * mx53loco-bootscr.patch +- Remove fix_beagle_spl_build.patch + +------------------------------------------------------------------- +Wed Jun 10 10:07:23 UTC 2015 - guilla...@opensuse.org + +- Update to 2015.07-rc2 +- Update drop-marvell.patch + +------------------------------------------------------------------- +Wed May 27 10:07:49 UTC 2015 - guilla...@opensuse.org + +- Update to 2015.07-rc1: +- Update drop-marvell.patch +- Remove no more needed add_snow_usb_boot.patch + +------------------------------------------------------------------- +Wed Apr 29 07:51:25 UTC 2015 - dmuel...@suse.com + +- adjust copyright headers + +------------------------------------------------------------------- +Thu Apr 16 08:34:11 UTC 2015 - guilla...@opensuse.org + +- update to 2015.04 +- Remove upstreamed patch: + 0001-Exynos-Clock-Fix-exynos5_get_periph_rate-for-I2C.patch +- Follow upstream board rename colibri_t20_iris => colibri_t20 + +------------------------------------------------------------------- +Sun Apr 12 19:49:41 UTC 2015 - xxxxxmi...@googlemail.com + +- Added support for A13-OLinuXino, A13-OLinuXino-MICRO, + A20-OLinuXino-MICRO and A20-OLinuXino-LIME from + www.olimex.com + +------------------------------------------------------------------- +Thu Apr 9 07:56:40 UTC 2015 - guilla...@opensuse.org + +- Remove u-boot-vexpressaemv8a (dropped upstream and we now use EFI) + +------------------------------------------------------------------- +Thu Apr 2 09:13:49 UTC 2015 - guilla...@opensuse.org + +- update to 2015.04-rc5 + +------------------------------------------------------------------- +Mon Mar 23 08:39:40 UTC 2015 - guilla...@opensuse.org + +- update to 2015.04-rc4 + +------------------------------------------------------------------- +Wed Mar 4 15:51:55 UTC 2015 - guilla...@opensuse.org + +- Add 0001-Exynos-Clock-Fix-exynos5_get_periph_rate-for-I2C.patch + to fix keyboard on Chromebook + +------------------------------------------------------------------- +Wed Mar 4 15:46:52 UTC 2015 - guilla...@opensuse.org + +- update to 2015.04-rc3 +- update patch: drop-marvell.patch + +------------------------------------------------------------------- +Thu Feb 26 16:48:35 UTC 2015 - guilla...@opensuse.org + +- Update add_snow_usb_boot.patch to boot on USB2 instead of USB3 + ++++ 678 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-beaglex15.changes --- /work/SRC/openSUSE:Factory/u-boot/u-boot-colibrit20.changes 2015-10-20 00:04:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-colibrit20.changes 2015-11-08 11:26:16.000000000 +0100 @@ -1,0 +2,21 @@ +Tue Nov 3 08:14:57 UTC 2015 - matwey.korni...@gmail.com + +- Fix am335x booting + * U-Boot-image.c-Fix-non-Android-booting-with-ramdisk-and-or-device-tree.patch + +------------------------------------------------------------------- +Wed Oct 21 08:16:32 UTC 2015 - guilla...@opensuse.org + +- Add Beagle x15 support +- Fix build for Beagle x15: + * U-Boot-1-2-usb-host-xhci-omap-fix-build-break.patch + +------------------------------------------------------------------- +Tue Oct 20 11:32:30 UTC 2015 - guilla...@opensuse.org + +- Update to 2015.10 +- Remove upstreamed patches: + * 0001-odroid-replace-fatload-with-load-to-be-able-to-use-E.patch + * 0002-odroid-Add-boot-script-boot.scr-support.patch + +------------------------------------------------------------------- u-boot-cubieboard.changes: same change u-boot-cubieboard2.changes: same change u-boot-cubietruck.changes: same change u-boot-firefly-rk3288.changes: same change u-boot-highbank.changes: same change u-boot-jetson-tk1.changes: same change u-boot-melea1000.changes: same change u-boot-merriia80optimus.changes: same change u-boot-mx53loco.changes: same change u-boot-mx6cuboxi.changes: same change u-boot-mx6qsabrelite.changes: same change u-boot-odroid-xu3.changes: same change u-boot-odroid.changes: same change u-boot-omap3beagle.changes: same change u-boot-omap4panda.changes: same change u-boot-paz00.changes: same change u-boot-pcm051rev3.changes: same change u-boot-rpi.changes: same change u-boot-rpi2.changes: same change u-boot-snow.changes: same change u-boot-spring.changes: same change u-boot.changes: same change Old: ---- 0001-odroid-replace-fatload-with-load-to-be-able-to-use-E.patch 0002-odroid-Add-boot-script-boot.scr-support.patch u-boot-2015.10-rc5.tar.bz2 New: ---- U-Boot-1-2-usb-host-xhci-omap-fix-build-break.patch U-Boot-image.c-Fix-non-Android-booting-with-ramdisk-and-or-device-tree.patch u-boot-2015.10.tar.bz2 u-boot-beaglex15.changes u-boot-beaglex15.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ u-boot-a10-olinuxino-lime.spec ++++++ --- /var/tmp/diff_new_pack.tWzkmY/_old 2015-11-08 11:26:21.000000000 +0100 +++ /var/tmp/diff_new_pack.tWzkmY/_new 2015-11-08 11:26:21.000000000 +0100 @@ -25,10 +25,10 @@ %define cuboxi_spl 0 # archive_version differs from version for RC version only -%define archive_version 2015.10-rc5 +%define archive_version 2015.10 Name: u-boot-a10-olinuxino-lime -Version: 2015.10~rc5 +Version: 2015.10 Release: 0 Summary: The u-boot firmware for the a10-olinuxino-lime arm platform License: GPL-2.0 @@ -37,9 +37,10 @@ Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -# Odroid patches -Patch10: 0001-odroid-replace-fatload-with-load-to-be-able-to-use-E.patch -Patch11: 0002-odroid-Add-boot-script-boot.scr-support.patch +# PATCH-FIX-UPSTREAM Fix build for beagle x15 +Patch1: U-Boot-1-2-usb-host-xhci-omap-fix-build-break.patch +# PATCH-FIX-UPSTREAM Fix am335x booting +Patch2: U-Boot-image.c-Fix-non-Android-booting-with-ramdisk-and-or-device-tree.patch # Marvell boards support is non-free licensed, and we don't need it (bnc#773824) Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -68,8 +69,8 @@ %prep %setup -q -n u-boot-%{archive_version} -%patch10 -p1 -%patch11 -p1 +%patch1 -p1 +%patch2 -p1 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell %patch99 -p1 u-boot-a13-olinuxino.spec: same change u-boot-a13-olinuxinom.spec: same change u-boot-a20-olinuxino-lime.spec: same change u-boot-a20-olinuxino-lime2.spec: same change u-boot-a20-olinuxinomicro.spec: same change u-boot-am335xevm.spec: same change u-boot-arndale.spec: same change u-boot-bananapi.spec: same change ++++++ u-boot-beaglex15.spec ++++++ # # spec file for package u-boot-beaglex15 # # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon # Copyright (c) 2007-2010 by Silvan Calarco <silvan.cala...@mambasoft.it> # # 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 %define cuboxi_spl 0 # archive_version differs from version for RC version only %define archive_version 2015.10 Name: u-boot-beaglex15 Version: 2015.10 Release: 0 Summary: The u-boot firmware for the beaglex15 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-%{archive_version}.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc # PATCH-FIX-UPSTREAM Fix build for beagle x15 Patch1: U-Boot-1-2-usb-host-xhci-omap-fix-build-break.patch # PATCH-FIX-UPSTREAM Fix am335x booting Patch2: U-Boot-image.c-Fix-non-Android-booting-with-ramdisk-and-or-device-tree.patch # Marvell boards support is non-free licensed, and we don't need it (bnc#773824) Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Arndale board need DTC >= 1.4 BuildRequires: bc BuildRequires: dtc >= 1.4.0 Provides: u-boot-loader Conflicts: otherproviders(u-boot-loader) %if %x_loader == 1 Obsoletes: x-loader-beaglex15 Provides: x-loader-beaglex15 %endif ExclusiveArch: armv7l armv7hl %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 beaglex15 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-%{archive_version} %patch1 -p1 %patch2 -p1 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell %patch99 -p1 %build make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" beagle_x15_defconfig make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes %if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" # Chromebook ARM (snow) and HP Chromebook 11 (spring) need a uImage format export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) ./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img %endif %install %if "%{name}" == "u-boot-jetson-tk1" # tegra-uboot-flasher needs several intermediate files, under their original name. for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin; do install -D -m 0644 $f %{buildroot}/boot/$f done %else # 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-tegra.bin ]; then install -D -m 0644 u-boot-dtb-tegra.bin %{buildroot}/boot/u-boot.bin elif [ -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 %endif %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 install -D -m 0755 u-boot-sunxi-with-spl.bin %{buildroot}/boot/u-boot-sunxi-with-spl.bin %endif %if %cuboxi_spl == 1 install -D -m 0755 SPL %{buildroot}/boot/cuboxi-spl.bin %endif %files %defattr(-,root,root) /boot/* %doc Licenses/gpl-2.0.txt 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/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image # Now any h/w dependent Documentation %doc doc/README.ARM-memory-map %changelog ++++++ u-boot-colibrit20.spec ++++++ --- /var/tmp/diff_new_pack.tWzkmY/_old 2015-11-08 11:26:21.000000000 +0100 +++ /var/tmp/diff_new_pack.tWzkmY/_new 2015-11-08 11:26:21.000000000 +0100 @@ -25,10 +25,10 @@ %define cuboxi_spl 0 # archive_version differs from version for RC version only -%define archive_version 2015.10-rc5 +%define archive_version 2015.10 Name: u-boot-colibrit20 -Version: 2015.10~rc5 +Version: 2015.10 Release: 0 Summary: The u-boot firmware for the colibrit20 arm platform License: GPL-2.0 @@ -37,9 +37,10 @@ Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -# Odroid patches -Patch10: 0001-odroid-replace-fatload-with-load-to-be-able-to-use-E.patch -Patch11: 0002-odroid-Add-boot-script-boot.scr-support.patch +# PATCH-FIX-UPSTREAM Fix build for beagle x15 +Patch1: U-Boot-1-2-usb-host-xhci-omap-fix-build-break.patch +# PATCH-FIX-UPSTREAM Fix am335x booting +Patch2: U-Boot-image.c-Fix-non-Android-booting-with-ramdisk-and-or-device-tree.patch # Marvell boards support is non-free licensed, and we don't need it (bnc#773824) Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -68,8 +69,8 @@ %prep %setup -q -n u-boot-%{archive_version} -%patch10 -p1 -%patch11 -p1 +%patch1 -p1 +%patch2 -p1 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell %patch99 -p1 u-boot-cubieboard.spec: same change u-boot-cubieboard2.spec: same change u-boot-cubietruck.spec: same change u-boot-firefly-rk3288.spec: same change u-boot-highbank.spec: same change u-boot-jetson-tk1.spec: same change u-boot-melea1000.spec: same change u-boot-merriia80optimus.spec: same change u-boot-mx53loco.spec: same change ++++++ u-boot-mx6cuboxi.spec ++++++ --- /var/tmp/diff_new_pack.tWzkmY/_old 2015-11-08 11:26:21.000000000 +0100 +++ /var/tmp/diff_new_pack.tWzkmY/_new 2015-11-08 11:26:21.000000000 +0100 @@ -25,10 +25,10 @@ %define cuboxi_spl 1 # archive_version differs from version for RC version only -%define archive_version 2015.10-rc5 +%define archive_version 2015.10 Name: u-boot-mx6cuboxi -Version: 2015.10~rc5 +Version: 2015.10 Release: 0 Summary: The u-boot firmware for the mx6cuboxi arm platform License: GPL-2.0 @@ -37,9 +37,10 @@ Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -# Odroid patches -Patch10: 0001-odroid-replace-fatload-with-load-to-be-able-to-use-E.patch -Patch11: 0002-odroid-Add-boot-script-boot.scr-support.patch +# PATCH-FIX-UPSTREAM Fix build for beagle x15 +Patch1: U-Boot-1-2-usb-host-xhci-omap-fix-build-break.patch +# PATCH-FIX-UPSTREAM Fix am335x booting +Patch2: U-Boot-image.c-Fix-non-Android-booting-with-ramdisk-and-or-device-tree.patch # Marvell boards support is non-free licensed, and we don't need it (bnc#773824) Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -68,8 +69,8 @@ %prep %setup -q -n u-boot-%{archive_version} -%patch10 -p1 -%patch11 -p1 +%patch1 -p1 +%patch2 -p1 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell %patch99 -p1 ++++++ u-boot-mx6qsabrelite.spec ++++++ --- /var/tmp/diff_new_pack.tWzkmY/_old 2015-11-08 11:26:21.000000000 +0100 +++ /var/tmp/diff_new_pack.tWzkmY/_new 2015-11-08 11:26:21.000000000 +0100 @@ -25,10 +25,10 @@ %define cuboxi_spl 0 # archive_version differs from version for RC version only -%define archive_version 2015.10-rc5 +%define archive_version 2015.10 Name: u-boot-mx6qsabrelite -Version: 2015.10~rc5 +Version: 2015.10 Release: 0 Summary: The u-boot firmware for the mx6qsabrelite arm platform License: GPL-2.0 @@ -37,9 +37,10 @@ Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -# Odroid patches -Patch10: 0001-odroid-replace-fatload-with-load-to-be-able-to-use-E.patch -Patch11: 0002-odroid-Add-boot-script-boot.scr-support.patch +# PATCH-FIX-UPSTREAM Fix build for beagle x15 +Patch1: U-Boot-1-2-usb-host-xhci-omap-fix-build-break.patch +# PATCH-FIX-UPSTREAM Fix am335x booting +Patch2: U-Boot-image.c-Fix-non-Android-booting-with-ramdisk-and-or-device-tree.patch # Marvell boards support is non-free licensed, and we don't need it (bnc#773824) Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -68,8 +69,8 @@ %prep %setup -q -n u-boot-%{archive_version} -%patch10 -p1 -%patch11 -p1 +%patch1 -p1 +%patch2 -p1 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell %patch99 -p1 u-boot-odroid-xu3.spec: same change u-boot-odroid.spec: same change u-boot-omap3beagle.spec: same change u-boot-omap4panda.spec: same change u-boot-paz00.spec: same change u-boot-pcm051rev3.spec: same change u-boot-rpi.spec: same change u-boot-rpi2.spec: same change u-boot-snow.spec: same change u-boot-spring.spec: same change ++++++ u-boot.spec ++++++ --- /var/tmp/diff_new_pack.tWzkmY/_old 2015-11-08 11:26:22.000000000 +0100 +++ /var/tmp/diff_new_pack.tWzkmY/_new 2015-11-08 11:26:22.000000000 +0100 @@ -19,10 +19,10 @@ # 'archive_version' differs from 'version' for RC version only -%define archive_version 2015.10-rc5 +%define archive_version 2015.10 Name: u-boot -Version: 2015.10~rc5 +Version: 2015.10 Release: 0 Summary: Tools for the u-boot Firmware License: GPL-2.0 ++++++ U-Boot-1-2-usb-host-xhci-omap-fix-build-break.patch ++++++ >From patchwork Thu Oct 1 19:22:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [U-Boot,1/2] usb: host: xhci-omap: fix build break From: Felipe Balbi <ba...@ti.com> X-Patchwork-Id: 525276 Message-Id: <1443727338-29320-1-git-send-email-ba...@ti.com> To: Tom Rini <tr...@konsulko.com> Cc: U-Boot Mailing List <u-b...@lists.denx.de> Date: Thu, 1 Oct 2015 14:22:17 -0500 Fix the following build break: drivers/usb/host/xhci-omap.c:35:5: error: ‘board_usb_init’ aliased to external symbol ‘__board_usb_init’ int board_usb_init(int index, enum usb_init_type init) ^ Signed-off-by: Felipe Balbi <ba...@ti.com> --- drivers/usb/host/xhci-omap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci-omap.c b/drivers/usb/host/xhci-omap.c index 104e7a7282cf..fd19f79f0fc5 100644 --- a/drivers/usb/host/xhci-omap.c +++ b/drivers/usb/host/xhci-omap.c @@ -27,7 +27,7 @@ DECLARE_GLOBAL_DATA_PTR; static struct omap_xhci omap; -inline int __board_usb_init(int index, enum usb_init_type init) +__weak int __board_usb_init(int index, enum usb_init_type init) { return 0; } ++++++ U-Boot-image.c-Fix-non-Android-booting-with-ramdisk-and-or-device-tree.patch ++++++ >From patchwork Tue Oct 27 23:06:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [U-Boot] image.c: Fix non-Android booting with ramdisk and/or device tree From: Tom Rini <tr...@konsulko.com> X-Patchwork-Id: 537133 Message-Id: <1445987203-23097-1-git-send-email-tr...@konsulko.com> To: u-b...@lists.denx.de Date: Tue, 27 Oct 2015 19:06:43 -0400 In 1fec3c5 I added a check that if we had an Android image we default to trying the kernel address for a ramdisk. However when we don't have an Android image buf is NULL and we oops here. Ensure that we have 'buf' to check first. Reported-by: elipe Balbi <ba...@ti.com> Signed-off-by: Tom Rini <tr...@konsulko.com> --- common/image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/image.c b/common/image.c index e607109..85c4f39 100644 --- a/common/image.c +++ b/common/image.c @@ -913,7 +913,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, * Look for an Android boot image. */ buf = map_sysmem(images->os.start, 0); - if (genimg_get_format(buf) == IMAGE_FORMAT_ANDROID) + if (buf && genimg_get_format(buf) == IMAGE_FORMAT_ANDROID) select = argv[0]; #endif ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.tWzkmY/_old 2015-11-08 11:26:22.000000000 +0100 +++ /var/tmp/diff_new_pack.tWzkmY/_new 2015-11-08 11:26:22.000000000 +0100 @@ -7,7 +7,7 @@ armv6_boards="rpi" # TI -armv7_boards="omap3_beagle omap4_panda am335x_evm pcm051_rev3" +armv7_boards="omap3_beagle omap4_panda am335x_evm pcm051_rev3 beagle_x15" # Exynos armv7_boards="$armv7_boards arndale snow spring odroid odroid-xu3" # Calxeda ++++++ u-boot-2015.10-rc5.tar.bz2 -> u-boot-2015.10.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/u-boot/u-boot-2015.10-rc5.tar.bz2 /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-2015.10.tar.bz2 differ: char 11, line 1 ++++++ u-boot.spec.in ++++++ --- /var/tmp/diff_new_pack.tWzkmY/_old 2015-11-08 11:26:22.000000000 +0100 +++ /var/tmp/diff_new_pack.tWzkmY/_new 2015-11-08 11:26:22.000000000 +0100 @@ -25,10 +25,10 @@ %define cuboxi_spl CUBOXI_SPL # archive_version differs from version for RC version only -%define archive_version 2015.10-rc5 +%define archive_version 2015.10 Name: u-boot-BOARDNAME -Version: 2015.10~rc5 +Version: 2015.10 Release: 0 Summary: The u-boot firmware for the BOARDNAME arm platform License: GPL-2.0 @@ -37,9 +37,10 @@ Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2 Source2: arndale-bl1.img Source300: u-boot-rpmlintrc -# Odroid patches -Patch10: 0001-odroid-replace-fatload-with-load-to-be-able-to-use-E.patch -Patch11: 0002-odroid-Add-boot-script-boot.scr-support.patch +# PATCH-FIX-UPSTREAM Fix build for beagle x15 +Patch1: U-Boot-1-2-usb-host-xhci-omap-fix-build-break.patch +# PATCH-FIX-UPSTREAM Fix am335x booting +Patch2: U-Boot-image.c-Fix-non-Android-booting-with-ramdisk-and-or-device-tree.patch # Marvell boards support is non-free licensed, and we don't need it (bnc#773824) Patch99: drop-marvell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -68,8 +69,8 @@ %prep %setup -q -n u-boot-%{archive_version} -%patch10 -p1 -%patch11 -p1 +%patch1 -p1 +%patch2 -p1 # is non-free licensed, and we don't need it (bnc#773824) rm -rf board/Marvell %patch99 -p1
