Commit fa68645b authored by Tom Rini's avatar Tom Rini
Browse files

Merge https://source.denx.de/u-boot/custodians/u-boot-sunxi

This contains the fix to bring back the SD card as MMC0. In the long run
we are looking into a more robust solution, but for now we need to fix
this, as this breaks the user experience left, right, and centre.
Also add the one MAINTAINERS path addition from Samuel.
parents ffd81048 f264e796
...@@ -478,6 +478,9 @@ F: arch/arm/cpu/armv7/sunxi/ ...@@ -478,6 +478,9 @@ F: arch/arm/cpu/armv7/sunxi/
F: arch/arm/include/asm/arch-sunxi/ F: arch/arm/include/asm/arch-sunxi/
F: arch/arm/mach-sunxi/ F: arch/arm/mach-sunxi/
F: board/sunxi/ F: board/sunxi/
F: drivers/clk/sunxi/
F: drivers/phy/allwinner/
F: drivers/video/sunxi/
ARM TEGRA ARM TEGRA
M: Tom Warren <twarren@nvidia.com> M: Tom Warren <twarren@nvidia.com>
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
/ { / {
aliases { aliases {
mmc0 = &mmc0;
mmc1 = &mmc2; mmc1 = &mmc2;
}; };
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment