From: Stefano Babic Date: Wed, 20 Jul 2016 15:54:07 +0000 (+0200) Subject: pico-imx6ul: drop warning due to redefined X-Git-Tag: v2016.09-rc2~174^2~26 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d2c4c6bcfa5c9e36a6e00b1c7b997cd06eb09a6c;p=u-boot pico-imx6ul: drop warning due to redefined USB gadget configuration is set in defconfig and must be removed from pico-imx6ul.h. Signed-off-by: Stefano Babic CC: Fabio Estevam Reviewed-by: Fabio Estevam --- diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index a1e5f01f82..ca3c30b072 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -54,13 +54,9 @@ #define CONFIG_MXC_USB_FLAGS 0 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#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_USB_FUNCTION_DFU @@ -68,14 +64,6 @@ #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M #define DFU_DEFAULT_POLL_TIMEOUT 300 -#define CONFIG_G_DNL_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5 -#define CONFIG_G_DNL_MANUFACTURER "FSL" - -#define CONFIG_G_DNL_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5 -#define CONFIG_G_DNL_MANUFACTURER "FSL" - #define CONFIG_DEFAULT_FDT_FILE "imx6ul-pico-hobbit.dtb" #define CONFIG_SYS_MMC_IMG_LOAD_PART 1