2021.07 RC4

This commit is contained in:
Peter Robinson 2021-06-07 16:44:07 +01:00
parent 6c925bc315
commit 52be77ca6b
3 changed files with 6 additions and 45 deletions

View File

@ -1 +1 @@
SHA512 (u-boot-2021.07-rc3.tar.bz2) = 11d4f7ab96ac4a430ed39a0d13788c32f4a8b1657cd71f00d27ea1c87047f48ed85055e4ceca940912301d15f3f1448af442b3011c290eddf8c72ee8d4a7d437
SHA512 (u-boot-2021.07-rc4.tar.bz2) = 43d6b6106aa075f9834f425710215eac2285108a845a80e29582a0425e006478594744806c3892b2d27fbeaba34d324d2cfdc149ce059cbf22ee76746ff66151

View File

@ -1,41 +0,0 @@
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

View File

@ -1,8 +1,8 @@
%global candidate rc3
%global candidate rc4
Name: uboot-tools
Version: 2021.07
Release: 0.4%{?candidate:.%{candidate}}%{?dist}
Release: 0.5%{?candidate:.%{candidate}}%{?dist}
Summary: U-Boot utilities
License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
URL: http://www.denx.de/wiki/U-Boot
@ -28,7 +28,6 @@ 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
@ -255,6 +254,9 @@ cp -p board/warp7/README builds/docs/README.warp7
%endif
%changelog
* Mon Jun 07 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.07-0.5.rc4
- Update to 2021.07 RC4
* Sat Jun 05 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2021.07-0.4.rc3
- Fix AllWinner devices booting from mSD/MMC