Commit 93c4ea38 authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Scott Wood

powerpc/mpc85xx_mds: Select PHYLIB only if NETDEVICES is enabled

PHYLIB depends on NETDEVICES, so to avoid unmet dependencies warning
from Kconfig it needs to be selected conditionally.

Also add checks if PHYLIB is built-in to avoid undefined references to
PHYLIB's symbols.
Signed-off-by: default avatarAndrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: default avatarScott Wood <oss@buserror.net>
parent ddc6cd0d
...@@ -72,7 +72,7 @@ config MPC85xx_CDS ...@@ -72,7 +72,7 @@ config MPC85xx_CDS
config MPC85xx_MDS config MPC85xx_MDS
bool "Freescale MPC85xx MDS" bool "Freescale MPC85xx MDS"
select DEFAULT_UIMAGE select DEFAULT_UIMAGE
select PHYLIB select PHYLIB if NETDEVICES
select HAS_RAPIDIO select HAS_RAPIDIO
select SWIOTLB select SWIOTLB
help help
......
...@@ -63,6 +63,8 @@ ...@@ -63,6 +63,8 @@
#define DBG(fmt...) #define DBG(fmt...)
#endif #endif
#if IS_BUILTIN(CONFIG_PHYLIB)
#define MV88E1111_SCR 0x10 #define MV88E1111_SCR 0x10
#define MV88E1111_SCR_125CLK 0x0010 #define MV88E1111_SCR_125CLK 0x0010
static int mpc8568_fixup_125_clock(struct phy_device *phydev) static int mpc8568_fixup_125_clock(struct phy_device *phydev)
...@@ -152,6 +154,8 @@ static int mpc8568_mds_phy_fixups(struct phy_device *phydev) ...@@ -152,6 +154,8 @@ static int mpc8568_mds_phy_fixups(struct phy_device *phydev)
return err; return err;
} }
#endif
/* ************************************************************************ /* ************************************************************************
* *
* Setup the architecture * Setup the architecture
...@@ -313,6 +317,7 @@ static void __init mpc85xx_mds_setup_arch(void) ...@@ -313,6 +317,7 @@ static void __init mpc85xx_mds_setup_arch(void)
swiotlb_detect_4g(); swiotlb_detect_4g();
} }
#if IS_BUILTIN(CONFIG_PHYLIB)
static int __init board_fixups(void) static int __init board_fixups(void)
{ {
...@@ -342,9 +347,12 @@ static int __init board_fixups(void) ...@@ -342,9 +347,12 @@ static int __init board_fixups(void)
return 0; return 0;
} }
machine_arch_initcall(mpc8568_mds, board_fixups); machine_arch_initcall(mpc8568_mds, board_fixups);
machine_arch_initcall(mpc8569_mds, board_fixups); machine_arch_initcall(mpc8569_mds, board_fixups);
#endif
static int __init mpc85xx_publish_devices(void) static int __init mpc85xx_publish_devices(void)
{ {
if (machine_is(mpc8568_mds)) if (machine_is(mpc8568_mds))
...@@ -434,4 +442,3 @@ define_machine(p1021_mds) { ...@@ -434,4 +442,3 @@ define_machine(p1021_mds) {
.pcibios_fixup_phb = fsl_pcibios_fixup_phb, .pcibios_fixup_phb = fsl_pcibios_fixup_phb,
#endif #endif
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment