summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBreno Lima <breno.lima@nxp.com>2016-07-22 15:29:30 -0300
committerStefano Babic <sbabic@denx.de>2016-07-28 13:27:20 +0200
commit71813dcb56737707d12b697d5158ee96b48d7091 (patch)
tree6c90547004397ad26a1c65aad44d769884fc9f7c
parentae440ab02d31179a5a4b23e7411fe1baf052e816 (diff)
downloadu-boot-imx-71813dcb56737707d12b697d5158ee96b48d7091.zip
u-boot-imx-71813dcb56737707d12b697d5158ee96b48d7091.tar.gz
u-boot-imx-71813dcb56737707d12b697d5158ee96b48d7091.tar.bz2
warp7: Move some USB configuration options to defconfig
Currently it's recommended to move some configuration options to the defconfig file. Move some USB related options to the defconfig file. Signed-off-by: Breno Lima <breno.lima@nxp.com>
-rw-r--r--configs/warp7_defconfig6
-rw-r--r--include/configs/warp7.h9
2 files changed, 6 insertions, 9 deletions
diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig
index 5a68998..617e0a0 100644
--- a/configs/warp7_defconfig
+++ b/configs/warp7_defconfig
@@ -24,6 +24,12 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_USB=y
+CONFIG_USB_GADGET=y
+CONFIG_CI_UDC=y
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_G_DNL_MANUFACTURER="FSL"
+CONFIG_G_DNL_VENDOR_NUM=0x0525
+CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
CONFIG_USB_EHCI_HCD=y
CONFIG_MXC_USB_OTG_HACTIVE=y
CONFIG_OF_LIBFDT=y
diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index 4c6e23c..e59b16c 100644
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -125,18 +125,9 @@
#define CONFIG_IMX_THERMAL
-#define CONFIG_CI_UDC
#define CONFIG_USBD_HS
-#define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_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
-#define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5
-#define CONFIG_G_DNL_MANUFACTURER "FSL"
/* USB Device Firmware Update support */
#define CONFIG_USB_FUNCTION_DFU