From patchwork Mon Jul 11 06:57:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 963462 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6B6vM04026583 for ; Mon, 11 Jul 2011 06:57:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757206Ab1GKG5V (ORCPT ); Mon, 11 Jul 2011 02:57:21 -0400 Received: from na3sys009aog109.obsmtp.com ([74.125.149.201]:59375 "EHLO na3sys009aog109.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757003Ab1GKG5U (ORCPT ); Mon, 11 Jul 2011 02:57:20 -0400 Received: from mail-gy0-f171.google.com ([209.85.160.171]) (using TLSv1) by na3sys009aob109.postini.com ([74.125.148.12]) with SMTP ID DSNKThqezxZddokbIviZ+SYenlhXiI36Vk3S@postini.com; Sun, 10 Jul 2011 23:57:20 PDT Received: by gyh20 with SMTP id 20so1512621gyh.30 for ; Sun, 10 Jul 2011 23:57:19 -0700 (PDT) Received: by 10.236.138.161 with SMTP id a21mr4695887yhj.49.1310367439044; Sun, 10 Jul 2011 23:57:19 -0700 (PDT) Received: from localhost (dragon.ti.com [192.94.94.33]) by mx.google.com with ESMTPS id c63sm7160486yhe.46.2011.07.10.23.57.16 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 10 Jul 2011 23:57:18 -0700 (PDT) Date: Mon, 11 Jul 2011 09:57:14 +0300 From: Felipe Balbi To: Paul Walmsley Cc: Felipe Balbi , hemahk@ti.com, tony@atomide.com, linux-omap@vger.kernel.org Subject: Re: OMAP2-only kernel compile broken Message-ID: <20110711065713.GG2680@legolas.emea.dhcp.ti.com> Reply-To: balbi@ti.com References: <20110710095216.GN31978@legolas.emea.dhcp.ti.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 11 Jul 2011 06:57:22 +0000 (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. From 1de870130718c3aef8db86006e9fa5389bc4059f Mon Sep 17 00:00:00 2001 From: Felipe Balbi 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 Signed-off-by: Felipe Balbi --- 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