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/exynos4-common.h | |
| parent | ec3ab3f9b5c75b5a11f8f6f52951fa8dd45990be (diff) | |
| parent | e6c0bc0643e5a4387fecbcf83080d0b796eb067c (diff) | |
| download | u-boot-eb6b50f631628f48b7e72432ae878e6ff0e306c3.tar.gz | |
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/exynos4-common.h')
| -rw-r--r-- | include/configs/exynos4-common.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index 008d24c417..8522a7992f 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -27,9 +27,6 @@ #define CONFIG_CMD_DFU #define CONFIG_CMD_GPT -/* USB Composite download gadget - g_dnl */ -#define CONFIG_USB_GADGET_DOWNLOAD - /* TIZEN THOR downloader support */ #define CONFIG_CMD_THOR_DOWNLOAD #define CONFIG_USB_FUNCTION_THOR @@ -40,20 +37,14 @@ #define DFU_DEFAULT_POLL_TIMEOUT 300 /* USB Samsung's IDs */ -#define CONFIG_G_DNL_VENDOR_NUM 0x04E8 -#define CONFIG_G_DNL_PRODUCT_NUM 0x6601 -#define CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_G_DNL_VENDOR_NUM +#define CONFIG_G_DNL_THOR_VENDOR_NUM 0x04E8 #define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 #define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 -#define CONFIG_G_DNL_MANUFACTURER "Samsung" #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */ -#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 |