summaryrefslogtreecommitdiff
path: root/include/configs/warp.h
diff options
context:
space:
mode:
authorPaul Kocialkowski <contact@paulk.fr>2015-06-12 19:56:58 +0200
committerMarek Vasut <marex@denx.de>2015-07-22 08:57:53 +0200
commit01acd6abbdd5a5951f68d08c245550c720ea6ad8 (patch)
tree41204c356c749add837262bbd9c450dfb1aa5c0a /include/configs/warp.h
parentf2226c0dbec2de90f92367f66af3a4cb20109ed3 (diff)
downloadu-boot-imx-01acd6abbdd5a5951f68d08c245550c720ea6ad8.zip
u-boot-imx-01acd6abbdd5a5951f68d08c245550c720ea6ad8.tar.gz
u-boot-imx-01acd6abbdd5a5951f68d08c245550c720ea6ad8.tar.bz2
usb: USB download gadget and functions config options coherent naming
This introduces a coherent scheme for naming USB download gadget and functions config options. The download USB gadget config option is moved to CONFIG_USB_GADGET_DOWNLOAD for better consistency with other gadgets and each function's config option is moved to a CONFIG_USB_FUNCTION_ prefix. Signed-off-by: Paul Kocialkowski <contact@paulk.fr> Tested-by: Lukasz Majewski <l.majewski@samsung.com> Test HW: Odroid_XU3 (Exynos5422), trats (Exynos4210)
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 48e2058..5a9bb33 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