Skip to contentSkip to conversation

ARM: imx: mach-imx6ul: Fix allmodconfig build

PATCH New Fabio Estevam 3 participants 3 messages Aug 19, 2015 – Aug 21, 2015

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm i.MX and Layerscape
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/1 ARM: imx: mach-imx6ul: Fix allmodconfig build

From: Fabio Estevam <[email protected]>

We should call phy_register_fixup_for_uid() only when CONFIG_PHYLIB is built-in, otherwise we get the following link error when building allmodconfig:

arch/arm/mach-imx/built-in.o: In function `imx6ul_init_machine':
:(.init.text+0xa714): undefined reference to `phy_register_fixup_for_uid'

This is the same approach done in mach-imx6q.c and mach-imx6sx.c.

Reported-by Olof Johansson <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>
---
 arch/arm/mach-imx/mach-imx6ul.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/mach-imx/mach-imx6ul.c +3 -1
index db74da5..1b97fe1 100644
@@ -45,7 +45,9 @@ static int ksz8081_phy_fixup(struct phy_device *dev)
 
 static void __init imx6ul_enet_phy_init(void)
 {
-	phy_register_fixup_for_uid(PHY_ID_KSZ8081, 0xffffffff, ksz8081_phy_fixup);
+	if (IS_BUILTIN(CONFIG_PHYLIB))
+		phy_register_fixup_for_uid(PHY_ID_KSZ8081, 0xffffffff,
+					   ksz8081_phy_fixup);
 }
 
 static inline void imx6ul_enet_init(void)
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 ARM: imx: mach-imx6ul: Fix allmodconfig build

Quoted 6 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

We should call phy_register_fixup_for_uid() only when CONFIG_PHYLIB is built-in, otherwise we get the following link error when building allmodconfig:

Quoted 7 lines

arch/arm/mach-imx/built-in.o: In function `imx6ul_init_machine':
:(.init.text+0xa714): undefined reference to `phy_register_fixup_for_uid'

This is the same approach done in mach-imx6q.c and mach-imx6sx.c.

Reported-by Olof Johansson <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>

Thanks, Fabio.

Acked-by Shawn Guo <[email protected]>

Olof,

I suppose that you will pick up the fix directly. Let me know if you think differently. Thanks.

Shawn

Applied
#2 lore raw

PATCH 1/1 ARM: imx: mach-imx6ul: Fix allmodconfig build

In reply to Fabio Estevam
Quoted 6 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

We should call phy_register_fixup_for_uid() only when CONFIG_PHYLIB is built-in, otherwise we get the following link error when building allmodconfig:

Quoted 7 lines

arch/arm/mach-imx/built-in.o: In function `imx6ul_init_machine':
:(.init.text+0xa714): undefined reference to `phy_register_fixup_for_uid'

This is the same approach done in mach-imx6q.c and mach-imx6sx.c.

Reported-by Olof Johansson <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>

Thanks, applied.

-Olof