summaryrefslogtreecommitdiff
path: root/include/configs/zynq-common.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-07-24 16:39:56 -0400
committerTom Rini <trini@konsulko.com>2015-07-24 16:39:56 -0400
commit6f4e050639241218987541f4729172e4e0e2ff31 (patch)
tree0b7555fa699540dc975d179551211dd95c650a46 /include/configs/zynq-common.h
parent5a9749ee12bed44ca4dc7f2412b5a340db666954 (diff)
parent58d6d139c3e7bb923029e7ba18bfec7f420ead0f (diff)
downloadu-boot-imx-6f4e050639241218987541f4729172e4e0e2ff31.zip
u-boot-imx-6f4e050639241218987541f4729172e4e0e2ff31.tar.gz
u-boot-imx-6f4e050639241218987541f4729172e4e0e2ff31.tar.bz2
Merge git://git.denx.de/u-boot-usb
Diffstat (limited to 'include/configs/zynq-common.h')
-rw-r--r--include/configs/zynq-common.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 5526214..98bebd0 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -110,10 +110,10 @@
# define CONFIG_CI_UDC /* ChipIdea CI13xxx UDC */
# define CONFIG_USB_GADGET
# define CONFIG_USB_GADGET_DUALSPEED
-# define CONFIG_USBDOWNLOAD_GADGET
+# define CONFIG_USB_GADGET_DOWNLOAD
# define CONFIG_SYS_DFU_DATA_BUF_SIZE 0x600000
# define DFU_DEFAULT_POLL_TIMEOUT 300
-# define CONFIG_DFU_FUNCTION
+# define CONFIG_USB_FUNCTION_DFU
# define CONFIG_DFU_RAM
# define CONFIG_USB_GADGET_VBUS_DRAW 2
# define CONFIG_G_DNL_VENDOR_NUM 0x03FD
@@ -123,7 +123,7 @@
# define CONFIG_USB_CABLE_CHECK
# define CONFIG_CMD_DFU
# define CONFIG_CMD_THOR_DOWNLOAD
-# define CONFIG_THOR_FUNCTION
+# define CONFIG_USB_FUNCTION_THOR
# define DFU_ALT_INFO_RAM \
"dfu_ram_info=" \
"set dfu_alt_info " \