Hello community,
here is the log from the commit of package u-boot for openSUSE:Factory checked
in at 2016-02-18 11:07:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2016-02-17 12:25:42.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-a10-olinuxino-lime.changes
2016-02-18 12:36:38.000000000 +0100
@@ -1,0 +2,12 @@
+Wed Feb 17 08:16:15 UTC 2016 - guilla...@opensuse.org
+
+- Add a patch to fix boot on partition when raw boot mode is also
+ available:
+ * 0001-spl-if-MMCSD_MODE_RAW-fails-try-MMCSD_MODE_FS-if-ava.patch
+
+-------------------------------------------------------------------
+Wed Feb 17 08:15:52 UTC 2016 - guilla...@opensuse.org
+
+- Add am335x_boneblack
+
+-------------------------------------------------------------------
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
New Changes file:
--- /dev/null 2016-01-27 19:41:03.648095915 +0100
+++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-am335xboneblack.changes
2016-02-18 12:36:38.000000000 +0100
@@ -0,0 +1,994 @@
+-------------------------------------------------------------------
+Wed Feb 17 08:16:15 UTC 2016 - guilla...@opensuse.org
+
+- Add a patch to fix boot on partition when raw boot mode is also
+ available:
+ * 0001-spl-if-MMCSD_MODE_RAW-fails-try-MMCSD_MODE_FS-if-ava.patch
+
+-------------------------------------------------------------------
+Wed Feb 17 08:15:52 UTC 2016 - guilla...@opensuse.org
+
+- Add am335x_boneblack
+
+-------------------------------------------------------------------
+Sat Feb 13 14:56:43 UTC 2016 - afaer...@suse.de
+
+- Enable Hyundai_A7HD, superseding :Contrib:sunxi package
+
+-------------------------------------------------------------------
+Thu Feb 9 13:02:26 UTC 2016 - afaer...@suse.de
+
+- Adjust installation path for qemu-ppce500 to replace qemu-ppc's
+* Pull in qemu (not qemu-ppc) for directory ownership
+
+-------------------------------------------------------------------
+Tue Feb 9 00:03:18 UTC 2016 - afaer...@suse.de
+
+- Add Jetson TX1 board (p2371-2180)
+- Fix indentation of last Patch line in .spec.in to match .spec
+
+-------------------------------------------------------------------
+Mon Feb 1 19:35:45 UTC 2016 - ag...@suse.com
+
+- Add patch to fix exynos armv7 kvm support
+ * adds u-boot-exynos.patch
+
+-------------------------------------------------------------------
+Tue Jan 19 14:15:58 UTC 2016 - afaer...@suse.de
+
+- Prepare for non-/boot installation directories
+* For /boot/vc pull in raspberrypi-firmware package
+
+-------------------------------------------------------------------
+Fri Jan 15 21:19:43 UTC 2016 - os...@naiandei.net
+
+- Add udoo (dual and quad) boards
+ * adds 0001-udoo-use-load-instead-of-fatload.patch
+
+-------------------------------------------------------------------
+Thu Jan 14 15:43:36 UTC 2016 - afaer...@suse.de
+
+- Add qemu-ppce500, to replace u-boot.e500 blob in qemu package
+* Override CROSS_COMPILE variable to use native gcc
+
+-------------------------------------------------------------------
+Wed Jan 13 14:07:32 UTC 2016 - guilla...@opensuse.org
+
+- Update to 2016.01
+
+-------------------------------------------------------------------
+Mon Jan 11 11:08:50 UTC 2016 - guilla...@opensuse.org
+
+- Update to 2016.01-rc4
+
+-------------------------------------------------------------------
+Mon Dec 28 13:50:10 UTC 2015 - guilla...@opensuse.org
+
+- Update to 2016.01-rc3
+
+-------------------------------------------------------------------
+Sun Dec 20 20:56:54 UTC 2015 - afaer...@suse.de
+
+- Suppress stripping debug info - it affects u-boot-jetson-tk1
+- Install rpi and rpi2 binaries to /boot/vc
+
+-------------------------------------------------------------------
+Tue Dec 15 09:27:03 UTC 2015 - guilla...@opensuse.org
+
+- Backport U-Boot-am335x_evm-Don-t-undef-CONFIG_BOOTDELAY.patch
+ to fix bootdelay on Beaglebone board
+
+-------------------------------------------------------------------
+Tue Dec 15 09:15:30 UTC 2015 - guilla...@opensuse.org
+
+- Add orangepi_pc board
+
+-------------------------------------------------------------------
+Fri Dec 11 09:23:17 UTC 2015 - guilla...@opensuse.org
+
+- Add support to am57xx_evm (beagle_x15 with u-boot DT)
+
+-------------------------------------------------------------------
+Fri Dec 11 09:08:25 UTC 2015 - guilla...@opensuse.org
+
+- Update to 2016.01-rc2:
+- Rename 'beagle_x15' to 'am57xx_evm_nodt' to follow upstream
+- Remove upstreamed patch:
+ * U-Boot-1-2-usb-host-xhci-omap-fix-build-break.patch
+
+-------------------------------------------------------------------
+Wed Nov 25 09:38:56 UTC 2015 - guilla...@opensuse.org
+
+- Update to 2016.01-rc1
+- Remove upstreamed patches:
+ * 0001-configs-Use-config_distro_defaults.h-in-ti_armv7_com.patch
+ * 0001-mx6cuboxi-use-load-instead-of-fatload.patch (no more needed)
+ *
U-Boot-image.c-Fix-non-Android-booting-with-ramdisk-and-or-device-tree.patch
+- Update drop-marvell.patch
+
+-------------------------------------------------------------------
+Sun Nov 15 13:11:56 UTC 2015 - matwey.korni...@gmail.com
+
+- Backport 0001-configs-Use-config_distro_defaults.h-in-ti_armv7_com.patch
+
+-------------------------------------------------------------------
+Sat Nov 14 15:03:05 UTC 2015 - tbecht...@suse.com
+
+- 0001-mx6cuboxi-use-load-instead-of-fatload.patch
+ for cubox-i use load instead of fatload
+
+-------------------------------------------------------------------
+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
++++ 797 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-am335xboneblack.changes
--- /work/SRC/openSUSE:Factory/u-boot/u-boot-am335xevm.changes 2016-02-17
12:25:42.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.u-boot.new/u-boot-am335xevm.changes
2016-02-18 12:36:38.000000000 +0100
@@ -1,0 +2,12 @@
+Wed Feb 17 08:16:15 UTC 2016 - guilla...@opensuse.org
+
+- Add a patch to fix boot on partition when raw boot mode is also
+ available:
+ * 0001-spl-if-MMCSD_MODE_RAW-fails-try-MMCSD_MODE_FS-if-ava.patch
+
+-------------------------------------------------------------------
+Wed Feb 17 08:15:52 UTC 2016 - guilla...@opensuse.org
+
+- Add am335x_boneblack
+
+-------------------------------------------------------------------
u-boot-am57xxevm.changes: same change
u-boot-am57xxevmnodt.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-firefly-rk3288.changes: same change
u-boot-highbank.changes: same change
u-boot-hyundaia7hd.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-orangepipc.changes: same change
u-boot-p2371-2180.changes: same change
u-boot-paz00.changes: same change
u-boot-pcm051rev3.changes: same change
u-boot-qemu-ppce500.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-udoo.changes: same change
u-boot.changes: same change
New:
----
0001-spl-if-MMCSD_MODE_RAW-fails-try-MMCSD_MODE_FS-if-ava.patch
u-boot-am335xboneblack.changes
u-boot-am335xboneblack.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ u-boot-a10-olinuxino-lime.spec ++++++
--- /var/tmp/diff_new_pack.61NnW6/_old 2016-02-18 12:36:41.000000000 +0100
+++ /var/tmp/diff_new_pack.61NnW6/_new 2016-02-18 12:36:41.000000000 +0100
@@ -44,6 +44,8 @@
Patch2: 0001-udoo-use-load-instead-of-fatload.patch
# Fix exynos KVM support
Patch3: u-boot-exynos.patch
+# PATCH-FIX-UPSTREAM fix boot on partition when RAW mode is also available
+Patch4: 0001-spl-if-MMCSD_MODE_RAW-fails-try-MMCSD_MODE_FS-if-ava.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
@@ -84,6 +86,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -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-am335xboneblack.spec ++++++
#
# spec file for package u-boot-am335xboneblack
#
# Copyright (c) 2016 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 1
%define origen_spl 0
%define sunxi_spl 0
%define arndale_spl 0
%define cuboxi_spl 0
%define udoo_spl 0
# archive_version differs from version for RC version only
%define archive_version 2016.01
Name: u-boot-am335xboneblack
Version: 2016.01
Release: 0
Summary: The u-boot firmware for the am335xboneblack 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
# Backport UPSTREAM patch: Fix bootdelay on Beaglebone board
Patch1: U-Boot-am335x_evm-Don-t-undef-CONFIG_BOOTDELAY.patch
# PATCH-FIX-UPSTREAM udoo-fix-fatload.patch -- fix udoo booting
Patch2: 0001-udoo-use-load-instead-of-fatload.patch
# Fix exynos KVM support
Patch3: u-boot-exynos.patch
# PATCH-FIX-UPSTREAM fix boot on partition when RAW mode is also available
Patch4: 0001-spl-if-MMCSD_MODE_RAW-fails-try-MMCSD_MODE_FS-if-ava.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
%if "%{name}" == "u-boot-qemu-ppce500"
# Owns /usr/share/qemu directory
BuildRequires: qemu
Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500
%endif
%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2"
# Owns /boot/vc directory
BuildRequires: raspberrypi-firmware
%endif
Provides: u-boot-loader
Conflicts: otherproviders(u-boot-loader)
%if %x_loader == 1
Obsoletes: x-loader-am335xboneblack
Provides: x-loader-am335xboneblack
%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 am335xboneblack 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
%patch3 -p1
%patch4 -p1
# is non-free licensed, and we don't need it (bnc#773824)
rm -rf board/Marvell
%patch99 -p1
%build
make %{?jobs:-j %jobs} CROSS_COMPILE= CFLAGS="$RPM_OPT_FLAGS"
am335x_boneblack_defconfig
make %{?jobs:-j %jobs} CROSS_COMPILE= 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
export NO_BRP_STRIP_DEBUG=true
export NO_DEBUGINFO_STRIP_DEBUG=true
%define uboot_dir /boot
%if "%{name}" == "u-boot-rpi" || "%{name}" == "u-boot-rpi2"
%define uboot_dir /boot/vc
%endif
%if "%{name}" == "u-boot-qemu-ppce500"
%define uboot_dir %{_datadir}/qemu
%endif
%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}%{uboot_dir}/u-boot.img
elif [ -f u-boot-dtb.img ]; then
install -D -m 0644 u-boot-dtb.img %{buildroot}%{uboot_dir}/u-boot.img
else
install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img
fi
%if "%{name}" == "u-boot-qemu-ppce500"
mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500
%endif
%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
%if %udoo_spl == 1
install -D -m 0755 SPL %{buildroot}/boot/udoo_spl.bin
%endif
%files
%defattr(-,root,root)
%{uboot_dir}/*
%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-am335xevm.spec ++++++
--- /var/tmp/diff_new_pack.61NnW6/_old 2016-02-18 12:36:42.000000000 +0100
+++ /var/tmp/diff_new_pack.61NnW6/_new 2016-02-18 12:36:42.000000000 +0100
@@ -44,6 +44,8 @@
Patch2: 0001-udoo-use-load-instead-of-fatload.patch
# Fix exynos KVM support
Patch3: u-boot-exynos.patch
+# PATCH-FIX-UPSTREAM fix boot on partition when RAW mode is also available
+Patch4: 0001-spl-if-MMCSD_MODE_RAW-fails-try-MMCSD_MODE_FS-if-ava.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
@@ -84,6 +86,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
# is non-free licensed, and we don't need it (bnc#773824)
rm -rf board/Marvell
%patch99 -p1
u-boot-am57xxevm.spec: same change
u-boot-am57xxevmnodt.spec: same change
u-boot-arndale.spec: same change
u-boot-bananapi.spec: same change
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-firefly-rk3288.spec: same change
u-boot-highbank.spec: same change
u-boot-hyundaia7hd.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: same change
u-boot-mx6qsabrelite.spec: same change
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-orangepipc.spec: same change
u-boot-p2371-2180.spec: same change
u-boot-paz00.spec: same change
u-boot-pcm051rev3.spec: same change
u-boot-qemu-ppce500.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-udoo.spec: same change
++++++ 0001-spl-if-MMCSD_MODE_RAW-fails-try-MMCSD_MODE_FS-if-ava.patch ++++++
>From b9cd982f5a044bec6f9da479e29b51f2de6478dd Mon Sep 17 00:00:00 2001
From: Guillaume GARDET <guillaume.gar...@free.fr>
Date: Wed, 17 Feb 2016 08:58:27 +0100
Subject: [PATCH] spl: if MMCSD_MODE_RAW fails, try MMCSD_MODE_FS, if available
Since commit fd61d39970b9901217efc7536d9f3a61b4e1752a:
spl: mmc: add break statements in spl_mmc_load_image()
RAW and FS boot modes are now exclusive again. So, if MMCSD_MODE_RAW fails, the
board hangs. This patch allows to try MMCSD_MODE_FS then, if available.
It has been tested on a beaglebone black to boot on an EXT partition.
Signed-off-by: Guillaume GARDET <guillaume.gar...@free.fr>
Cc: Tom Rini <tr...@konsulko.com>
Cc: Nikita Kiryanov <nik...@compulab.co.il>
Cc: Igor Grinberg <grinb...@compulab.co.il>
Cc: Paul Kocialkowski <cont...@paulk.fr>
Cc: Pantelis Antoniou <pa...@antoniou-consulting.com>
Cc: Simon Glass <s...@chromium.org>
Cc: Matwey V. Kornilov <matwey.korni...@gmail.com>
---
common/spl/spl_mmc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index c3931c6..2eef0f2 100644
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -284,7 +284,7 @@ int spl_mmc_load_image(u32 boot_device)
if (!err)
return err;
#endif
- break;
+ /* Fall through */
case MMCSD_MODE_FS:
debug("spl: mmc boot mode: fs\n");
--
1.8.4.5
++++++ pre_checkin.sh ++++++
--- /var/tmp/diff_new_pack.61NnW6/_old 2016-02-18 12:36:42.000000000 +0100
+++ /var/tmp/diff_new_pack.61NnW6/_new 2016-02-18 12:36:42.000000000 +0100
@@ -7,7 +7,7 @@
armv6_boards="rpi"
# TI
-armv7_boards="omap3_beagle omap4_panda am335x_evm pcm051_rev3 am57xx_evm
am57xx_evm_nodt"
+armv7_boards="omap3_beagle omap4_panda am335x_evm am335x_boneblack pcm051_rev3
am57xx_evm am57xx_evm_nodt"
# Exynos
armv7_boards="$armv7_boards arndale snow spring odroid odroid-xu3"
# Calxeda
++++++ u-boot.spec.in ++++++
--- /var/tmp/diff_new_pack.61NnW6/_old 2016-02-18 12:36:43.000000000 +0100
+++ /var/tmp/diff_new_pack.61NnW6/_new 2016-02-18 12:36:43.000000000 +0100
@@ -44,6 +44,8 @@
Patch2: 0001-udoo-use-load-instead-of-fatload.patch
# Fix exynos KVM support
Patch3: u-boot-exynos.patch
+# PATCH-FIX-UPSTREAM fix boot on partition when RAW mode is also available
+Patch4: 0001-spl-if-MMCSD_MODE_RAW-fails-try-MMCSD_MODE_FS-if-ava.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
@@ -84,6 +86,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
# is non-free licensed, and we don't need it (bnc#773824)
rm -rf board/Marvell
%patch99 -p1
