diff options
| author | Tom Rini <trini@konsulko.com> | 2016-04-20 09:31:58 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-04-20 09:31:58 -0400 |
| commit | eb6b50f631628f48b7e72432ae878e6ff0e306c3 (patch) | |
| tree | 40a37edba62f5769156b543ea7a5e9c9377d5a15 /include/configs/sunxi-common.h | |
| parent | ec3ab3f9b5c75b5a11f8f6f52951fa8dd45990be (diff) | |
| parent | e6c0bc0643e5a4387fecbcf83080d0b796eb067c (diff) | |
| download | u-boot-imx-eb6b50f631628f48b7e72432ae878e6ff0e306c3.zip u-boot-imx-eb6b50f631628f48b7e72432ae878e6ff0e306c3.tar.gz u-boot-imx-eb6b50f631628f48b7e72432ae878e6ff0e306c3.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Conflicts:
configs/bcm28155_ap_defconfig
configs/dra72_evm_defconfig
configs/dra74_evm_defconfig
configs/ma5d4evk_defconfig
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/sunxi-common.h')
| -rw-r--r-- | include/configs/sunxi-common.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 8f11eb9..9c6c9b6 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -342,21 +342,11 @@ extern int soft_i2c_gpio_scl; #endif #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 #define CONFIG_USB_FUNCTION_FASTBOOT #define CONFIG_USB_FUNCTION_MASS_STORAGE #endif -#ifdef CONFIG_USB_GADGET_DOWNLOAD -#define CONFIG_G_DNL_VENDOR_NUM 0x1f3a -#define CONFIG_G_DNL_PRODUCT_NUM 0x1010 -#define CONFIG_G_DNL_MANUFACTURER "Allwinner Technology" -#endif - #ifdef CONFIG_USB_FUNCTION_DFU #define CONFIG_CMD_DFU #define CONFIG_DFU_RAM |