From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Fri, 22 Sep 2017 07:51:37 +0000 (+0200)
Subject: sunxi: Fix USB_GADGET implication
X-Git-Tag: v2025.01-rc5-pxa1908~5632^2~6
X-Git-Url: http://git.dujemihanovic.xyz/img/html/static/git-logo.png?a=commitdiff_plain;h=3c989f3a19fc6db5866ed3172d7a620849d824c4;p=u-boot.git
sunxi: Fix USB_GADGET implication
USB_GADGET will fail to compile if USB_MUSB_GADGET is not defined. Make
sure we have that condition right.
Fixes: e0ea88042d51 ("sunxi: Imply USB_ETHER")
Suggested-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 79571156cf..5d1ce3e72d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -704,7 +704,6 @@ config ARCH_SUNXI
imply SPL_MMC_SUPPORT if MMC
imply SPL_POWER_SUPPORT
imply SPL_SERIAL_SUPPORT
- imply USB_ETHER
imply USB_GADGET
config TARGET_TS4600
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 78faac74e9..102a63b8ee 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -138,6 +138,7 @@ endif # USB_GADGET_DOWNLOAD
config USB_ETHER
bool "USB Ethernet Gadget"
+ default y if ARCH_SUNXI && USB_MUSB_GADGET
help
Creates an Ethernet network device through a USB peripheral
controller. This will create a network interface on both the device