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/smartweb.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/smartweb.h')
-rw-r--r-- | include/configs/smartweb.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 7dcb82b53b..42ed098a1d 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -175,16 +175,9 @@ #define CONFIG_CMD_DFU #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 -/* USB DFU IDs */ -#define CONFIG_G_DNL_VENDOR_NUM 0x0908 -#define CONFIG_G_DNL_PRODUCT_NUM 0x02d2 -#define CONFIG_G_DNL_MANUFACTURER "Siemens AG" - #define CONFIG_SYS_CACHELINE_SIZE 0x2000 #endif |