From: Andre Przywara Date: Fri, 16 Apr 2021 10:52:27 +0000 (+0100) Subject: sunxi: Bring back SD card as MMC device 0 X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=6785434709b74b9a821a21e7228a4c9eb4843095;p=u-boot.git 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 Reported-by: Samuel Holland Tested-by: Simon Baatz --- 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; };