From patchwork Fri Apr 15 14:40:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Protsenko X-Patchwork-Id: 65933 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp1220933qge; Fri, 15 Apr 2016 07:41:06 -0700 (PDT) X-Received: by 10.28.104.131 with SMTP id d125mr4589755wmc.99.1460731265936; Fri, 15 Apr 2016 07:41:05 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id o13si27141096wjq.52.2016.04.15.07.41.05; Fri, 15 Apr 2016 07:41:05 -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 20578A75BF; Fri, 15 Apr 2016 16:41:05 +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 ZHQ7ruJP9xWK; Fri, 15 Apr 2016 16:41:04 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 70B06A7531; Fri, 15 Apr 2016 16:41:04 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6A9A9A7531 for ; Fri, 15 Apr 2016 16:41:01 +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 qNpM27Kl1XUg for ; Fri, 15 Apr 2016 16:41:01 +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-lf0-f46.google.com (mail-lf0-f46.google.com [209.85.215.46]) by theia.denx.de (Postfix) with ESMTPS id 2AE4DA74C6 for ; Fri, 15 Apr 2016 16:40:57 +0200 (CEST) Received: by mail-lf0-f46.google.com with SMTP id g184so147911623lfb.3 for ; Fri, 15 Apr 2016 07:40:57 -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; bh=wj6bwS/zQP8RasV46ysEu9zWULo1VcltFvffx1Xu/xI=; b=Dt+xx0rYeXSdqSTkZj811MbA3Zq8fDW1AD3HFa8mp1UW6b6DailbMuqScTTSlur+Yo F6nQrnQyxshjTmgfn5MzKSOBdyh8rDvLC0wDMQLWhIew50foh387JhhDzq9SDGVwtGmf vMjS3cOzrfZkFG/1lzRsbZnTqx5rVG5yYBKVo= 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; bh=wj6bwS/zQP8RasV46ysEu9zWULo1VcltFvffx1Xu/xI=; b=L4NxMYOhWf9tAtGFQaeNfSPfAgCmTDHhxwY3xgeowfdZAej+Gfsegrp52k4+uLdM8B 5FlVXkljbV7r2OB4BrWDAIgWt7LSdetGBoDaQdY2aWUHNooyjiQmfC7cLyVBu+uz9PXd 1eMZJzgfaw9TwBiarVSPag4BRbRQzp1yScnhlm14CFX8u9Tjknp5fdUEseT45dC6lJaq o5h9ut1cwPcnflqdy8o2a7QyBSN7X2sGZ/WQ78IkTi/pZnPg9OPojg4ZLsfalghIkVW2 3+2JhAAYkQ3MniXRNvjfDqP3HJcB+quVPPxj+QADh8Ir/2Lu/ZrJd/pbnyZB3KTZqBM3 Qydg== X-Gm-Message-State: AOPr4FVv4+71HBorCba076aA/6sRzu/7/V3hT9GfG3yjThnu2DZUI5sYTpW9MQcDO0Now6/a X-Received: by 10.112.51.8 with SMTP id g8mr7405851lbo.109.1460731257052; Fri, 15 Apr 2016 07:40:57 -0700 (PDT) Received: from localhost ([195.238.92.132]) by smtp.gmail.com with ESMTPSA id p195sm7822101lfd.11.2016.04.15.07.40.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Apr 2016 07:40:56 -0700 (PDT) From: Sam Protsenko To: u-boot@lists.denx.de Date: Fri, 15 Apr 2016 17:40:56 +0300 Message-Id: <1460731256-8940-1-git-send-email-semen.protsenko@linaro.org> X-Mailer: git-send-email 2.8.0.rc3 Cc: Marek Vasut , Tom Rini , Praneeth Bajjuri Subject: [U-Boot] [PATCH] usb: gadget: Disable gadget options in SPL 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" During Kconfig migrating process we missed to check some gadget options for SPL_BUILD. Do it now to properly disable gadget in SPL build for those platforms that disabled it before migrating options to Kconfig. Signed-off-by: Sam Protsenko --- include/configs/am43xx_evm.h | 1 + include/configs/mx6sabre_common.h | 11 +++++++++++ include/configs/siemens-am33x-common.h | 10 ++++++++++ include/configs/smartweb.h | 9 +++++++++ include/configs/tegra-common-usb-gadget.h | 11 +++++++++++ 5 files changed, 42 insertions(+) -- 2.8.0.rc3 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 5d5ae5e..c8beacd 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -127,6 +127,7 @@ #undef CONFIG_USB_DWC3 #undef CONFIG_USB_DWC3_GADGET +#undef CONFIG_USB_GADGET #undef CONFIG_USB_GADGET_DOWNLOAD #undef CONFIG_USB_GADGET_VBUS_DRAW #undef CONFIG_G_DNL_MANUFACTURER diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 87bbf2e..5ca0fda 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -252,4 +252,15 @@ #define CONFIG_DFU_SF #endif +#ifdef CONFIG_SPL_BUILD +#undef CONFIG_CI_UDC +#undef CONFIG_USB_GADGET +#undef CONFIG_USB_GADGET_VBUS_DRAW +#undef CONFIG_USB_GADGET_DUALSPEED +#undef CONFIG_USB_GADGET_DOWNLOAD +#undef CONFIG_G_DNL_MANUFACTURER +#undef CONFIG_G_DNL_VENDOR_NUM +#undef CONFIG_G_DNL_PRODUCT_NUM +#endif + #endif /* __MX6QSABRE_COMMON_CONFIG_H */ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 5b94fad..d11566e 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -253,6 +253,16 @@ #endif /* CONFIG_SPL_BUILD */ +#ifdef CONFIG_SPL_BUILD +#undef CONFIG_USB_MUSB_GADGET +#undef CONFIG_USB_GADGET +#undef CONFIG_USB_GADGET_VBUS_DRAW +#undef CONFIG_USB_GADGET_DOWNLOAD +#undef CONFIG_G_DNL_MANUFACTURER +#undef CONFIG_G_DNL_VENDOR_NUM +#undef CONFIG_G_DNL_PRODUCT_NUM +#endif + /* * Default to using SPI for environment, etc. We have multiple copies * of SPL as the ROM will check these locations. diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 0352379..f2e9b90 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -181,6 +181,15 @@ #define CONFIG_SYS_CACHELINE_SIZE 0x2000 #endif +#ifdef CONFIG_SPL_BUILD +#undef CONFIG_USB_GADGET +#undef CONFIG_USB_GADGET_VBUS_DRAW +#undef CONFIG_USB_GADGET_DOWNLOAD +#undef CONFIG_G_DNL_MANUFACTURER +#undef CONFIG_G_DNL_VENDOR_NUM +#undef CONFIG_G_DNL_PRODUCT_NUM +#endif + /* General Boot Parameter */ #define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTCOMMAND "run flashboot" diff --git a/include/configs/tegra-common-usb-gadget.h b/include/configs/tegra-common-usb-gadget.h index 18851ca..1d6b99e 100644 --- a/include/configs/tegra-common-usb-gadget.h +++ b/include/configs/tegra-common-usb-gadget.h @@ -28,4 +28,15 @@ #define CONFIG_DFU_RAM #endif +#ifdef CONFIG_SPL_BUILD +#undef CONFIG_CI_UDC +#undef CONFIG_USB_GADGET +#undef CONFIG_USB_GADGET_VBUS_DRAW +#undef CONFIG_USB_GADGET_DUALSPEED +#undef CONFIG_USB_GADGET_DOWNLOAD +#undef CONFIG_G_DNL_MANUFACTURER +#undef CONFIG_G_DNL_VENDOR_NUM +#undef CONFIG_G_DNL_PRODUCT_NUM +#endif + #endif /* _TEGRA_COMMON_USB_GADGET_H_ */