summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2017-09-22 10:51:37 +0300
committerMaxime Ripard <maxime.ripard@free-electrons.com>2017-10-03 20:12:06 +0300
commit3c989f3a19fc6db5866ed3172d7a620849d824c4 (patch)
treee31e74cd103d67c23e185ce9899ffbb3d5f66930
parentde86fc3859f9c9ae26faed6f9d8fc115e1329b4f (diff)
downloadu-boot-3c989f3a19fc6db5866ed3172d7a620849d824c4.tar.xz
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>
-rw-r--r--arch/arm/Kconfig1
-rw-r--r--drivers/usb/gadget/Kconfig1
2 files changed, 1 insertions, 1 deletions
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