Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8F184C43334 for ; Mon, 13 Jun 2022 00:02:53 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E337E84435; Mon, 13 Jun 2022 02:02:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="OH1NjLos"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B79FC84429; Mon, 13 Jun 2022 02:02:17 +0200 (CEST) Received: from mail-qt1-x829.google.com (mail-qt1-x829.google.com [IPv6:2607:f8b0:4864:20::829]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6AA4C8442B for ; Mon, 13 Jun 2022 02:02:13 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qt1-x829.google.com with SMTP id i25so2973240qtq.0 for ; Sun, 12 Jun 2022 17:02:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=L7jl6QuAOFMEn3GgGXPGv3EXXXiFXbcF9ECIz8MuSNc=; b=OH1NjLosLyIZUIhG5Rjh+T/xSZdqFPzCyeYfWnmfuSFibagpUrJn6m3UTnvqCY6Oi7 mUPKt8fO5RqADF9JF577a8DOVnpvNtkhW8HfzmwB1GKL5jIh6GPbIeIJLnwvgx4BzSKU 82y3HuInEkAbbiuZsd8Ci8ea/g6g9SzkpnM8I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L7jl6QuAOFMEn3GgGXPGv3EXXXiFXbcF9ECIz8MuSNc=; b=Xexo5J8fdyCLtiVH2Zt87vPiUCBCRx5GPj8rcNIwvWppjTKHcv3jfDfZ1BLgESE9Op fTrNKJ4p2aZNsZ0QIrK6DphWd9nM6gVhEGdfZBg7wW3peIx3lUr5Ig09eDUvMhEhLzSV hHpeOknRLRVz3XMocVEUtuhJxNGSoRgIe/FHzXHBL0Cl/JnZkk3BiO1cNvYkJB/6Pt/C agB2lAsEnGCTy6SSwNmVpUKWAlzpBMPqZ9FbgxhFIPnZL+561cNK6VEGn4vLCsYdkW7s OETCu3Jx6S4qMq1tV/l/nj13Hy1o97san2ij1pyRFQQo/7hHeMY9s/g5n/3qAGUpS785 z7GQ== X-Gm-Message-State: AOAM532uqrbpprTT1zZRXJwgJYLYjfP3ciyQQKreM6Qa05OqKn59qXbo ayIuq+aAtbGbiI6ZJXPtG6zHRao5k3n/SQ== X-Google-Smtp-Source: ABdhPJzf47vZ/5tEomcNMCyh497j2ANJ4Ygmb+SXw+L+4mUvkWetsXa0Zyh4TugYGzEIsZ/gcloRXA== X-Received: by 2002:a05:622a:64f:b0:2f3:eb96:b608 with SMTP id a15-20020a05622a064f00b002f3eb96b608mr44848561qtb.338.1655078532675; Sun, 12 Jun 2022 17:02:12 -0700 (PDT) Received: from bill-the-cat.lan (cpe-65-184-195-139.ec.res.rr.com. [65.184.195.139]) by smtp.gmail.com with ESMTPSA id h5-20020a05620a400500b006a6d4261f40sm2625551qko.111.2022.06.12.17.02.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jun 2022 17:02:12 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 6/8] common: usb: Update logic for usb.o, usb_hub.o and usb_storage.o Date: Sun, 12 Jun 2022 20:02:03 -0400 Message-Id: <20220613000205.891039-6-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220613000205.891039-1-trini@konsulko.com> References: <20220613000205.891039-1-trini@konsulko.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean Now that we have consistently named symbols to enable USB host or gadget controller support in SPL or full U-Boot, we do not need to unconditionally build USB files nor depend on non-SPL symbols to know when to build these common files. Signed-off-by: Tom Rini --- common/Makefile | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/common/Makefile b/common/Makefile index 75c24e324927..2ed8672c3ac1 100644 --- a/common/Makefile +++ b/common/Makefile @@ -23,10 +23,9 @@ obj-$(CONFIG_MII) += miiphyutil.o obj-$(CONFIG_CMD_MII) += miiphyutil.o obj-$(CONFIG_PHYLIB) += miiphyutil.o -ifdef CONFIG_USB -obj-y += usb.o usb_hub.o +obj-$(CONFIG_USB_HOST) += usb.o usb_hub.o +obj-$(CONFIG_USB_GADGET) += usb.o usb_hub.o obj-$(CONFIG_USB_STORAGE) += usb_storage.o -endif # others obj-$(CONFIG_CONSOLE_MUX) += iomux.o @@ -57,13 +56,9 @@ endif obj-$(CONFIG_SPL_NET) += miiphyutil.o obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o -ifdef CONFIG_SPL_USB_HOST -obj-y += usb.o -obj-y += usb_hub.o +obj-$(CONFIG_SPL_USB_HOST) += usb.o usb_hub.o obj-$(CONFIG_SPL_USB_STORAGE) += usb_storage.o -else -obj-$(CONFIG_USB_MUSB_HOST) += usb.o -endif +obj-$(CONFIG_SPL_MUSB_NEW) += usb.o endif # CONFIG_SPL_BUILD #others -- 2.25.1