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>

diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig
index 5a68998eb0b698fcc28985338c96f066bcce6a91..617e0a060a34a24aee669c99c2da9569e71b060f 100644 (file)
--- 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_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
 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 4c6e23cebfe0d603c62fff96a09a488783d47667..e59b16c3794676cb8ffed2607bb7178d2c80817f 100644 (file)
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -125,18 +125,9 @@
 
 #define CONFIG_IMX_THERMAL
 
 
 #define CONFIG_IMX_THERMAL
 

-#define CONFIG_CI_UDC

 #define CONFIG_USBD_HS
 #define CONFIG_USBD_HS

-#define CONFIG_USB_GADGET_DUALSPEED

 
 

-#define CONFIG_USB_GADGET

 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 #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
 
 /* USB Device Firmware Update support */
 #define CONFIG_USB_FUNCTION_DFU