usb: gadget: Move CONFIG_USB_GADGET_VBUS_DRAW to Kconfig

The description was borrowed from kernel. Definitions were added to
defconfig files in a way that "make savedefconfig" generates exactly
the same file as used defconfig.

Boards using 0 mA as CONFIG_USB_GADGET_VBUS_DRAW value were moved to use
2 mA (as minimal allowed by Kconfig).

Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index f4698f469ea4413fcf8c5bc41ebe7297d5ca1a0c..cfd8ce88eeb2a2985d4689785d5d46085928c8f4 100644 (file)
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -33,3 +33,24 @@ menuconfig USB_GADGET
           a USB peripheral device.  Configure one hardware driver for your
           peripheral/device side bus controller, and a "gadget driver" for
           your peripheral protocol.
+
+if USB_GADGET
+
+config USB_GADGET_VBUS_DRAW
+       int "Maximum VBUS Power usage (2-500 mA)"
+       range 2 500
+       default 2
+       help
+          Some devices need to draw power from USB when they are
+          configured, perhaps to operate circuitry or to recharge
+          batteries.  This is in addition to any local power supply,
+          such as an AC adapter or batteries.
+
+          Enter the maximum power your device draws through USB, in
+          milliAmperes.  The permitted range of values is 2 - 500 mA;
+          0 mA would be legal, but can make some hosts misbehave.
+
+          This value will be used except for system-specific gadget
+          drivers that have more specific information.
+
+endif # USB_GADGET

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 29b693a40b561c5142e80774b9d809b80deea60e..8d68d6052022641762a2650230901a3890f01bea 100644 (file)
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -290,7 +290,6 @@
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW    2
 #define CONFIG_USB_MUSB_HOST
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE        MUSB_PERIPHERAL

diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index fd3f6a718d2242693d90b9381b92263533f87e4b..0dd9c7a7594d6e3521421d2b4e3ad6f3250538f6 100644 (file)
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -122,6 +122,10 @@
 #endif
 
 /* USB GADGET */
+#if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USBETH_SUPPORT)
+#undef CONFIG_USB_GADGET_VBUS_DRAW
+#endif
+
 #if !defined(CONFIG_SPL_BUILD) || \
        (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT))
 #define CONFIG_USB_DWC3_PHY_OMAP
@@ -130,7 +134,6 @@
 #define CONFIG_USB_DWC3_GADGET
 
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_VBUS_DRAW 2
 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
 #define CONFIG_G_DNL_VENDOR_NUM 0x0403
 #define CONFIG_G_DNL_PRODUCT_NUM 0xBD00

diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index bfe3fa37f4dda16577ac61a0d508b9eb6c8f0be7..529cf1c47676a41bc20862dfd8b1a67ec3c5bf51 100644 (file)
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -276,7 +276,6 @@
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_USBDOWNLOAD_GADGET
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW    2
 #define CONFIG_USB_MUSB_HOST
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE        MUSB_HOST

diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h
index 6c860a646234ceaef9f6de528d1ac54caeb36837..82bf92acb4cfbf19a0b515a5243c69d0d6910451 100644 (file)
--- a/include/configs/bav335x.h
+++ b/include/configs/bav335x.h
@@ -441,7 +441,6 @@ DEFAULT_LINUX_BOOT_ENV \
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW    2
 #define CONFIG_USB_MUSB_HOST
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE        MUSB_PERIPHERAL

diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h
index cf25bdebe879642ccec3b69d8288c9bcc18c1d6a..387895b3cf9c72b652ff960251b067965a3aed2a 100644 (file)
--- a/include/configs/bcm28155_ap.h
+++ b/include/configs/bcm28155_ap.h
@@ -139,7 +139,6 @@
 #define CONFIG_FASTBOOT_BUF_SIZE       (CONFIG_SYS_SDRAM_SIZE - SZ_1M)
 #define CONFIG_FASTBOOT_BUF_ADDR       CONFIG_SYS_SDRAM_BASE
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW    0
 #define CONFIG_USB_GADGET_DWC2_OTG
 #define CONFIG_USB_GADGET_BCM_UDC_OTG_PHY
 #define CONFIG_USB_GADGET_DOWNLOAD

diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index 63e3b94bb55975d5094aef196b7f75e0eea20b17..3f3b69df1aa05695c1d46d699c8b67f13c514c8b 100644 (file)
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -93,7 +93,6 @@
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_VBUS_DRAW    2
 
 #define CONFIG_G_DNL_VENDOR_NUM                0x0525
 #define CONFIG_G_DNL_PRODUCT_NUM       0xa4a5

diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 7f57a54061619f85f12a7b6e5e6eaa9a3d7a120a..63dbe12619d3fcac3a16d11f20aba99a156511f2 100644 (file)
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -235,7 +235,6 @@
 /* USB Client Support */
 #define CONFIG_CI_UDC
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW      2
 #define CONFIG_TRDX_VID                  0x1B67
 #define CONFIG_TRDX_PID_COLIBRI_VF50     0x0016
 #define CONFIG_TRDX_PID_COLIBRI_VF61     0x0017

diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index fcf2bd6d57115ae8034822db2a2346d56094461c..b8c441ea267794c45f42b7f7f75821c0cbaf571a 100644 (file)
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -125,7 +125,6 @@
 #define CONFIG_USB_FUNCTION_DFU
 #define CONFIG_DFU_NAND
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_VBUS_DRAW    2
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE   (SZ_1M)
 #define DFU_MANIFEST_POLL_TIMEOUT      25000
 

diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 7734e8db943ed73f3192a87373a9bf37e3bde16a..e9facae6ded9c13b32ec534a6e0cd5968770ec51 100644 (file)
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -233,7 +233,6 @@
 #define CONFIG_USB_DWC3_GADGET
 
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_VBUS_DRAW 2
 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
 #define CONFIG_G_DNL_VENDOR_NUM 0x0451
 #define CONFIG_G_DNL_PRODUCT_NUM 0xd022

diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h
index 008d24c417399d20ed18d83256ad1eea194fa322..c8e5397d4e85977283405c8943bf7aa3069ef231 100644 (file)
--- a/include/configs/exynos4-common.h
+++ b/include/configs/exynos4-common.h
@@ -53,7 +53,6 @@
 #define CONFIG_USB_GADGET_DWC2_OTG
 #define CONFIG_USB_GADGET_DWC2_OTG_PHY
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW    2
 
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 793b3fb88e9a70e5e6c377183b3e1b981b895fbb..62f3468189175d3cb10b74caa73a533ab31471cb 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -196,7 +196,6 @@
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_VBUS_DRAW    2
 
 /* Netchip IDs */
 #define CONFIG_G_DNL_VENDOR_NUM 0x0525

diff --git a/include/configs/kc1.h b/include/configs/kc1.h
index ee7d9ce45acc718c14cbd9a663c269204e9c2f54..d8aa182053e6ae4902c42e30190fe5fe390a5483 100644 (file)
--- a/include/configs/kc1.h
+++ b/include/configs/kc1.h
@@ -185,7 +185,6 @@
 #define CONFIG_USB_MUSB_OMAP2PLUS
 
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW    0
 
 /*
  * Download

diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 3e1b760882eb1acefe922e9884c33548e7d7f719..f097176209e1c7301fb857b3a76fb3a9d4d1f233 100644 (file)
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -241,7 +241,6 @@
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_VBUS_DRAW    2
 
 #define CONFIG_G_DNL_VENDOR_NUM                0x0525
 #define CONFIG_G_DNL_PRODUCT_NUM       0xa4a5

diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index da1d26f3509d12438b4212b37a9e5bfd3288290d..f9977a2c19a549cb52468ad43fd66be72d0e1b4b 100644 (file)
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -264,7 +264,6 @@
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_VBUS_DRAW    2
 
 #define CONFIG_G_DNL_VENDOR_NUM                0x0525
 #define CONFIG_G_DNL_PRODUCT_NUM       0xa4a5

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 3604e44c0db63fe5391db3e36ad470b35225b35e..a50829ed55e442734c8c3ab7e2671c490f6bcad8 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -333,7 +333,6 @@
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_VBUS_DRAW    2
 
 /* Netchip IDs */
 #define CONFIG_G_DNL_VENDOR_NUM 0x0525

diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index 01d08dc582a985b49f2abecb8f6aac1515baa4fb..e4986b0b18ae0388cd3af8545c848b78c344ab7d 100644 (file)
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -54,7 +54,6 @@
 
 /* USB gadget */
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW    2
 
 /* Downloader */
 #define CONFIG_G_DNL_VENDOR_NUM                0x04E8

diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 2112d9fe94660f001d7f3039ce8892ced208465c..17d8a86b4f8e12e6835e9d8799b69af8e6affbab 100644 (file)
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -66,7 +66,6 @@
 #define CONFIG_TWL4030_USB             1
 #define CONFIG_USB_ETHER
 #define CONFIG_USB_ETHER_RNDIS
-#define CONFIG_USB_GADGET_VBUS_DRAW    0
 #define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_G_DNL_VENDOR_NUM                0x0451
 #define CONFIG_G_DNL_PRODUCT_NUM       0xd022

diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index 304e1ce31c6e5235bf3dc2e0f02989e3ba8c3efe..7e802e9901c965688054c2f1b2f517cd680cceef 100644 (file)
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -85,7 +85,6 @@
 #define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_USB_ETHER
 #define CONFIG_USB_ETHER_RNDIS
-#define CONFIG_USB_GADGET_VBUS_DRAW    0
 #define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_G_DNL_VENDOR_NUM                0x0451
 #define CONFIG_G_DNL_PRODUCT_NUM       0xd022

diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h
index a5cfa0c5ca824aff84db0580c3f2b60a8a00dcfb..09beb74240437b60372a22dcb601f40268a82818 100644 (file)
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@ -106,7 +106,6 @@
 #define CONFIG_USB_DWC3_GADGET
 
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_VBUS_DRAW 2
 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
 #define CONFIG_G_DNL_VENDOR_NUM 0x0403
 #define CONFIG_G_DNL_PRODUCT_NUM 0xBD00

diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h
index 1a670cbd63d25c7103d5939832be0dc071d1d787..ec3fcba0a5491fa3192229bfbf6b0cb0655b86e7 100644 (file)
--- a/include/configs/pengwyn.h
+++ b/include/configs/pengwyn.h
@@ -200,7 +200,6 @@
 #define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW    2
 #define CONFIG_USB_MUSB_HOST
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE        MUSB_PERIPHERAL

diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 07a513499954ae71b3017f9299f6f882fc4e2441..919c60ea5b5aae692b53fc2cba0cf3f7ebd2e046 100644 (file)
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -273,7 +273,6 @@
 #define CONFIG_USB_GADGET_DWC2_OTG
 #define CONFIG_USB_GADGET_DWC2_OTG_PHY
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW 2
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 

diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index df2a514b5174ddac46df7e34145d21d35e01e532..df4e734573c12133dd6173136eab3524b2017341 100644 (file)
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -225,7 +225,6 @@
 #define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #undef CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW    2
 #define CONFIG_USB_MUSB_HOST
 
 #define CONFIG_AM335X_USB0

diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index db820ba7fed62d058cfd738c48e8cd68e5ccb8c9..0586aec7911ae64c673c56a35b330118b7389d7e 100644 (file)
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -176,7 +176,6 @@
 #define CONFIG_USB_FUNCTION_DFU
 #define CONFIG_DFU_NAND
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_VBUS_DRAW    2
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE   SZ_1M
 #define DFU_MANIFEST_POLL_TIMEOUT      25000
 

diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index 18a379d4fd487be77869ee601f237774948a887f..12090a30e9c8a28ffb96093554920c067175c928 100644 (file)
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -202,7 +202,6 @@
 #define CONFIG_TWL4030_USB
 
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW    0
 
 /*
  * Download

diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 3e5089256822355e10ed71a428dd90dece8a3ceb..bdb06e7e53afd23d9848b6b4450886588b22a522 100644 (file)
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -252,7 +252,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 #if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_USB_MASS_STORAGE)
 #define CONFIG_USB_GADGET_DWC2_OTG
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW    2
 
 /* USB Composite download gadget - g_dnl */
 #define CONFIG_USB_GADGET_DOWNLOAD

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 8f11eb90c13129ad3e488dde289686a3e414987d..b5d05cd7358c789a4b67260c7791485ce6e8f717 100644 (file)
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -343,7 +343,6 @@ extern int soft_i2c_gpio_scl;
 
 #ifdef CONFIG_USB_MUSB_GADGET
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW    0
 
 #define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_USB_FUNCTION_DFU

diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index 5b190f622548b736d9b31be23ff8a0fb6ee63240..0b04b3a69736d3dd9d4d1c587b7abbf18c174a5a 100644 (file)
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -140,7 +140,6 @@
 #define CONFIG_USB_FUNCTION_DFU
 #define CONFIG_DFU_NAND
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_VBUS_DRAW    2
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE   (SZ_1M)
 #define DFU_MANIFEST_POLL_TIMEOUT      25000
 

diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 1b5046af2f02b4e78408e28d43a67c5f97cab1cf..715994c3fca7b3d54fab3e2709c4b9fbec435bd0 100644 (file)
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -132,7 +132,6 @@
 #define CONFIG_USBD_HS
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW    0
 #define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_G_DNL_VENDOR_NUM                0x0525
 #define CONFIG_G_DNL_PRODUCT_NUM       0xa4a5

diff --git a/include/configs/tegra-common-usb-gadget.h b/include/configs/tegra-common-usb-gadget.h
index c3a01514cab5a95bbda9dcf74edc99d86e7f11bc..ec034a1f879c6a2c35b4a620f2393a11d69f1189 100644 (file)
--- a/include/configs/tegra-common-usb-gadget.h
+++ b/include/configs/tegra-common-usb-gadget.h
@@ -10,7 +10,6 @@
 
 #ifndef CONFIG_SPL_BUILD
 /* USB gadget mode support*/
-#define CONFIG_USB_GADGET_VBUS_DRAW    2
 #define CONFIG_CI_UDC
 #define CONFIG_CI_UDC_HAS_HOSTPC
 #define CONFIG_USB_GADGET_DUALSPEED

diff --git a/include/configs/warp.h b/include/configs/warp.h
index cb93629589a8ade22dfafed247d2c2698b7d7f02..80c4e38259d0d32d5cc46ab3ad81914b698c97a6 100644 (file)
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -81,7 +81,6 @@
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 #define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_VBUS_DRAW    2
 
 #define CONFIG_G_DNL_VENDOR_NUM                0x0525
 #define CONFIG_G_DNL_PRODUCT_NUM       0xa4a5

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index f7b4643708f4aa43ebc8c36e498d512403597846..9493843464cc2ff8feba932ab4a279f537ea0644 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -127,7 +127,6 @@
 
 #define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW    2
 #define CONFIG_USBDOWNLOAD_GADGET
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE   0x1800000
 #define DFU_DEFAULT_POLL_TIMEOUT       300

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 49d9fd059f3cb419859c0674427de2a217f6ba36..e4d1111f4915f6f8e6082dfae9c1f0c661f607c2 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -105,7 +105,6 @@
 # define DFU_DEFAULT_POLL_TIMEOUT      300
 # define CONFIG_USB_FUNCTION_DFU
 # define CONFIG_DFU_RAM
-# define CONFIG_USB_GADGET_VBUS_DRAW   2
 # define CONFIG_G_DNL_VENDOR_NUM       0x03FD
 # define CONFIG_G_DNL_PRODUCT_NUM      0x0300
 # define CONFIG_G_DNL_MANUFACTURER     "Xilinx"