aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2021-08-08 12:20:31 -0600
committerTom Rini <trini@konsulko.com>2021-09-03 21:54:19 -0400
commit478bd99e8ceb50b20779a7371641e6fd4b4a368a (patch)
tree153d81d8f6be1cb5c8ae4918e7feb468996602d5
parent04f9a0f2bfcf9cdf7eb2c028761e9104543e0494 (diff)
downloadu-boot-WIP/2021-09-04-makefile-cleanups-part-b.zip
u-boot-WIP/2021-09-04-makefile-cleanups-part-b.tar.gz
u-boot-WIP/2021-09-04-makefile-cleanups-part-b.tar.bz2
net: Move network rules to drivers/netWIP/2021-09-04-makefile-cleanups-part-b
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>
-rw-r--r--Makefile3
-rw-r--r--drivers/Makefile4
-rw-r--r--drivers/net/Makefile3
3 files changed, 4 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 9465e22..72cfa5c 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 1283b88..e511cd9 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/
@@ -48,9 +49,6 @@ obj-$(CONFIG_$(SPL_)ALTERA_SDRAM) += ddr/altera/
obj-$(CONFIG_ARCH_IMX8M) += ddr/imx/imx8m/
obj-$(CONFIG_IMX8ULP_DRAM) += ddr/imx/imx8ulp/
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 b94ccea..96c061a 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