From: Simon Glass <sjg@chromium.org>
Date: Sun, 11 Jul 2021 03:14:23 +0000 (-0600)
Subject: Makefile: Move phy rules into drivers/phy
X-Git-Tag: v2025.01-rc5-pxa1908~1773^2~14
X-Git-Url: http://git.dujemihanovic.xyz/%22http:/kyber.dk/phpMyBuilder/static/%7B%7B?a=commitdiff_plain;h=9d910b76f70166b7b0b271710a92eaa289b011c6;p=u-boot.git

Makefile: Move phy rules into drivers/phy

These don't belong in the drivers Makefile so move them down into
the correct place.

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: Fixup some missing dependencies this exposed]
Signed-off-by: Tom Rini <trini@konsulko.com>
---

diff --git a/configs/clearfog_gt_8k_defconfig b/configs/clearfog_gt_8k_defconfig
index ee701883d7..c94d63ee48 100644
--- a/configs/clearfog_gt_8k_defconfig
+++ b/configs/clearfog_gt_8k_defconfig
@@ -58,6 +58,7 @@ CONFIG_MVPP2=y
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_PCIE_DW_MVEBU=y
+CONFIG_PHY=y
 CONFIG_MVEBU_COMPHY_SUPPORT=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_ARMADA_8K=y
diff --git a/configs/mvebu_crb_cn9130_defconfig b/configs/mvebu_crb_cn9130_defconfig
index 7acb8fedd4..e1075d71a4 100644
--- a/configs/mvebu_crb_cn9130_defconfig
+++ b/configs/mvebu_crb_cn9130_defconfig
@@ -64,6 +64,7 @@ CONFIG_MVPP2=y
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_PCIE_DW_MVEBU=y
+CONFIG_PHY=y
 CONFIG_MVEBU_COMPHY_SUPPORT=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_ARMADA_8K=y
diff --git a/configs/mvebu_db-88f3720_defconfig b/configs/mvebu_db-88f3720_defconfig
index a957857080..bc92fdb8ee 100644
--- a/configs/mvebu_db-88f3720_defconfig
+++ b/configs/mvebu_db-88f3720_defconfig
@@ -59,6 +59,7 @@ CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_PCI=y
 CONFIG_PCI_AARDVARK=y
+CONFIG_PHY=y
 CONFIG_MVEBU_COMPHY_SUPPORT=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_ARMADA_37XX=y
diff --git a/configs/mvebu_db_armada8k_defconfig b/configs/mvebu_db_armada8k_defconfig
index 1ae7ea758c..adcc5d130a 100644
--- a/configs/mvebu_db_armada8k_defconfig
+++ b/configs/mvebu_db_armada8k_defconfig
@@ -53,6 +53,7 @@ CONFIG_MVPP2=y
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_PCIE_DW_MVEBU=y
+CONFIG_PHY=y
 CONFIG_MVEBU_COMPHY_SUPPORT=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_ARMADA_8K=y
diff --git a/configs/mvebu_db_cn9130_defconfig b/configs/mvebu_db_cn9130_defconfig
index 73e778cdd5..0ab1cc8d88 100644
--- a/configs/mvebu_db_cn9130_defconfig
+++ b/configs/mvebu_db_cn9130_defconfig
@@ -68,6 +68,7 @@ CONFIG_MVPP2=y
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_PCIE_DW_MVEBU=y
+CONFIG_PHY=y
 CONFIG_MVEBU_COMPHY_SUPPORT=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_ARMADA_8K=y
diff --git a/configs/mvebu_espressobin-88f3720_defconfig b/configs/mvebu_espressobin-88f3720_defconfig
index 8ddc08dec0..c8ae0cf610 100644
--- a/configs/mvebu_espressobin-88f3720_defconfig
+++ b/configs/mvebu_espressobin-88f3720_defconfig
@@ -72,6 +72,7 @@ CONFIG_MVNETA=y
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_PCI_AARDVARK=y
+CONFIG_PHY=y
 CONFIG_MVEBU_COMPHY_SUPPORT=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_ARMADA_37XX=y
diff --git a/configs/mvebu_mcbin-88f8040_defconfig b/configs/mvebu_mcbin-88f8040_defconfig
index cc45999ac1..7fd9e25b5a 100644
--- a/configs/mvebu_mcbin-88f8040_defconfig
+++ b/configs/mvebu_mcbin-88f8040_defconfig
@@ -58,6 +58,7 @@ CONFIG_MVPP2=y
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_PCIE_DW_MVEBU=y
+CONFIG_PHY=y
 CONFIG_MVEBU_COMPHY_SUPPORT=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_ARMADA_8K=y
diff --git a/configs/mvebu_puzzle-m801-88f8040_defconfig b/configs/mvebu_puzzle-m801-88f8040_defconfig
index c682216320..5653f921e9 100644
--- a/configs/mvebu_puzzle-m801-88f8040_defconfig
+++ b/configs/mvebu_puzzle-m801-88f8040_defconfig
@@ -62,6 +62,7 @@ CONFIG_MVPP2=y
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_PCIE_DW_MVEBU=y
+CONFIG_PHY=y
 CONFIG_MVEBU_COMPHY_SUPPORT=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_ARMADA_8K=y
diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig
index 56c027e5fe..c19b8379c3 100644
--- a/configs/turris_mox_defconfig
+++ b/configs/turris_mox_defconfig
@@ -74,6 +74,7 @@ CONFIG_MVNETA=y
 CONFIG_NVME=y
 CONFIG_PCI=y
 CONFIG_PCI_AARDVARK=y
+CONFIG_PHY=y
 CONFIG_MVEBU_COMPHY_SUPPORT=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_ARMADA_37XX=y
diff --git a/configs/uDPU_defconfig b/configs/uDPU_defconfig
index c7f362a3cd..3e6bb32cb8 100644
--- a/configs/uDPU_defconfig
+++ b/configs/uDPU_defconfig
@@ -73,6 +73,7 @@ CONFIG_E1000=y
 CONFIG_MVNETA=y
 CONFIG_PCI=y
 CONFIG_PCI_AARDVARK=y
+CONFIG_PHY=y
 CONFIG_MVEBU_COMPHY_SUPPORT=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_ARMADA_37XX=y
diff --git a/drivers/Makefile b/drivers/Makefile
index 82d3c98e06..872999eb4a 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -93,11 +93,7 @@ obj-$(CONFIG_NVME) += nvme/
 obj-$(CONFIG_PCI_ENDPOINT) += pci_endpoint/
 obj-y += dfu/
 obj-$(CONFIG_PCH) += pch/
-obj-y += phy/allwinner/
-obj-y += phy/marvell/
 obj-$(CONFIG_DM_REBOOT_MODE) += reboot-mode/
-obj-y += phy/rockchip/
-obj-y += phy/socionext/
 obj-y += rtc/
 obj-y += scsi/
 obj-y += sound/
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
index 0f2b63ae3c..b2285c47ac 100644
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -3,6 +3,11 @@
 # Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/
 # Written by Jean-Jacques Hiblot  <jjhiblot@ti.com>
 
+obj-y += allwinner/
+obj-y += marvell/
+obj-y += rockchip/
+obj-y += socionext/
+
 obj-$(CONFIG_$(SPL_)PHY) += phy-uclass.o
 obj-$(CONFIG_$(SPL_)NOP_PHY) += nop-phy.o
 obj-$(CONFIG_MIPI_DPHY_HELPERS) += phy-core-mipi-dphy.o