From 71813dcb56737707d12b697d5158ee96b48d7091 Mon Sep 17 00:00:00 2001 From: Breno Lima Date: Fri, 22 Jul 2016 15:29:30 -0300 Subject: [PATCH] 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 --- configs/warp7_defconfig | 6 ++++++ include/configs/warp7.h | 9 --------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 5a68998eb0..617e0a060a 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 4c6e23cebf..e59b16c379 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 -- 2.39.2