From patchwork Tue Apr 5 16:36:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Protsenko X-Patchwork-Id: 65110 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp593798lbc; Tue, 5 Apr 2016 10:20:04 -0700 (PDT) X-Received: by 10.194.172.99 with SMTP id bb3mr16638004wjc.46.1459876804523; Tue, 05 Apr 2016 10:20:04 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id t195si20464382wmt.21.2016.04.05.10.20.04; Tue, 05 Apr 2016 10:20:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1503CA76EF; Tue, 5 Apr 2016 19:19:54 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vgIO8jsrkEiO; Tue, 5 Apr 2016 19:19:53 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C45374BA29; Tue, 5 Apr 2016 19:17:35 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 58FEDB3818 for ; Tue, 5 Apr 2016 18:37:04 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1RktA9-Rp21r for ; Tue, 5 Apr 2016 18:37:03 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com [209.85.217.181]) by theia.denx.de (Postfix) with ESMTPS id F1135A76EE for ; Tue, 5 Apr 2016 18:36:46 +0200 (CEST) Received: by mail-lb0-f181.google.com with SMTP id qe11so12967856lbc.3 for ; Tue, 05 Apr 2016 09:36:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=47WOhSilXjjDeZNrvx+FpiR46BUgnaNnD4EvgkXKxog=; b=FgwdBfvIbcZv7/0v4xzwjY0vf1pP9ZTImCMwdksCcZhwy8Bs2x6JbliIlnF+G+kVXe WBY2AOqzUnMGO3q5lu8Cr4n3WuGnkMeQptFco3x9Iq79+JRnxsW7+iQnPH9OGU193Rcu 58K2ocxiC/EWArWBPKdnvKV9bDEp4SQhZpfKQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=47WOhSilXjjDeZNrvx+FpiR46BUgnaNnD4EvgkXKxog=; b=NXVgiB0NvUV8SgnZwZDpedZjjX/8RQmCIcSlVv8/fUErQyaMV8q5Ob5HrsTIUCA6Yh cVnoFn0AMLK4NzVq/n5EfdTs3EwWRxxcdSoZa0pqpiReCak5bPKzmWsaD52OeCJDYnQQ s8ZmO1SwBkX6B4ZAo4OqTBxfQ3bwA7H7ckJRHW/o94RoAElnHziI2k9atH/JtUQG1L4+ rKE16YE/5vLFuRkuJBjbNOqmE/+WU8ZHU4xj0SCVj0j0iOVewrVItNVtbodAYhDZPFJE FXVfkTwpCh/81dDOxOp4Kb4Wro4jsu3otqYtLD3rxRLzFvl2XQgTgp4pa5Pa/WXd4VoJ LB+A== X-Gm-Message-State: AD7BkJLWkmj93KlFafSrknFNSnYTIEP8vu6BnfJbMMGivAD9qgIJqcKRWo7c7FdkPaR95lMJ X-Received: by 10.112.16.230 with SMTP id j6mr8426921lbd.27.1459874205786; Tue, 05 Apr 2016 09:36:45 -0700 (PDT) Received: from localhost ([195.238.92.132]) by smtp.gmail.com with ESMTPSA id rk1sm5789078lbb.0.2016.04.05.09.36.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Apr 2016 09:36:45 -0700 (PDT) From: Semen Protsenko To: u-boot@lists.denx.de Date: Tue, 5 Apr 2016 19:36:32 +0300 Message-Id: <1459874197-14460-4-git-send-email-semen.protsenko@linaro.org> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: <1459874197-14460-1-git-send-email-semen.protsenko@linaro.org> References: <1459874197-14460-1-git-send-email-semen.protsenko@linaro.org> X-Mailman-Approved-At: Tue, 05 Apr 2016 19:15:50 +0200 Cc: Steve Rae , Lucas Stach , Marcel Ziswiler , Adrian Alonso , Chin-Liang See , Soeren Moch , Przemyslaw Marczak , Stefan Roese , Chander Kashyap , Tom Rini , Stephen Warren , Stefan Agner , Michal Simek , Praneeth Bajjuri , Ian Campbell , Marek Vasut , Otavio Salvador , Tim Kryger , Gilles Gameiro , Robert Baldyga , Roger Meier , Tom Warren , Lothar Felten , Fabio Estevam Subject: [U-Boot] [PATCH 3/8] usb: dwc3: Move CONFIG_USB_DWC3 to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Sam Protsenko Also remove CONFIG_USB_GADGET_DUALSPEED from headers that use DWC3 controller, as this option is selected by CONFIG_USB_DWC3. Signed-off-by: Sam Protsenko --- configs/am437x_gp_evm_defconfig | 1 + configs/am437x_sk_evm_defconfig | 1 + configs/am43xx_evm_defconfig | 1 + configs/am43xx_evm_ethboot_defconfig | 1 + configs/am43xx_evm_qspiboot_defconfig | 1 + configs/am43xx_evm_usbhost_boot_defconfig | 1 + configs/dra72_evm_defconfig | 1 + configs/dra74_evm_defconfig | 1 + configs/dra7xx_evm_defconfig | 1 + configs/dra7xx_evm_qspiboot_defconfig | 1 + configs/dra7xx_evm_uart3_defconfig | 1 + configs/odroid-xu3_defconfig | 1 + configs/omap5_uevm_defconfig | 1 + configs/xilinx_zynqmp_ep_defconfig | 1 + drivers/usb/Kconfig | 2 ++ drivers/usb/dwc3/Kconfig | 7 +++++++ include/configs/am43xx_evm.h | 5 +++-- include/configs/dra7xx_evm.h | 2 -- include/configs/odroid_xu3.h | 4 ---- include/configs/omap5_uevm.h | 2 -- include/configs/xilinx_zynqmp.h | 2 -- 21 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 drivers/usb/dwc3/Kconfig -- 2.8.0.rc3 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/configs/am437x_gp_evm_defconfig b/configs/am437x_gp_evm_defconfig index 356f6fd..e628bd4 100644 --- a/configs/am437x_gp_evm_defconfig +++ b/configs/am437x_gp_evm_defconfig @@ -21,4 +21,5 @@ CONFIG_TI_QSPI=y CONFIG_TIMER=y CONFIG_OMAP_TIMER=y CONFIG_USB=y +CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y diff --git a/configs/am437x_sk_evm_defconfig b/configs/am437x_sk_evm_defconfig index 2e2827f..d556a7f 100644 --- a/configs/am437x_sk_evm_defconfig +++ b/configs/am437x_sk_evm_defconfig @@ -25,4 +25,5 @@ CONFIG_TI_QSPI=y CONFIG_TIMER=y CONFIG_OMAP_TIMER=y CONFIG_USB=y +CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index cc83006..9b746bf 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -12,5 +12,6 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SYS_NS16550=y CONFIG_TI_QSPI=y CONFIG_USB=y +CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y CONFIG_OF_LIBFDT=y diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index a720c14..30a344c 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -11,5 +11,6 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SYS_NS16550=y CONFIG_TI_QSPI=y CONFIG_USB=y +CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y CONFIG_OF_LIBFDT=y diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig index 6db389b..75c75dc 100644 --- a/configs/am43xx_evm_qspiboot_defconfig +++ b/configs/am43xx_evm_qspiboot_defconfig @@ -10,5 +10,6 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SYS_NS16550=y CONFIG_TI_QSPI=y CONFIG_USB=y +CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y CONFIG_OF_LIBFDT=y diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index cbaf5a5..9c2234f 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -11,5 +11,6 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SYS_NS16550=y CONFIG_TI_QSPI=y CONFIG_USB=y +CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y CONFIG_OF_LIBFDT=y diff --git a/configs/dra72_evm_defconfig b/configs/dra72_evm_defconfig index da24992..47fb0d7 100644 --- a/configs/dra72_evm_defconfig +++ b/configs/dra72_evm_defconfig @@ -24,4 +24,5 @@ CONFIG_TI_QSPI=y CONFIG_TIMER=y CONFIG_OMAP_TIMER=y CONFIG_USB=y +CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y diff --git a/configs/dra74_evm_defconfig b/configs/dra74_evm_defconfig index 9039b15..a15b65b 100644 --- a/configs/dra74_evm_defconfig +++ b/configs/dra74_evm_defconfig @@ -23,4 +23,5 @@ CONFIG_TI_QSPI=y CONFIG_TIMER=y CONFIG_OMAP_TIMER=y CONFIG_USB=y +CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 9be4c2d..2d504a5 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -14,5 +14,6 @@ CONFIG_SPI_FLASH_SPANSION=y CONFIG_SYS_NS16550=y CONFIG_TI_QSPI=y CONFIG_USB=y +CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y CONFIG_OF_LIBFDT=y diff --git a/configs/dra7xx_evm_qspiboot_defconfig b/configs/dra7xx_evm_qspiboot_defconfig index b77c7c3..6af9619 100644 --- a/configs/dra7xx_evm_qspiboot_defconfig +++ b/configs/dra7xx_evm_qspiboot_defconfig @@ -14,5 +14,6 @@ CONFIG_SPI_FLASH_SPANSION=y CONFIG_SYS_NS16550=y CONFIG_TI_QSPI=y CONFIG_USB=y +CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y CONFIG_OF_LIBFDT=y diff --git a/configs/dra7xx_evm_uart3_defconfig b/configs/dra7xx_evm_uart3_defconfig index 1a1fb6d..80ae9dd 100644 --- a/configs/dra7xx_evm_uart3_defconfig +++ b/configs/dra7xx_evm_uart3_defconfig @@ -15,5 +15,6 @@ CONFIG_SPI_FLASH_SPANSION=y CONFIG_SYS_NS16550=y CONFIG_TI_QSPI=y CONFIG_USB=y +CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y CONFIG_OF_LIBFDT=y diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig index a5f25cd..4548cf0 100644 --- a/configs/odroid-xu3_defconfig +++ b/configs/odroid-xu3_defconfig @@ -19,6 +19,7 @@ CONFIG_PMIC_S2MPS11=y CONFIG_DM_REGULATOR=y CONFIG_USB=y CONFIG_DM_USB=y +CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y CONFIG_VIDEO_BRIDGE=y CONFIG_ERRNO_STR=y diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig index 50d8372..3fc75df 100644 --- a/configs/omap5_uevm_defconfig +++ b/configs/omap5_uevm_defconfig @@ -8,5 +8,6 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_SYS_NS16550=y CONFIG_USB=y +CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y CONFIG_OF_LIBFDT=y diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig index 91ae10a..da7d259 100644 --- a/configs/xilinx_zynqmp_ep_defconfig +++ b/configs/xilinx_zynqmp_ep_defconfig @@ -30,5 +30,6 @@ CONFIG_ZYNQ_SDHCI=y CONFIG_NAND_ARASAN=y CONFIG_ZYNQ_GEM=y CONFIG_USB=y +CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y # CONFIG_REGEX is not set diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index bccf43e..da3ec2f 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -49,6 +49,8 @@ config DM_USB source "drivers/usb/host/Kconfig" +source "drivers/usb/dwc3/Kconfig" + source "drivers/usb/musb-new/Kconfig" source "drivers/usb/emul/Kconfig" diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig new file mode 100644 index 0000000..debc74b --- /dev/null +++ b/drivers/usb/dwc3/Kconfig @@ -0,0 +1,7 @@ +config USB_DWC3 + bool "DesignWare USB3 DRD Core Support" + depends on (USB && USB_GADGET) + select USB_GADGET_DUALSPEED + help + Say Y here if your system has a Dual Role SuperSpeed + USB controller based on the DesignWare USB3 IP Core. diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 0dd9c7a7..8bea4c2 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -123,21 +123,22 @@ /* USB GADGET */ #if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USBETH_SUPPORT) +#undef CONFIG_USB_DWC3 + #undef CONFIG_USB_GADGET_VBUS_DRAW +#undef CONFIG_USB_GADGET_DUALSPEED #endif #if !defined(CONFIG_SPL_BUILD) || \ (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)) #define CONFIG_USB_DWC3_PHY_OMAP #define CONFIG_USB_DWC3_OMAP -#define CONFIG_USB_DWC3 #define CONFIG_USB_DWC3_GADGET #define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" #define CONFIG_G_DNL_VENDOR_NUM 0x0403 #define CONFIG_G_DNL_PRODUCT_NUM 0xBD00 -#define CONFIG_USB_GADGET_DUALSPEED #endif /* diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index e9facae..a230896 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -229,14 +229,12 @@ /* USB GADGET */ #define CONFIG_USB_DWC3_PHY_OMAP #define CONFIG_USB_DWC3_OMAP -#define CONFIG_USB_DWC3 #define CONFIG_USB_DWC3_GADGET #define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" #define CONFIG_G_DNL_VENDOR_NUM 0x0451 #define CONFIG_G_DNL_PRODUCT_NUM 0xd022 -#define CONFIG_USB_GADGET_DUALSPEED /* USB Device Firmware Update support */ #define CONFIG_USB_FUNCTION_DFU diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index e4986b0..e704bb4 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -48,13 +48,9 @@ #define CONFIG_USB_EHCI_EXYNOS /* DWC3 */ -#define CONFIG_USB_DWC3 #define CONFIG_USB_DWC3_GADGET #define CONFIG_USB_DWC3_PHY_SAMSUNG -/* USB gadget */ -#define CONFIG_USB_GADGET_DUALSPEED - /* Downloader */ #define CONFIG_G_DNL_VENDOR_NUM 0x04E8 #define CONFIG_G_DNL_PRODUCT_NUM 0x6601 diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 09beb74..85e46b4 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -102,14 +102,12 @@ /* USB GADGET */ #define CONFIG_USB_DWC3_PHY_OMAP #define CONFIG_USB_DWC3_OMAP -#define CONFIG_USB_DWC3 #define CONFIG_USB_DWC3_GADGET #define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" #define CONFIG_G_DNL_VENDOR_NUM 0x0403 #define CONFIG_G_DNL_PRODUCT_NUM 0xBD00 -#define CONFIG_USB_GADGET_DUALSPEED /* USB Device Firmware Update support */ #define CONFIG_USB_FUNCTION_DFU diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 3a96483..e0bde12 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -125,11 +125,9 @@ #define CONFIG_USB_STORAGE #define CONFIG_USB_XHCI_ZYNQMP -#define CONFIG_USB_DWC3 #define CONFIG_USB_DWC3_GADGET #define CONFIG_USB_GADGET_DOWNLOAD -#define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USBDOWNLOAD_GADGET #define CONFIG_SYS_DFU_DATA_BUF_SIZE 0x1800000 #define DFU_DEFAULT_POLL_TIMEOUT 300