leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxi

Browse Source 
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).
This commit is contained in:
Tom Rini
2021-12-09 08:43:30 -05:00
parent 558002a0f2 fbd9207e7f
commit 1530ad5bec
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/dts/sunxi-u-boot.dtsi
View File

@@ -13,7 +13,7 @@
/ { / {
aliases { aliases {
mmc0 = &mmc0; mmc0 = &mmc0;
#if CONFIG_MMC_SUNXI_EXTRA_SLOT == 2 #if CONFIG_MMC_SUNXI_SLOT_EXTRA == 2
mmc1 = &mmc2; mmc1 = &mmc2;
#endif #endif
}; };

8
board/sunxi/board.c
View File

@@ -698,13 +698,7 @@ int g_dnl_board_usb_cable_connected(void)
return ret; return ret;
} }
ret = sun4i_usb_phy_vbus_detect(&phy); return sun4i_usb_phy_vbus_detect(&phy);
if (ret == 1) {
pr_err("A charger is plugged into the OTG\n");
return -ENODEV;
}
return ret;
} }
#endif #endif