From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4FF3BC4338F for ; Sun, 8 Aug 2021 18:25:21 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id B4235600CD for ; Sun, 8 Aug 2021 18:25:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B4235600CD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 281B483298; Sun, 8 Aug 2021 20:22:26 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="SH9txb1a"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 080FA82DA6; Sun, 8 Aug 2021 20:21:48 +0200 (CEST) Received: from mail-oi1-x232.google.com (mail-oi1-x232.google.com [IPv6:2607:f8b0:4864:20::232]) (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 AF38D81E3D for ; Sun, 8 Aug 2021 20:21:04 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-oi1-x232.google.com with SMTP id bj40so727356oib.6 for ; Sun, 08 Aug 2021 11:21:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jpN4+GCtjAGtsJgBHr0Nvg+RHPgXI/PR1C2qTXzxya4=; b=SH9txb1aiKTIqY/ybQUMuut+eHksbY1XNEItuQL6Obf+2SdbUZy9VuyiLZ6f6sMaJN mjFV6yxkQmT1fUr8J3A0Dp2tG79WdQeI/VnnkljYQqskjPo1+gxGbbnJZZppf3/d6MY+ eZ7CBD9+MrOuz3Aogv5/YJNM1rV69aAJ8GSlE= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=jpN4+GCtjAGtsJgBHr0Nvg+RHPgXI/PR1C2qTXzxya4=; b=F6yXmGCWZh+7HFLFRrufq9/TmpkzMU5Lai+lvvl/CJtBdPETJzGVE1IbHp1SLNw/Ch Oht2F1RNE1u2EBb0jrTuZ/1SsJhlZKU9v5/1MZyiqS6ATQEFWxgRhxeoWKswLEGhadZm GrncdktgaFdocdvqBxzpelVIWiZpGu8p5vuuENzLkleK9C9nonyDBLEY35CI4AdvsXqG dPpR6Do72UxLvCrEuDn1rCsikX9SrVI3gb/c47Ow9Gx56ZgGXBJOkovYnRlN3O7Ds6Ux DGr0oz1FOdBMzPUT3rOHBqUuHGdgoQ8dH0X8R7Q7ac/aM7BW9tswTkc9T+CVtAjegtWe 3RVQ== X-Gm-Message-State: AOAM530i4rL7Hl2wXhHxHS8l9srsDUNtOaMPAKwR/7b1PUb/7KffyDVX o5IbC02DmPoZ98W8WZ6tv4hOsu9SLC6nM+3p X-Google-Smtp-Source: ABdhPJw4kt7DlUAzbP/ZJmYnkEjdmuc29hakmXwAmejXgfBmR9+G16biSWU9zxjaLmuLLMnYF/JdyQ== X-Received: by 2002:a05:6808:98d:: with SMTP id a13mr15792875oic.85.1628446863055; Sun, 08 Aug 2021 11:21:03 -0700 (PDT) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id bc42sm2257147oob.39.2021.08.08.11.21.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Aug 2021 11:21:02 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Joe Hershberger Subject: [PATCH 23/23] net: Move network rules to drivers/net Date: Sun, 8 Aug 2021 12:20:31 -0600 Message-Id: <20210808182031.3747270-24-sjg@chromium.org> X-Mailer: git-send-email 2.32.0.605.g8dce9f2422-goog In-Reply-To: <20210808182031.3747270-1-sjg@chromium.org> References: <20210808182031.3747270-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean Drop these from the top-level Makefile and also move the phy rule into drivers/net/Makefile which is where it belongs. Signed-off-by: Simon Glass --- Makefile | 3 --- drivers/Makefile | 4 +--- drivers/net/Makefile | 3 +++ 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index c744ff8ee4e..ccd4fb13de6 100644 --- a/Makefile +++ b/Makefile @@ -813,9 +813,6 @@ libs-y += fs/ libs-y += net/ libs-y += disk/ libs-y += drivers/ -libs-y += drivers/net/ -libs-y += drivers/net/phy/ -libs-$(CONFIG_FMAN_ENET) += drivers/net/fm/ libs-$(CONFIG_SYS_FSL_DDR) += drivers/ddr/fsl/ libs-$(CONFIG_SYS_FSL_MMDC) += drivers/ddr/fsl/ libs-$(CONFIG_$(SPL_)ALTERA_SDRAM) += drivers/ddr/altera/ diff --git a/drivers/Makefile b/drivers/Makefile index c256cd97210..f8552089b7b 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -18,6 +18,7 @@ obj-$(CONFIG_$(SPL_TPL_)LED) += led/ obj-$(CONFIG_$(SPL_TPL_)MMC) += mmc/ obj-y += mtd/ obj-$(CONFIG_$(SPL_)MULTIPLEXER) += mux/ +obj-$(CONFIG_$(SPL_TPL_)NET) += net/ obj-$(CONFIG_$(SPL_TPL_)PCH) += pch/ obj-$(CONFIG_$(SPL_TPL_)PCI) += pci/ obj-$(CONFIG_$(SPL_TPL_)PHY) += phy/ @@ -47,9 +48,6 @@ obj-$(CONFIG_ARMADA_XP) += ddr/marvell/axp/ obj-$(CONFIG_$(SPL_)ALTERA_SDRAM) += ddr/altera/ obj-$(CONFIG_ARCH_IMX8M) += ddr/imx/imx8m/ obj-$(CONFIG_SPL_DM_RESET) += reset/ -obj-$(CONFIG_SPL_ETH) += net/ -obj-$(CONFIG_SPL_ETH) += net/phy/ -obj-$(CONFIG_SPL_USB_ETHER) += net/phy/ obj-$(CONFIG_SPL_MUSB_NEW) += usb/musb-new/ obj-$(CONFIG_SPL_USB_GADGET) += usb/gadget/ obj-$(CONFIG_SPL_USB_GADGET) += usb/common/ diff --git a/drivers/net/Makefile b/drivers/net/Makefile index b94ccea1003..96c061aafdf 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -3,6 +3,8 @@ # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. +obj-y += phy/ + obj-$(CONFIG_ALTERA_TSE) += altera_tse.o obj-$(CONFIG_AG7XXX) += ag7xxx.o obj-$(CONFIG_ARMADA100_FEC) += armada100_fec.o @@ -33,6 +35,7 @@ obj-$(CONFIG_SUN8I_EMAC) += sun8i_emac.o obj-$(CONFIG_EP93XX) += ep93xx_eth.o obj-$(CONFIG_ETHOC) += ethoc.o obj-$(CONFIG_FEC_MXC) += fec_mxc.o +obj-$(CONFIG_FMAN_ENET) += fm/ obj-$(CONFIG_FSLDMAFEC) += fsl_mcdmafec.o mcfmii.o obj-$(CONFIG_FTGMAC100) += ftgmac100.o obj-$(CONFIG_FTMAC110) += ftmac110.o -- 2.32.0.605.g8dce9f2422-goog