From patchwork Tue Mar 13 05:24:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 884983 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="Vw90DbLO"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 400jws2lzWz9sSl for ; Tue, 13 Mar 2018 16:25:17 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 0A352C21DEC; Tue, 13 Mar 2018 05:25:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 6A597C21D8E; Tue, 13 Mar 2018 05:25:10 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 26544C21D8E; Tue, 13 Mar 2018 05:25:08 +0000 (UTC) Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by lists.denx.de (Postfix) with ESMTPS id 42179C21C8B for ; Tue, 13 Mar 2018 05:25:07 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id h11so5415974pfn.4 for ; Mon, 12 Mar 2018 22:25:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id; bh=2C4Li0t6CKTu68sOLhVm2zwOB6f0K/66i1+jkByKsyc=; b=Vw90DbLOjg3yExa0Mx4VzmFm/o5C6KXt3AT+T8gWKG79/xfOdDLgEL6PsbwMGbn/9H oa+IywPQ3QYqUigvrTXaWRvEtydSKSWGTfCBF/kkwnZcBfiaRhIa19ILMtfh1ZaktrRV 8e44QI6SiAFjihR3832sFIHRaVN1eJvR69pUA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=2C4Li0t6CKTu68sOLhVm2zwOB6f0K/66i1+jkByKsyc=; b=uJl3CSCIILkcvKdRuLM5orLgfL9jhjyAR+u6gueICakFhn25K72/85pOG0gYcBlUII LRjwiS+UBw+rrgABwpqvnunQBjCWMbujiRmf3NMEah2KLXMdj8xC15FFLeNLIvOA9Eyb erGiPO5kmU8MmLD9gomUzpFNGwt7k3LObyHBy/jZz0o93gGrdpMcVrJX3BYf5NFCyVb3 3YgjDPcN2h1DnRizf73hCVUYGc6L8NbF9aZdWKFBUHh1RnI6suHdJ5q9AWpaJ14ZgYDw 1jS89fRlxO9YoYvwBe7biaqVPT4YiZ/KceQSMtsCDkCR50nTNEHGDRtEhBALcYYa3/a/ Wh+A== X-Gm-Message-State: AElRT7F4n5AtME8CEBG5MBQ8x91dOsl7DMFWqmw7uWrU10QKN+6hbjF9 L+DcmaRyitlMOERA/aaJ/bgmsxGvRNU= X-Google-Smtp-Source: AG47ELv5C4neCP9CRyPyW3gj/GUvVks5urMgDf8fBXUB+rmHYgilIjbk8rGc8lBvYknpJkzaSCeKXw== X-Received: by 10.167.129.67 with SMTP id d3mr10465645pfn.108.1520918705711; Mon, 12 Mar 2018 22:25:05 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.211]) by smtp.gmail.com with ESMTPSA id r29sm19188247pfj.99.2018.03.12.22.25.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Mar 2018 22:25:05 -0700 (PDT) From: Jagan Teki To: Stefano Babic Date: Tue, 13 Mar 2018 10:54:58 +0530 Message-Id: <20180313052458.4699-1-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.14.3 Cc: Fabio Estevam , u-boot@lists.denx.de Subject: [U-Boot] [PATCH] configs: i.MX6: Move USB Manufacturer, VID, PID to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Define i.MX6 defaults for USB_GADGET_MANUFACTURER|VENDOR_NUM|PRODUCT_NUM instead of redundant defines in defconfig files. Signed-off-by: Jagan Teki --- configs/cgtqmx6eval_defconfig | 2 -- configs/dh_imx6_defconfig | 2 -- configs/dms-ba16-1g_defconfig | 2 -- configs/dms-ba16_defconfig | 2 -- configs/gwventana_emmc_defconfig | 2 -- configs/gwventana_gw5904_defconfig | 2 -- configs/gwventana_nand_defconfig | 2 -- configs/mx6memcal_defconfig | 3 --- configs/mx6qsabrelite_defconfig | 2 -- configs/mx6sabreauto_defconfig | 3 --- configs/mx6sabresd_defconfig | 3 --- configs/nitrogen6dl2g_defconfig | 2 -- configs/nitrogen6dl_defconfig | 2 -- configs/nitrogen6q2g_defconfig | 2 -- configs/nitrogen6q_defconfig | 2 -- configs/nitrogen6s1g_defconfig | 2 -- configs/nitrogen6s_defconfig | 2 -- configs/opos6uldev_defconfig | 2 -- configs/pico-imx6ul_defconfig | 3 --- configs/tbs2910_defconfig | 2 -- configs/warp_defconfig | 3 --- drivers/usb/gadget/Kconfig | 3 +++ 22 files changed, 3 insertions(+), 47 deletions(-) diff --git a/configs/cgtqmx6eval_defconfig b/configs/cgtqmx6eval_defconfig index 2ac0bac0b6..65d96e52e7 100644 --- a/configs/cgtqmx6eval_defconfig +++ b/configs/cgtqmx6eval_defconfig @@ -57,8 +57,6 @@ CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Congatec" -CONFIG_USB_GADGET_VENDOR_NUM=0x0525 -CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig index 2b4fe9c2c5..01f805f443 100644 --- a/configs/dh_imx6_defconfig +++ b/configs/dh_imx6_defconfig @@ -48,8 +48,6 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="dh" -CONFIG_USB_GADGET_VENDOR_NUM=0x0525 -CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/dms-ba16-1g_defconfig b/configs/dms-ba16-1g_defconfig index 40b317093f..311da5db5f 100644 --- a/configs/dms-ba16-1g_defconfig +++ b/configs/dms-ba16-1g_defconfig @@ -40,8 +40,6 @@ CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Advantech" -CONFIG_USB_GADGET_VENDOR_NUM=0x0525 -CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_VIDEO=y diff --git a/configs/dms-ba16_defconfig b/configs/dms-ba16_defconfig index 3519c5275c..ca0ac8d7be 100644 --- a/configs/dms-ba16_defconfig +++ b/configs/dms-ba16_defconfig @@ -39,8 +39,6 @@ CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Advantech" -CONFIG_USB_GADGET_VENDOR_NUM=0x0525 -CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_VIDEO=y diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig index a6db1040b6..f50f4f83ae 100644 --- a/configs/gwventana_emmc_defconfig +++ b/configs/gwventana_emmc_defconfig @@ -66,8 +66,6 @@ CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Gateworks" -CONFIG_USB_GADGET_VENDOR_NUM=0x0525 -CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_ETHER=y diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig index 41b93c8a07..0978086631 100644 --- a/configs/gwventana_gw5904_defconfig +++ b/configs/gwventana_gw5904_defconfig @@ -70,8 +70,6 @@ CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Gateworks" -CONFIG_USB_GADGET_VENDOR_NUM=0x0525 -CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_ETHER=y diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig index e513289583..9431f016ff 100644 --- a/configs/gwventana_nand_defconfig +++ b/configs/gwventana_nand_defconfig @@ -70,8 +70,6 @@ CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Gateworks" -CONFIG_USB_GADGET_VENDOR_NUM=0x0525 -CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_ETHER=y diff --git a/configs/mx6memcal_defconfig b/configs/mx6memcal_defconfig index fdcef6b65b..3fcb8518c4 100644 --- a/configs/mx6memcal_defconfig +++ b/configs/mx6memcal_defconfig @@ -35,8 +35,5 @@ CONFIG_CMD_CACHE=y # CONFIG_MMC is not set CONFIG_USB=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="FSL" -CONFIG_USB_GADGET_VENDOR_NUM=0x0525 -CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_REGEX=y diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig index 2b45dc17fd..6b509ecd7f 100644 --- a/configs/mx6qsabrelite_defconfig +++ b/configs/mx6qsabrelite_defconfig @@ -49,8 +49,6 @@ CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Boundary" -CONFIG_USB_GADGET_VENDOR_NUM=0x0525 -CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig index ee6ca57b00..882bb288c3 100644 --- a/configs/mx6sabreauto_defconfig +++ b/configs/mx6sabreauto_defconfig @@ -50,9 +50,6 @@ CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="FSL" -CONFIG_USB_GADGET_VENDOR_NUM=0x0525 -CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_HOST_ETHER=y diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig index 83b8bed52b..97a611fc05 100644 --- a/configs/mx6sabresd_defconfig +++ b/configs/mx6sabresd_defconfig @@ -59,9 +59,6 @@ CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="FSL" -CONFIG_USB_GADGET_VENDOR_NUM=0x0525 -CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig index c109aa3b97..ebce2161d7 100644 --- a/configs/nitrogen6dl2g_defconfig +++ b/configs/nitrogen6dl2g_defconfig @@ -45,8 +45,6 @@ CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Boundary" -CONFIG_USB_GADGET_VENDOR_NUM=0x0525 -CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig index 462229e159..446231d40e 100644 --- a/configs/nitrogen6dl_defconfig +++ b/configs/nitrogen6dl_defconfig @@ -45,8 +45,6 @@ CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Boundary" -CONFIG_USB_GADGET_VENDOR_NUM=0x0525 -CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig index 79c8de3d8e..ed4f7019b4 100644 --- a/configs/nitrogen6q2g_defconfig +++ b/configs/nitrogen6q2g_defconfig @@ -47,8 +47,6 @@ CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Boundary" -CONFIG_USB_GADGET_VENDOR_NUM=0x0525 -CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig index 2895b6e958..bd81fd70b8 100644 --- a/configs/nitrogen6q_defconfig +++ b/configs/nitrogen6q_defconfig @@ -47,8 +47,6 @@ CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Boundary" -CONFIG_USB_GADGET_VENDOR_NUM=0x0525 -CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig index e7348af733..5fe265a617 100644 --- a/configs/nitrogen6s1g_defconfig +++ b/configs/nitrogen6s1g_defconfig @@ -45,8 +45,6 @@ CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Boundary" -CONFIG_USB_GADGET_VENDOR_NUM=0x0525 -CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig index e9e9f73176..3d6760b58e 100644 --- a/configs/nitrogen6s_defconfig +++ b/configs/nitrogen6s_defconfig @@ -45,8 +45,6 @@ CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Boundary" -CONFIG_USB_GADGET_VENDOR_NUM=0x0525 -CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y diff --git a/configs/opos6uldev_defconfig b/configs/opos6uldev_defconfig index d4c8db23fd..0df73eb881 100644 --- a/configs/opos6uldev_defconfig +++ b/configs/opos6uldev_defconfig @@ -78,8 +78,6 @@ CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Armadeus Systems" -CONFIG_USB_GADGET_VENDOR_NUM=0x0525 -CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_VIDEO=y diff --git a/configs/pico-imx6ul_defconfig b/configs/pico-imx6ul_defconfig index c6fa11a9b4..bf537020b5 100644 --- a/configs/pico-imx6ul_defconfig +++ b/configs/pico-imx6ul_defconfig @@ -35,9 +35,6 @@ CONFIG_PHY_MICREL=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="FSL" -CONFIG_USB_GADGET_VENDOR_NUM=0x0525 -CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index 567f80be84..e84b2058be 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -47,8 +47,6 @@ CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="TBS" -CONFIG_USB_GADGET_VENDOR_NUM=0x0525 -CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_VIDEO=y diff --git a/configs/warp_defconfig b/configs/warp_defconfig index bddf4bcf1d..49e6589b41 100644 --- a/configs/warp_defconfig +++ b/configs/warp_defconfig @@ -30,9 +30,6 @@ CONFIG_DFU_MMC=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="FSL" -CONFIG_USB_GADGET_VENDOR_NUM=0x0525 -CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 6825e6b543..38cddc2a7d 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -39,6 +39,7 @@ if USB_GADGET config USB_GADGET_MANUFACTURER string "Vendor name of the USB device" default "Allwinner Technology" if ARCH_SUNXI + default "FSL" if ARCH_MX6 default "U-Boot" help Vendor name of the USB device emulated, reported to the host device. @@ -47,6 +48,7 @@ config USB_GADGET_MANUFACTURER config USB_GADGET_VENDOR_NUM hex "Vendor ID of the USB device" default 0x1f3a if ARCH_SUNXI + default 0x0525 if ARCH_MX6 default 0x0 help Vendor ID of the USB device emulated, reported to the host device. @@ -56,6 +58,7 @@ config USB_GADGET_VENDOR_NUM config USB_GADGET_PRODUCT_NUM hex "Product ID of the USB device" default 0x1010 if ARCH_SUNXI + default 0xa4a5 if ARCH_MX6 default 0x0 help Product ID of the USB device emulated, reported to the host device.