sunxi: imply USB_GADGET

A good number of our boards have USB_GADGET enabled. Imply it so that all
the boards can benefit from it, and remove some boilerplate from our
defconfigs.

Reviewed-by: Łukasz Majewski <[email protected]>
Reviewed-by: Simon Glass <[email protected]>
Signed-off-by: Maxime Ripard <[email protected]>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d6d9558c69560017e3891da5a085964685cff9d5..a7ee5fe511af132fc50611749aba28f4e4aa4a01 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -706,6 +706,7 @@ config ARCH_SUNXI
        imply SPL_POWER_SUPPORT
        imply SPL_SERIAL_SUPPORT
        imply USB_FUNCTION_FASTBOOT
+       imply USB_GADGET
 
 config TARGET_TS4600
        bool "Support TS4600"

diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
index ae790164dff7d4b32f5eab25223b1a3585e0a18a..e55dbff44d368905fa13094803c7567806fabed4 100644 (file)
--- a/configs/A13-OLinuXino_defconfig
+++ b/configs/A13-OLinuXino_defconfig
@@ -31,5 +31,4 @@ CONFIG_AXP_ALDO3_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y

diff --git a/configs/A20-OLinuXino-Lime2-eMMC_defconfig b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
index b136af66b71f7b34fdbf261ec6773ed2a4542eda..9491708d80c6184943dad8275ba1f6b34e51067f 100644 (file)
--- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig
+++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
@@ -33,5 +33,4 @@ CONFIG_SCSI=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y

diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig
index ebb435f3095637917a4e9f4ee514bcf5285666c9..2bb8ee8c9ebd263117d911b6d39b6ca91360f936 100644 (file)
--- a/configs/A20-OLinuXino-Lime2_defconfig
+++ b/configs/A20-OLinuXino-Lime2_defconfig
@@ -32,5 +32,4 @@ CONFIG_SCSI=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y

diff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig
index 7d50d0533dcdcbf98144057bfa4e379e68f017cf..b9f70d240c3c0f28d31952772318d24ee341cc8a 100644 (file)
--- a/configs/CHIP_defconfig
+++ b/configs/CHIP_defconfig
@@ -22,6 +22,5 @@ CONFIG_AXP_ALDO4_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT_OVERLAY=y

diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig
index 76daf477ec879ce90db498472b86e73f21adb402..74f6eb10fc01d714595d2128d6e1e37f6051d015 100644 (file)
--- a/configs/CHIP_pro_defconfig
+++ b/configs/CHIP_pro_defconfig
@@ -27,6 +27,5 @@ CONFIG_AXP_ALDO4_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT_OVERLAY=y

diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
index 1b2989d364f680ca3fa50c83e69f7f1dacfae09f..458e2a9d8b046947aa6b8600c710f2eee6b5701f 100644 (file)
--- a/configs/Cubietruck_defconfig
+++ b/configs/Cubietruck_defconfig
@@ -32,5 +32,4 @@ CONFIG_SCSI=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y

diff --git a/configs/Nintendo_NES_Classic_Edition_defconfig b/configs/Nintendo_NES_Classic_Edition_defconfig
index 5986764a14b98deef17c9cf606447720cadd7d1d..e031dd8f5d5fa5c8584fbfe0f88f55eb8ae32df2 100644 (file)
--- a/configs/Nintendo_NES_Classic_Edition_defconfig
+++ b/configs/Nintendo_NES_Classic_Edition_defconfig
@@ -22,5 +22,4 @@ CONFIG_AXP_DLDO1_VOLT=3300
 CONFIG_AXP_ELDO2_VOLT=1800
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y

diff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig
index 9299aedd6019bf854b8a69d36f1068b3e3f8980d..143a9b4b6c10f361309ad063ed81a3f0777129d6 100644 (file)
--- a/configs/Sinlinx_SinA33_defconfig
+++ b/configs/Sinlinx_SinA33_defconfig
@@ -27,5 +27,4 @@ CONFIG_DFU_RAM=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y

diff --git a/configs/parrot_r16_defconfig b/configs/parrot_r16_defconfig
index 57db9587fe77cd0f55b5ae064a30c315c42e71f8..b36b9efec650be6a45e6e3f3b7db8bf93dbd09fa 100644 (file)
--- a/configs/parrot_r16_defconfig
+++ b/configs/parrot_r16_defconfig
@@ -23,5 +23,4 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
-CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y