aboutsummaryrefslogtreecommitdiff
path: root/include/configs/warp.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/warp.h
parent5a9749ee12bed44ca4dc7f2412b5a340db666954 (diff)
parent58d6d139c3e7bb923029e7ba18bfec7f420ead0f (diff)
Merge git://git.denx.de/u-boot-usb
Diffstat (limited to 'include/configs/warp.h')
-rw-r--r--include/configs/warp.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/configs/warp.h b/include/configs/warp.h
index 48e2058f5f..5a9bb33840 100644
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -80,8 +80,8 @@
#define CONFIG_USB_GADGET
#define CONFIG_CMD_USB_MASS_STORAGE
-#define CONFIG_USB_GADGET_MASS_STORAGE
-#define CONFIG_USBDOWNLOAD_GADGET
+#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
@@ -89,7 +89,7 @@
#define CONFIG_G_DNL_MANUFACTURER "FSL"
#define CONFIG_CMD_DFU
-#define CONFIG_DFU_FUNCTION
+#define CONFIG_USB_FUNCTION_DFU
#define CONFIG_DFU_MMC
#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M
#define DFU_DEFAULT_POLL_TIMEOUT 300