diff options
| author | Tom Rini <[email protected]> | 2021-12-09 08:43:30 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-12-09 08:43:30 -0500 |
| commit | 1530ad5becf330c6094e995e340d920df2b43699 (patch) | |
| tree | c8757eb5ff74c48de9802e48474555da08535145 /arch | |
| parent | 558002a0f2230bedf6b38716f3ed86a92fc9010b (diff) | |
| parent | fbd9207e7fe3712b372ca9889a2a82402161fd27 (diff) | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxi
This fixes two regressions: eMMC operation on boards with WiFi (so using
three MMC devices), and a repeated wrong error message in USB gadget
mode (fastboot, ums).
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/sunxi-u-boot.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi index b7244c1112a..f2d7361b84f 100644 --- a/arch/arm/dts/sunxi-u-boot.dtsi +++ b/arch/arm/dts/sunxi-u-boot.dtsi @@ -13,7 +13,7 @@ / { aliases { mmc0 = &mmc0; -#if CONFIG_MMC_SUNXI_EXTRA_SLOT == 2 +#if CONFIG_MMC_SUNXI_SLOT_EXTRA == 2 mmc1 = &mmc2; #endif }; |