diff mbox

[U-Boot] warp7: Move some USB configuration options to defconfig

Message ID 1469212170-1115-1-git-send-email-breno.lima@nxp.com
State Accepted
Commit 71813dcb56737707d12b697d5158ee96b48d7091
Delegated to: Stefano Babic
Headers show

Commit Message

Breno Matheus Lima July 22, 2016, 6:29 p.m. UTC
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>
---
 configs/warp7_defconfig | 6 ++++++
 include/configs/warp7.h | 9 ---------
 2 files changed, 6 insertions(+), 9 deletions(-)

Comments

Stefano Babic July 28, 2016, 10:42 a.m. UTC | #1
On 22/07/2016 20:29, Breno Lima wrote:
> 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>
> ---
>  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 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
> 

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic
diff mbox

Patch

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