u-boot.lists.denx.de archive mirror
 help / color / mirror / Atom feed
From: Simon Glass <sjg@chromium.org>
To: U-Boot Mailing List <u-boot@lists.denx.de>
Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>,
	Joe Hershberger <joe.hershberger@ni.com>
Subject: [PATCH 23/23] net: Move network rules to drivers/net
Date: Sun,  8 Aug 2021 12:20:31 -0600	[thread overview]
Message-ID: <20210808182031.3747270-24-sjg@chromium.org> (raw)
In-Reply-To: <20210808182031.3747270-1-sjg@chromium.org>

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 <sjg@chromium.org>
---

 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


      parent reply	other threads:[~2021-08-08 18:25 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-08 18:20 [PATCH 00/23] Makefile: Continue simplifying Makefile rules (Part B) Simon Glass
2021-08-08 18:20 ` [PATCH 01/23] mmc: Rename MMC_SUPPORT to MMC Simon Glass
2021-08-12 22:22   ` Jaehoon Chung
2021-09-04 19:58   ` Tom Rini
2021-08-08 18:20 ` [PATCH 02/23] pch: Rename PCH_SUPPORT to PCH Simon Glass
2021-08-08 18:20 ` [PATCH 03/23] rtc: Rename RTC_SUPPORT to RTC Simon Glass
2021-08-08 18:20 ` [PATCH 04/23] serial: Rename SERIAL_SUPPORT to SERIAL Simon Glass
2021-08-08 18:20 ` [PATCH 05/23] serial: Add a SERIAL config Simon Glass
2021-08-13  1:11   ` Sean Anderson
2021-08-08 18:20 ` [PATCH 06/23] spi: Rename SPI_SUPPORT to SPI Simon Glass
2021-08-08 18:20 ` [PATCH 07/23] Rename CACHE_SUPPORT to CACHE Simon Glass
2021-08-08 18:20 ` [PATCH 08/23] ppc: Rename MPC8XXX_INIT_DDR_SUPPORT to MPC8XXX_INIT_DDR Simon Glass
2021-08-08 18:20 ` [PATCH 09/23] sata: Rename SATA_SUPPORT to SATA Simon Glass
2021-08-08 18:20 ` [PATCH 10/23] Makefile: Unify the rules for BOOTCOUNT_LIMIT Simon Glass
2021-08-08 18:20 ` [PATCH 11/23] dma: Add a Kconfig for legacy DMA Simon Glass
2021-08-08 18:20 ` [PATCH 12/23] ti: Convert CONFIG_TI_EDMA3 to Kconfig Simon Glass
2021-08-11 12:22   ` Lokesh Vutla
2021-08-08 18:20 ` [PATCH 13/23] Convert CONFIG_DMA_LPC32XX " Simon Glass
2021-08-08 18:20 ` [PATCH 14/23] Makefile: Move drivers/dma/ into drivers/Makefile Simon Glass
2021-08-08 18:20 ` [PATCH 15/23] tegra: gpio: Drop use of CONFIG_xxx variables Simon Glass
2021-08-08 18:20 ` [PATCH 16/23] gpio: Add a GPIO config Simon Glass
2021-08-08 18:20 ` [PATCH 17/23] power: Tidy up #undef of CONFIG_DM_PMIC Simon Glass
2021-08-12 22:19   ` Jaehoon Chung
2021-08-08 18:20 ` [PATCH 18/23] power: Rename CONFIG_POWER to CONFIG_POWER_LEGACY Simon Glass
2021-08-12 22:20   ` Jaehoon Chung
2021-08-08 18:20 ` [PATCH 19/23] i2c: Convert CONFIG_POWER_I2C et al to Kconfig Simon Glass
2021-08-12 22:20   ` Jaehoon Chung
2021-09-04 15:08   ` Tom Rini
2021-09-30  4:08     ` Simon Glass
2021-09-30 11:31       ` Tom Rini
2021-08-08 18:20 ` [PATCH 20/23] power: Add a POWER config Simon Glass
2021-08-08 18:20 ` [PATCH 21/23] power: Refactor Makefile rules Simon Glass
2021-08-12 22:21   ` Jaehoon Chung
2021-08-08 18:20 ` [PATCH 22/23] net: Rename SPL_NET_SUPPORT to SPL_NET Simon Glass
2021-08-08 18:20 ` Simon Glass [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210808182031.3747270-24-sjg@chromium.org \
    --to=sjg@chromium.org \
    --cc=joe.hershberger@ni.com \
    --cc=trini@konsulko.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).