Hello community,
here is the log from the commit of package u-boot for openSUSE:Factory checked in at 2015-08-10 09:16:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-08-01 11:35:51.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-a10-olinuxino-lime.changes 2015-08-10 09:16:08.000000000 +0200
@@ -1,0 +2,15 @@
+Thu Aug 6 12:40:58 UTC 2015 - guillaume@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 - dmueller@suse.com
+
+- add mx6cuboxi
+
+-------------------------------------------------------------------
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
u-boot-colibrit20.changes: same change
u-boot-cubieboard.changes: same change
u-boot-cubieboard2.changes: same change
u-boot-cubietruck.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
New Changes file:
--- /dev/null 2015-07-22 21:25:44.928025004 +0200
+++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-mx6cuboxi.changes 2015-08-10 09:16:09.000000000 +0200
@@ -0,0 +1,800 @@
+-------------------------------------------------------------------
+Thu Aug 6 12:40:58 UTC 2015 - guillaume@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 - dmueller@suse.com
+
+- add mx6cuboxi
+
+-------------------------------------------------------------------
+Wed Jul 22 22:38:23 UTC 2015 - afaerber@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 - afaerber@suse.de
+
+- Add u-boot-jetson-tk1
+
+-------------------------------------------------------------------
+Fri Jul 17 06:42:37 UTC 2015 - afaerber@suse.de
+
+- Add u-boot-merriia80optimus
+
+-------------------------------------------------------------------
+Wed Jul 15 13:05:24 UTC 2015 - guillaume@opensuse.org
+
+- Update to 2015.07
+
+-------------------------------------------------------------------
+Tue Jun 30 07:34:49 UTC 2015 - guillaume@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 - guillaume@opensuse.org
+
+- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi
+- Rework patches (to be upstreamable):
+ * enable_spl_ext_support_for_ti_armv7.patch
+ * mx53loco-bootscr.patch
+- Remove fix_beagle_spl_build.patch
+
+-------------------------------------------------------------------
+Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org
+
+- Update to 2015.07-rc2
+- Update drop-marvell.patch
+
+-------------------------------------------------------------------
+Wed May 27 10:07:49 UTC 2015 - guillaume@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 - dmueller@suse.com
+
+- adjust copyright headers
+
+-------------------------------------------------------------------
+Thu Apr 16 08:34:11 UTC 2015 - guillaume@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 - xxxxxmichl@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 - guillaume@opensuse.org
+
+- Remove u-boot-vexpressaemv8a (dropped upstream and we now use EFI)
+
+-------------------------------------------------------------------
+Thu Apr 2 09:13:49 UTC 2015 - guillaume@opensuse.org
+
+- update to 2015.04-rc5
+
+-------------------------------------------------------------------
+Mon Mar 23 08:39:40 UTC 2015 - guillaume@opensuse.org
+
+- update to 2015.04-rc4
+
+-------------------------------------------------------------------
+Wed Mar 4 15:51:55 UTC 2015 - guillaume@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 - guillaume@opensuse.org
+
+- update to 2015.04-rc3
+- update patch: drop-marvell.patch
+
+-------------------------------------------------------------------
+Thu Feb 26 16:48:35 UTC 2015 - guillaume@opensuse.org
+
+- Update add_snow_usb_boot.patch to boot on USB2 instead of USB3
+
+-------------------------------------------------------------------
+Wed Feb 25 15:47:07 UTC 2015 - guillaume@opensuse.org
+
+- Remove unneeded fix_snow_config.patch
+
+-------------------------------------------------------------------
+Tue Feb 24 09:48:50 UTC 2015 - guillaume@opensuse.org
+
+- Add rpi2 armv7 board
+
+-------------------------------------------------------------------
+Fri Feb 20 12:31:38 UTC 2015 - guillaume@opensuse.org
+
+- Update to 2015.04-rc2
+
+-------------------------------------------------------------------
+Fri Feb 20 10:04:14 UTC 2015 - guillaume@opensuse.org
+
+- Update to 2015.04-rc1
+ * Remove upstreamed patch pcm051-bootscr.patch
+ * Remove no more used patch fix_bootpart_snow_only.patch (now u-boot
+ scan all known partitions, so no need to set a different boot partition)
+
+-------------------------------------------------------------------
+Sun Jan 25 20:20:46 UTC 2015 - matwey.kornilov@gmail.com
+
+- Enable pcm051rev3 for Phytec Wega board
+ * Add pcm051-bootscr.patch: add bootscript support (upstreamed in 2015.04-rc1)
+
+-------------------------------------------------------------------
+Tue Jan 13 14:32:17 UTC 2015 - guillaume@opensuse.org
+
+- Update to 2015.01:
+ * Drop upstreamed patches:
+ - 0001-spl-mmc-Fix-raw-boot-mode-related-to-commit.patch
+ - fix_sata.patch
+ * Update partially upstreamed mx53loco-bootscr.patch
+
+-------------------------------------------------------------------
+Tue Dec 16 11:10:23 UTC 2014 - guillaume@opensuse.org
+
+- Backport SPL MMC raw boot mode fix:
+ * 0001-spl-mmc-Fix-raw-boot-mode-related-to-commit.patch
+
+-------------------------------------------------------------------
+Sat Dec 13 12:12:41 UTC 2014 - xxxxxmichl@googlemail.com
+
+- Added support for A20-OLinuXIno-LIME2 and A10-OLinuXino-LIME from
+ www.olimex.com
+
+-------------------------------------------------------------------
+Tue Dec 9 11:23:41 UTC 2014 - guillaume@opensuse.org
+
+- Rename XLOADER to OMAP_SPL in pre_checkin.sh and u-boot.spec.in
+
+-------------------------------------------------------------------
+Tue Dec 9 09:15:27 UTC 2014 - guillaume@opensuse.org
+
+- Update to 2015.01-rc3
+ * Drop upstreamed/unneeded patches:
+ - 0001-exynos-Enable-config_distro_defaults.h.patch
+ - 0002-exynos5-Use-config_distro_bootcmd.h.patch
+ - boot_mode_fallback.patch
+ - fix_snow_usb_support
+ - fix_spl_ext.patch
+ - fix_arm_hf_toolchain.patch
+ - origen-ext2.patch
+ * Update patch:
+ - fix_snow_config.patch
+ * Follow upstream: rpi_b config renamed to rpi
+
+-------------------------------------------------------------------
+Tue Dec 2 12:41:55 UTC 2014 - guillaume@opensuse.org
+
+- Update snow (chromebook)
+ * Update patch:
+ - fix_snow_config.patch patch
+ * Add patches:
+ - add_snow_usb_boot.patch to be able to boot from USB0
++++ 603 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-mx6cuboxi.changes
--- /work/SRC/openSUSE:Factory/u-boot/u-boot-mx6qsabrelite.changes 2015-08-01 11:35:51.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-mx6qsabrelite.changes 2015-08-10 09:16:09.000000000 +0200
@@ -1,0 +2,15 @@
+Thu Aug 6 12:40:58 UTC 2015 - guillaume@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 - dmueller@suse.com
+
+- add mx6cuboxi
+
+-------------------------------------------------------------------
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.changes: same change
Old:
----
mx53loco-bootscr.patch
u-boot-2015.07.tar.bz2
New:
----
u-boot-2015.10-rc1.tar.bz2
u-boot-mx6cuboxi.changes
u-boot-mx6cuboxi.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ u-boot-a10-olinuxino-lime.spec ++++++
--- /var/tmp/diff_new_pack.attFre/_old 2015-08-10 09:16:12.000000000 +0200
+++ /var/tmp/diff_new_pack.attFre/_new 2015-08-10 09:16:12.000000000 +0200
@@ -24,17 +24,19 @@
%define arndale_spl 0
%define cuboxi_spl 0
+# archive_version differs from version for RC version only
+%define archive_version 2015.10-rc1
+
Name: u-boot-a10-olinuxino-lime
-Version: 2015.07
+Version: 2015.10~rc1
Release: 0
Summary: The u-boot firmware for the a10-olinuxino-lime 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
+Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2
Source2: arndale-bl1.img
Source300: u-boot-rpmlintrc
-Patch1: mx53loco-bootscr.patch
Patch51: jetson-tk1-gpu-1.patch
Patch52: jetson-tk1-gpu-2.patch
# Marvell boards support is non-free licensed, and we don't need it (bnc#773824)
@@ -64,11 +66,10 @@
This package contains documentation for u-boot firmware
%prep
-%setup -q -n u-boot-%{version}
+%setup -q -n u-boot-%{archive_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 -p1
%patch51 -p1
%patch52 -p1
%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 ++++++
--- /var/tmp/diff_new_pack.attFre/_old 2015-08-10 09:16:12.000000000 +0200
+++ /var/tmp/diff_new_pack.attFre/_new 2015-08-10 09:16:12.000000000 +0200
@@ -24,17 +24,19 @@
%define arndale_spl 1
%define cuboxi_spl 0
+# archive_version differs from version for RC version only
+%define archive_version 2015.10-rc1
+
Name: u-boot-arndale
-Version: 2015.07
+Version: 2015.10~rc1
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
+Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2
Source2: arndale-bl1.img
Source300: u-boot-rpmlintrc
-Patch1: mx53loco-bootscr.patch
Patch51: jetson-tk1-gpu-1.patch
Patch52: jetson-tk1-gpu-2.patch
# Marvell boards support is non-free licensed, and we don't need it (bnc#773824)
@@ -64,11 +66,10 @@
This package contains documentation for u-boot firmware
%prep
-%setup -q -n u-boot-%{version}
+%setup -q -n u-boot-%{archive_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 -p1
%patch51 -p1
%patch52 -p1
%patch99 -p1
++++++ u-boot-bananapi.spec ++++++
--- /var/tmp/diff_new_pack.attFre/_old 2015-08-10 09:16:12.000000000 +0200
+++ /var/tmp/diff_new_pack.attFre/_new 2015-08-10 09:16:12.000000000 +0200
@@ -24,17 +24,19 @@
%define arndale_spl 0
%define cuboxi_spl 0
+# archive_version differs from version for RC version only
+%define archive_version 2015.10-rc1
+
Name: u-boot-bananapi
-Version: 2015.07
+Version: 2015.10~rc1
Release: 0
Summary: The u-boot firmware for the bananapi 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
+Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2
Source2: arndale-bl1.img
Source300: u-boot-rpmlintrc
-Patch1: mx53loco-bootscr.patch
Patch51: jetson-tk1-gpu-1.patch
Patch52: jetson-tk1-gpu-2.patch
# Marvell boards support is non-free licensed, and we don't need it (bnc#773824)
@@ -64,11 +66,10 @@
This package contains documentation for u-boot firmware
%prep
-%setup -q -n u-boot-%{version}
+%setup -q -n u-boot-%{archive_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 -p1
%patch51 -p1
%patch52 -p1
%patch99 -p1
u-boot-colibrit20.spec: same change
u-boot-cubieboard.spec: same change
u-boot-cubieboard2.spec: same change
u-boot-cubietruck.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 ++++++
#
# spec file for package u-boot-mx6cuboxi
#
# Copyright (c) 2015 SUSE LINUX 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
%define cuboxi_spl 1
# archive_version differs from version for RC version only
%define archive_version 2015.10-rc1
Name: u-boot-mx6cuboxi
Version: 2015.10~rc1
Release: 0
Summary: The u-boot firmware for the mx6cuboxi 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
Patch51: jetson-tk1-gpu-1.patch
Patch52: jetson-tk1-gpu-2.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-mx6cuboxi
Provides: x-loader-mx6cuboxi
%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 mx6cuboxi 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}
# 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
%patch51 -p1
%patch52 -p1
%patch99 -p1
%build
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" mx6cuboxi_defconfig
make %{?jobs:-j %jobs} CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes
%if "%{name}" == "u-boot-snow"
# Chromebook ARM (snow) 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.img %{buildroot}/boot/u-boot.img
elif [ -f u-boot-dtb.img ]; then
install -D -m 0644 u-boot-dtb.img %{buildroot}/boot/u-boot.img
else
install -D -m 0644 u-boot.img %{buildroot}/boot/u-boot.img
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-mx6qsabrelite.spec ++++++
--- /var/tmp/diff_new_pack.attFre/_old 2015-08-10 09:16:12.000000000 +0200
+++ /var/tmp/diff_new_pack.attFre/_new 2015-08-10 09:16:12.000000000 +0200
@@ -24,17 +24,19 @@
%define arndale_spl 0
%define cuboxi_spl 0
+# archive_version differs from version for RC version only
+%define archive_version 2015.10-rc1
+
Name: u-boot-mx6qsabrelite
-Version: 2015.07
+Version: 2015.10~rc1
Release: 0
Summary: The u-boot firmware for the mx6qsabrelite 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
+Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2
Source2: arndale-bl1.img
Source300: u-boot-rpmlintrc
-Patch1: mx53loco-bootscr.patch
Patch51: jetson-tk1-gpu-1.patch
Patch52: jetson-tk1-gpu-2.patch
# Marvell boards support is non-free licensed, and we don't need it (bnc#773824)
@@ -64,11 +66,10 @@
This package contains documentation for u-boot firmware
%prep
-%setup -q -n u-boot-%{version}
+%setup -q -n u-boot-%{archive_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 -p1
%patch51 -p1
%patch52 -p1
%patch99 -p1
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.spec ++++++
--- /var/tmp/diff_new_pack.attFre/_old 2015-08-10 09:16:13.000000000 +0200
+++ /var/tmp/diff_new_pack.attFre/_new 2015-08-10 09:16:13.000000000 +0200
@@ -18,14 +18,17 @@
#
+# 'archive_version' differs from 'version' for RC version only
+%define archive_version 2015.10-rc1
+
Name: u-boot
-Version: 2015.07
+Version: 2015.10~rc1
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: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}.tar.bz2
+Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2
BuildRequires: libopenssl-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -45,7 +48,7 @@
mkimage- a tool that creates kernel bootable images for u-boot.
%prep
-%setup -q -n u-boot-%{version}
+%setup -q -n u-boot-%{archive_version}
%build
# needed for include/config/auto.conf
++++++ jetson-tk1-gpu-1.patch ++++++
--- /var/tmp/diff_new_pack.attFre/_old 2015-08-10 09:16:13.000000000 +0200
+++ /var/tmp/diff_new_pack.attFre/_new 2015-08-10 09:16:13.000000000 +0200
@@ -1,7 +1,10 @@
-From 725f074af5cf1eb5ec3e6fae8bf4fb12474b5c15 Mon Sep 17 00:00:00 2001
+>From 5f49fb7ed89bd75e77bda5353877e85fbe921866 Mon Sep 17 00:00:00 2001
From: Alexandre Courbot
Date: Thu, 9 Jul 2015 16:33:00 +0900
Subject: [PATCH 1/2] ARM: tegra: move VPR configuration to a later stage
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
U-boot is responsible for enabling the GPU DT node after all necessary
configuration (VPR setup for T124) is performed. In order to be able to
@@ -15,27 +18,31 @@
Signed-off-by: Alexandre Courbot
Cc: Stephen Warren
Cc: Tom Warren
+Signed-off-by: Tom Warren
+(cherry picked from commit bd2787143ef5f73d74c8376e32d38ec05b712162)
+Signed-off-by: Andreas Färber
---
arch/arm/include/asm/arch-tegra/ap.h | 9 ---------
arch/arm/include/asm/arch-tegra/gpu.h | 27 +++++++++++++++++++++++++++
- arch/arm/mach-tegra/Makefile | 2 +-
+ arch/arm/mach-tegra/Makefile | 4 +---
arch/arm/mach-tegra/ap.c | 3 ---
arch/arm/mach-tegra/board2.c | 3 +++
arch/arm/mach-tegra/{vpr.c => gpu.c} | 18 +++++++++++++++---
include/configs/tegra124-common.h | 3 +++
- 7 files changed, 49 insertions(+), 16 deletions(-)
+ include/configs/tegra210-common.h | 3 +++
+ 8 files changed, 52 insertions(+), 18 deletions(-)
create mode 100644 arch/arm/include/asm/arch-tegra/gpu.h
rename arch/arm/mach-tegra/{vpr.c => gpu.c} (80%)
diff --git a/arch/arm/include/asm/arch-tegra/ap.h b/arch/arm/include/asm/arch-tegra/ap.h
-index ca40e4e..2d58271 100644
+index 76773b7..8c2586c 100644
--- a/arch/arm/include/asm/arch-tegra/ap.h
+++ b/arch/arm/include/asm/arch-tegra/ap.h
-@@ -66,15 +66,6 @@ int tegra_get_sku_info(void);
+@@ -64,15 +64,6 @@ int tegra_get_sku_info(void);
/* Do any chip-specific cache config */
void config_cache(void);
--#if defined(CONFIG_TEGRA124)
+-#if defined(CONFIG_TEGRA124) || defined(CONFIG_TEGRA210)
-/* Do chip-specific vpr config */
-void config_vpr(void);
-#else
@@ -81,23 +88,25 @@
+
+#endif /* CONFIG_TEGRA_GPU */
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
-index fefc180..f6f5583 100644
+index 0db8ee0..75924ad 100644
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
-@@ -24,7 +24,7 @@ obj-y += pinmux-common.o
+@@ -24,9 +24,7 @@ obj-y += pinmux-common.o
obj-y += powergate.o
obj-y += xusb-padctl.o
obj-$(CONFIG_DISPLAY_CPUINFO) += sys_info.o
+-#TCW Fix this to use a common config switch (CONFIG_LOCK_VPR?)
-obj-$(CONFIG_TEGRA124) += vpr.o
+-obj-$(CONFIG_TEGRA210) += vpr.o
+obj-$(CONFIG_TEGRA_GPU) += gpu.o
obj-$(CONFIG_TEGRA_CLOCK_SCALING) += emc.o
ifndef CONFIG_SPL_BUILD
diff --git a/arch/arm/mach-tegra/ap.c b/arch/arm/mach-tegra/ap.c
-index 0b94e8a..70613f9 100644
+index e62dda5..b4229f4 100644
--- a/arch/arm/mach-tegra/ap.c
+++ b/arch/arm/mach-tegra/ap.c
-@@ -218,7 +218,4 @@ void s_init(void)
+@@ -226,8 +226,5 @@ void s_init(void)
/* enable SMMU */
smmu_enable();
@@ -105,8 +114,9 @@
- /* init vpr */
- config_vpr();
}
+ #endif
diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
-index ce9b695..1d7c5ef 100644
+index 36bcfb0..4e73d1a 100644
--- a/arch/arm/mach-tegra/board2.c
+++ b/arch/arm/mach-tegra/board2.c
@@ -29,6 +29,7 @@
@@ -169,7 +179,7 @@
+ return _configured;
}
diff --git a/include/configs/tegra124-common.h b/include/configs/tegra124-common.h
-index 1aee5c8..a05d2b5 100644
+index af7698d..39e74f0 100644
--- a/include/configs/tegra124-common.h
+++ b/include/configs/tegra124-common.h
@@ -70,4 +70,7 @@
@@ -180,6 +190,18 @@
+#define CONFIG_TEGRA_GPU
+
#endif /* _TEGRA124_COMMON_H_ */
+diff --git a/include/configs/tegra210-common.h b/include/configs/tegra210-common.h
+index 0348d47..d95056c 100644
+--- a/include/configs/tegra210-common.h
++++ b/include/configs/tegra210-common.h
+@@ -73,4 +73,7 @@
+ #define CONFIG_USB_EHCI_TXFIFO_THRESH 0x10
+ #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 1
+
++/* GPU needs setup */
++#define CONFIG_TEGRA_GPU
++
+ #endif /* _TEGRA210_COMMON_H_ */
--
2.1.4
++++++ jetson-tk1-gpu-2.patch ++++++
--- /var/tmp/diff_new_pack.attFre/_old 2015-08-10 09:16:13.000000000 +0200
+++ /var/tmp/diff_new_pack.attFre/_new 2015-08-10 09:16:13.000000000 +0200
@@ -1,37 +1,46 @@
-From ccd0031954e959dc6bd1062ab1b7919c51ba4847 Mon Sep 17 00:00:00 2001
+>From 59676ad5a44e83eecf4a2ed5d5b9b87e22e2d7de Mon Sep 17 00:00:00 2001
From: Alexandre Courbot
Date: Thu, 9 Jul 2015 16:33:01 +0900
Subject: [PATCH 2/2] ARM: tegra: enable GPU DT node when appropriate
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
-T124 requires some specific configuration (VPR setup) to be performed by
-the bootloader before the GPU can be used. For this reason, the GPU node
-in the device tree is disabled by default. This patch enables the node
-if U-boot has performed VPR configuration.
+T124/210 requires some specific configuration (VPR setup) to
+be performed by the bootloader before the GPU can be used.
+For this reason, the GPU node in the device tree is disabled
+by default. This patch enables the node if U-boot has performed
+VPR configuration.
-Boards enabled by this patch are T124's Jetson TK1 and Venice 2.
+Boards enabled by this patch are T124's Jetson TK1 and Venice2
+and T210's P2571.
Signed-off-by: Alexandre Courbot
Cc: Stephen Warren
Cc: Tom Warren
+Signed-off-by: Tom Warren
+(cherry picked from commit caa6770fca0ed491a6c9e7f3993c02a627b898e2)
+Signed-off-by: Andreas Färber
---
- arch/arm/include/asm/arch-tegra/gpu.h | 16 ++++++++++++++++
+ arch/arm/include/asm/arch-tegra/gpu.h | 15 +++++++++++++++
arch/arm/mach-tegra/gpu.c | 19 +++++++++++++++++++
board/nvidia/jetson-tk1/jetson-tk1.c | 8 ++++++++
+ board/nvidia/p2571/p2571.c | 7 +++++++
board/nvidia/venice2/venice2.c | 8 ++++++++
include/configs/jetson-tk1.h | 2 ++
+ include/configs/p2571.h | 1 +
include/configs/venice2.h | 2 ++
- 6 files changed, 55 insertions(+)
+ 8 files changed, 62 insertions(+)
diff --git a/arch/arm/include/asm/arch-tegra/gpu.h b/arch/arm/include/asm/arch-tegra/gpu.h
-index b347a21..eac73ed 100644
+index b347a21..52280f4 100644
--- a/arch/arm/include/asm/arch-tegra/gpu.h
+++ b/arch/arm/include/asm/arch-tegra/gpu.h
-@@ -25,3 +25,19 @@ static inline bool gpu_configured(void)
+@@ -25,3 +25,18 @@ static inline bool gpu_configured(void)
}
#endif /* CONFIG_TEGRA_GPU */
+
-+
+#if defined(CONFIG_OF_LIBFDT)
+
+int gpu_enable_node(void *blob, const char *gpupath);
@@ -45,7 +54,7 @@
+
+#endif /* CONFIG_OF_LIBFDT */
+
-+#endif
++#endif /* __ASM_ARCH_TEGRA_GPU_H */
diff --git a/arch/arm/mach-tegra/gpu.c b/arch/arm/mach-tegra/gpu.c
index b2fa50b..4ea046d 100644
--- a/arch/arm/mach-tegra/gpu.c
@@ -96,6 +105,28 @@
+
+ return 0;
+}
+diff --git a/board/nvidia/p2571/p2571.c b/board/nvidia/p2571/p2571.c
+index fc710c1..6ec9159 100644
+--- a/board/nvidia/p2571/p2571.c
++++ b/board/nvidia/p2571/p2571.c
+@@ -8,6 +8,7 @@
+ #include
+ #include
+ #include
++#include
+ #include "pinmux-config-p2571.h"
+
+ /*
+@@ -27,3 +28,9 @@ void pinmux_init(void)
+ pinmux_config_drvgrp_table(p2571_drvgrps,
+ ARRAY_SIZE(p2571_drvgrps));
+ }
++
++int ft_board_setup(void *blob, bd_t *bd)
++{
++ gpu_enable_node(blob, "/gpu@0,57000000");
++ return 0;
++}
diff --git a/board/nvidia/venice2/venice2.c b/board/nvidia/venice2/venice2.c
index c56ef12..3e2b9a7 100644
--- a/board/nvidia/venice2/venice2.c
@@ -130,6 +161,17 @@
+#define CONFIG_OF_BOARD_SETUP
+
#endif /* __CONFIG_H */
+diff --git a/include/configs/p2571.h b/include/configs/p2571.h
+index 77faf5f..1bf4d98 100644
+--- a/include/configs/p2571.h
++++ b/include/configs/p2571.h
+@@ -71,5 +71,6 @@
+ #include "tegra-common-post.h"
+
+ #define COUNTER_FREQUENCY 38400000
++#define CONFIG_OF_BOARD_SETUP
+
+ #endif /* _P2571_H */
diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index 1d9d053..bc5080a 100644
--- a/include/configs/venice2.h
++++++ pre_checkin.sh ++++++
--- /var/tmp/diff_new_pack.attFre/_old 2015-08-10 09:16:13.000000000 +0200
+++ /var/tmp/diff_new_pack.attFre/_new 2015-08-10 09:16:13.000000000 +0200
@@ -5,7 +5,7 @@
ARCH_RESTRICTIONS="$3 $4"
armv6_boards="rpi"
-armv7_boards="omap3_beagle omap4_panda am335x_evm arndale highbank mx53loco mx6qsabrelite Bananapi Cubieboard Cubieboard2 Cubietruck Mele_A1000 colibri_t20 paz00 snow A10-OLinuXino-Lime A20-OLinuXino-Lime2 pcm051_rev3 rpi_2 A20-OLinuXino-Lime A13-OLinuXinoM A13-OLinuXino A20-OLinuXino_MICRO Merrii_A80_Optimus jetson-tk1"
+armv7_boards="omap3_beagle omap4_panda am335x_evm arndale highbank mx53loco mx6cuboxi mx6qsabrelite Bananapi Cubieboard Cubieboard2 Cubietruck Mele_A1000 colibri_t20 paz00 snow A10-OLinuXino-Lime A20-OLinuXino-Lime2 pcm051_rev3 rpi_2 A20-OLinuXino-Lime A13-OLinuXinoM A13-OLinuXino A20-OLinuXino_MICRO Merrii_A80_Optimus jetson-tk1"
aarch64_boards=""
if [ ! "$1" -o ! "$2" -o ! "$3" ]; then
@@ -39,21 +39,34 @@
ARNDALE_SPL=0
CUBOXI_SPL=0
case "$BOARDCONFIG" in
-mx53loco*|mx6qsabrelite*|efika*) BINEND=imx ;;
+mx53loco*|mx6qsabrelite*|efika*)
+ BINEND=imx
+ ;;
*omap*|*am335x*|pcm051*) BINEND=img
OMAP_SPL=1 ;;
*arndale*) BINEND=bin
ARNDALE_SPL=1 ;;
-*Bananapi*|*Cubieboard*|Cubietruck*|*-OLinuXino*) BINEND=img
- SUNXI_SPL=1 ;;
-*Mele_A1000*) BINEND=img
- SUNXI_SPL=1 ;;
-*Hyundai_A7HD*) BINEND=img
- SUNXI_SPL=1 ;;
-*snow*) BINEND=img ;;
-mx6_cubox-i*) BINEND=img
- CUBOXI_SPL=1 ;;
-*) BINEND=bin ;;
+*Bananapi*|*Cubieboard*|Cubietruck*|*-OLinuXino*)
+ BINEND=img
+ SUNXI_SPL=1
+ ;;
+*Mele_A1000*)
+ BINEND=img
+ SUNXI_SPL=1
+ ;;
+*Hyundai_A7HD*)
+ BINEND=img
+ SUNXI_SPL=1
+ ;;
+*snow*)
+ BINEND=img
+ ;;
+mx6cuboxi*)
+ BINEND=img
+ CUBOXI_SPL=1
+ ;;
+
+*) BINEND=bin ;;
esac
sed "s/BOARDCONFIG/$BOARDCONFIG/g
++++++ u-boot.spec.in ++++++
--- /var/tmp/diff_new_pack.attFre/_old 2015-08-10 09:16:13.000000000 +0200
+++ /var/tmp/diff_new_pack.attFre/_new 2015-08-10 09:16:13.000000000 +0200
@@ -24,17 +24,19 @@
%define arndale_spl ARNDALE_SPL
%define cuboxi_spl CUBOXI_SPL
+# archive_version differs from version for RC version only
+%define archive_version 2015.10-rc1
+
Name: u-boot-BOARDNAME
-Version: 2015.07
+Version: 2015.10~rc1
Release: 0
Summary: The u-boot firmware for the BOARDNAME 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
+Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2
Source2: arndale-bl1.img
Source300: u-boot-rpmlintrc
-Patch1: mx53loco-bootscr.patch
Patch51: jetson-tk1-gpu-1.patch
Patch52: jetson-tk1-gpu-2.patch
# Marvell boards support is non-free licensed, and we don't need it (bnc#773824)
@@ -64,11 +66,10 @@
This package contains documentation for u-boot firmware
%prep
-%setup -q -n u-boot-%{version}
+%setup -q -n u-boot-%{archive_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 -p1
%patch51 -p1
%patch52 -p1
%patch99 -p1