OMAP2-only kernel compile broken

Commit Message

Felipe Balbi July 11, 2011, 6:57 a.m. UTC

hi,

On Sun, Jul 10, 2011 at 05:43:23AM -0600, Paul Walmsley wrote:
> On Sun, 10 Jul 2011, Felipe Balbi wrote:
> 
> > On Sat, Jul 09, 2011 at 07:57:20PM -0600, Paul Walmsley wrote:
> > > Hello Hema, Felipe,
> > > 
> > > Commits 208466dc10083e734a8af71d10f923ee4bff950c ("usb: otg:
> > > OMAP4430: Powerdown the internal PHY when USB is disabled") and
> > > fb91cde49c327ff957c55d91805bc6abda59b311 ("usb: musb: OMAP4430:
> > > Power down the PHY during board init") break compilation on OMAP2:
> > > 
> > >   LD      .tmp_vmlinux1
> > > arch/arm/mach-omap2/built-in.o:(.data+0x7ce0): undefined reference to `omap4430_phy_init'
> > > arch/arm/mach-omap2/built-in.o:(.data+0x7ce4): undefined reference to `omap4430_phy_exit'
> > > arch/arm/mach-omap2/built-in.o:(.data+0x7ce8): undefined reference to `omap4430_phy_power'
> > > arch/arm/mach-omap2/built-in.o:(.data+0x7cec): undefined reference to `omap4430_phy_set_clk'
> > > arch/arm/mach-omap2/built-in.o:(.data+0x7cf0): undefined reference to `omap4430_phy_suspend'
> > > make: *** [.tmp_vmlinux1] Error 1
> > > 
> > > 
> > > Could you please figure out a clean way to fix this for the 3.1 rc series?
> > 
> > Patch attached, if you want to queue it for the merge window.
> 
> This patch doesn't build when based on the arm-soc omap/cleanup branch.
> 
> arch/arm/mach-omap2/twl-common.c:55:19: error: 'omap4430_phy_set_clk' 
> undeclared here (not in a function)

new version attached. It's always compiling omap_phy_internal.c as we
always compile usb-musb.c and twl-common.c. Later I'll come up with a
better solution for this issue.

Patch

From 1de870130718c3aef8db86006e9fa5389bc4059f Mon Sep 17 00:00:00 2001
From: Felipe Balbi <[e-mail]>
Date: Sun, 10 Jul 2011 12:22:20 +0300
Subject: [PATCH] usb: musb: fix build breakage
Organization: Texas Instruments\n

This patch fixes the compilation brekage which
commits 208466dc ("usb: otg:OMAP4430: Powerdown
the internal PHY when USB is disabled") and
fb91cde4 ("usb: musb: OMAP4430: Power down
the PHY during board init") introduced when
building a OMAP2-only kernel.

  LD      .tmp_vmlinux1
arch/arm/mach-omap2/built-in.o:(.data+0x7ce0): undefined reference to
+`omap4430_phy_init'
arch/arm/mach-omap2/built-in.o:(.data+0x7ce4): undefined reference to
+`omap4430_phy_exit'
arch/arm/mach-omap2/built-in.o:(.data+0x7ce8): undefined reference to
+`omap4430_phy_power'
arch/arm/mach-omap2/built-in.o:(.data+0x7cec): undefined reference to
+`omap4430_phy_set_clk'
arch/arm/mach-omap2/built-in.o:(.data+0x7cf0): undefined reference to
+`omap4430_phy_suspend'
make: *** [.tmp_vmlinux1] Error 1

Reported-by: Paul Walmsley <[e-mail]>
Signed-off-by: Felipe Balbi <[e-mail]>
---
 arch/arm/mach-omap2/Makefile |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index ff1466f..455231c 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -232,14 +232,11 @@  obj-$(CONFIG_MACH_IGEP0020)		+= board-igep0020.o \
 obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK)	+= board-omap3touchbook.o \
 					   hsmmc.o
 obj-$(CONFIG_MACH_OMAP_4430SDP)		+= board-4430sdp.o \
-					   hsmmc.o \
-					   omap_phy_internal.o
+					   hsmmc.o
 obj-$(CONFIG_MACH_OMAP4_PANDA)		+= board-omap4panda.o \
-					   hsmmc.o \
-					   omap_phy_internal.o
+					   hsmmc.o
 
-obj-$(CONFIG_MACH_OMAP3517EVM)		+= board-am3517evm.o \
-					   omap_phy_internal.o \
+obj-$(CONFIG_MACH_OMAP3517EVM)		+= board-am3517evm.o
 
 obj-$(CONFIG_MACH_CRANEBOARD)		+= board-am3517crane.o
 
@@ -250,6 +247,8 @@  obj-$(CONFIG_MACH_TI8168EVM)		+= board-ti8168evm.o
 usbfs-$(CONFIG_ARCH_OMAP_OTG)		:= usb-fs.o
 obj-y					+= $(usbfs-m) $(usbfs-y)
 obj-y					+= usb-musb.o
+obj-y					+= omap_phy_internal.o
+
 obj-$(CONFIG_MACH_OMAP2_TUSB6010)	+= usb-tusb6010.o
 obj-y					+= usb-host.o
 
-- 
1.7.6