The phy_init() is now used only to perform manual relocation of PHY driver callbacks. Wrap it in ifdeffery and only call it on systems which still require manual relocation, i.e. m68k .
Signed-off-by: Marek Vasut marek.vasut+renesas@mailbox.org --- Cc: "Ariel D'Alessandro" ariel.dalessandro@collabora.com Cc: "Cédric Le Goater" clg@kaod.org Cc: "Marek Behún" kabel@kernel.org Cc: Alex Nemirovsky alex.nemirovsky@cortina-access.com Cc: Haolin Li li.haolin@qq.com Cc: Heinrich Schuchardt xypron.glpk@gmx.de Cc: Joe Hershberger joe.hershberger@ni.com Cc: Joel Stanley joel@jms.id.au Cc: Josua Mayer josua@solid-run.com Cc: Marek Vasut marek.vasut+renesas@mailbox.org Cc: Michael Trimarchi michael@amarulasolutions.com Cc: Michal Simek michal.simek@amd.com Cc: Nate Drude nate.d@variscite.com Cc: Neil Armstrong neil.armstrong@linaro.org Cc: Radu Pirea radu-nicolae.pirea@oss.nxp.com Cc: Ramon Fried rfried.dev@gmail.com Cc: Samuel Mendoza-Jonas sam@mendozajonas.com Cc: Stefan Roese sr@denx.de Cc: T Karthik Reddy t.karthik.reddy@xilinx.com Cc: Tim Harvey tharvey@gateworks.com Cc: Vladimir Oltean vladimir.oltean@nxp.com Cc: u-boot-amlogic@groups.io --- drivers/net/phy/phy.c | 4 ++-- net/eth_common.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 61603f28179..9b0e497f223 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -463,9 +463,9 @@ U_BOOT_PHY_DRIVER(genphy) = { .shutdown = genphy_shutdown, };
+#ifdef CONFIG_NEEDS_MANUAL_RELOC int phy_init(void) { -#ifdef CONFIG_NEEDS_MANUAL_RELOC const int ll_n_ents = ll_entry_count(struct phy_driver, phy_driver); struct phy_driver *drv, *ll_entry;
@@ -489,10 +489,10 @@ int phy_init(void) if (drv->write_mmd) drv->write_mmd += gd->reloc_off; } -#endif
return 0; } +#endif
int phy_set_supported(struct phy_device *phydev, u32 max_speed) { diff --git a/net/eth_common.c b/net/eth_common.c index 82d527abba6..c94a7ba6ae7 100644 --- a/net/eth_common.c +++ b/net/eth_common.c @@ -37,7 +37,7 @@ void eth_common_init(void) miiphy_init(); #endif
-#ifdef CONFIG_PHYLIB +#if defined(CONFIG_NEEDS_MANUAL_RELOC) && defined(CONFIG_PHYLIB) phy_init(); #endif #endif