AllWinner devices booting from mSD/MMC

sunxi-fix-mmc0.patch

@@ -0,0 +1,41 @@
+From 6785434709b74b9a821a21e7228a4c9eb4843095 Mon Sep 17 00:00:00 2001
+From: Andre Przywara <andre.przywara@arm.com>
+Date: Fri, 16 Apr 2021 11:52:27 +0100
+Subject: [PATCH] sunxi: Bring back SD card as MMC device 0
+
+Commit 2243d19e5618 ("mmc: mmc-uclass: Use dev_seq() to read aliases
+node's index") now actually enforces U-Boot's device enumeration policy,
+where explicitly named devices come first, then any other non-named
+devices follow, without filling gaps.
+
+For quite a while we have had an "mmc1 = &mmc2;" alias in our
+sunxi-u-boot.dtsi, which now leads to the problem that the SD card
+(which was always mmc device 0) now gets to be number 2.
+This breaks quite some boot scripts, including our own distro boot
+commands, and some other features looking at $mmc_bootdev, also
+fastboot.
+
+Just add an explicit mmc0 alias in the very same file to fix this and
+restore the old behaviour.
+
+Signed-off-by: Andre Przywara <andre.przywara@arm.com>
+Reported-by: Samuel Holland <samuel@sholland.org>
+Tested-by: Simon Baatz <gmbnomis@gmail.com>
+---
+ arch/arm/dts/sunxi-u-boot.dtsi | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi
+index a4227a3c22..06da009fa2 100644
+--- a/arch/arm/dts/sunxi-u-boot.dtsi
++++ b/arch/arm/dts/sunxi-u-boot.dtsi
+@@ -12,6 +12,7 @@
+ 
+ / {
+ 	aliases {
++		mmc0 = &mmc0;
+ 		mmc1 = &mmc2;
+ 	};
+ 
+-- 
+GitLab

uboot-tools.spec

@@ -2,11 +2,12 @@
 
 Name:     uboot-tools
 Version:  2021.07
-Release:  0.3%{?candidate:.%{candidate}}%{?dist}
+Release:  0.4%{?candidate:.%{candidate}}%{?dist}
 Summary:  U-Boot utilities
 License:  GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
 URL:      http://www.denx.de/wiki/U-Boot
 
+ExcludeArch: s390x
 Source0:  ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2
 Source1:  arm-boards
 Source2:  arm-chromebooks
@@ -27,6 +28,7 @@ Patch11:  0001-Fix-BeagleAI-detection.patch
 # Rockchips improvements
 Patch12:  phy-rockchip-inno-usb2-fix-hang-when-multiple-controllers-exit.patch
 Patch13:  rockchip-fix-mmc-numbering.patch
+Patch14:  sunxi-fix-mmc0.patch
 
 BuildRequires:  bc
 BuildRequires:  dtc
@@ -253,6 +255,9 @@ cp -p board/warp7/README builds/docs/README.warp7
 %endif
 
 %changelog
+* Sat Jun 05 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.07-0.4.rc3
+- Fix AllWinner devices booting from mSD/MMC
+
 * Tue May 25 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.07-0.3.rc3
 - Update to 2021.07 RC3
 - Build against ATF 2.5 GA