From patchwork Fri Jun 21 23:22:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2764881 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C2D1AC0AB1 for ; Fri, 21 Jun 2013 23:22:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D06482016E for ; Fri, 21 Jun 2013 23:22:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B33DA2016D for ; Fri, 21 Jun 2013 23:22:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946228Ab3FUXWx (ORCPT ); Fri, 21 Jun 2013 19:22:53 -0400 Received: from moutng.kundenserver.de ([212.227.17.9]:55137 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1946207Ab3FUXWx (ORCPT ); Fri, 21 Jun 2013 19:22:53 -0400 Received: from klappe2.localnet (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0LgNts-1USvHR08Ae-00o0ye; Sat, 22 Jun 2013 01:22:49 +0200 From: Arnd Bergmann To: Tony Lindgren Subject: [PATCH] ARM: omap: make am43xx build with SMP enabled Date: Sat, 22 Jun 2013 01:22:47 +0200 User-Agent: KMail/1.12.2 (Linux/3.8.0-22-generic; KDE/4.3.2; x86_64; ; ) Cc: Ankur Kishore , Afzal Mohammed , Linux OMAP List , Linux ARM Kernel List MIME-Version: 1.0 Message-Id: <201306220122.47786.arnd@arndb.de> X-Provags-ID: V02:K0:9cHfp5ZQlJ3CDIGRW4mEPlgC7w4w4PL5c87zAfD1L2d G9EywoobfaWMwYwR79RTYUPLLtB/gnUucey/bV1LA3//zvbhHg RX9MWmdKnqQxyE9kE6NkSl70Cs+UOl/mRBINUrGWPV4uRFrx7n KZB+YISHaKwO4Cpsx66Nhy57kv7pfjTYBh+MsMCDFBo2u/47PA 2n9nOB7FZ1d+jslyGWO+HB7aaXYxT8TllqlPosnEC8lvNL1lGv RuELppPyqjZY8UHWKfLPwddxDBPN+Xhxm16Q27vT0qwecx6zF1 UarSKBhWab/LHaEAbxZWS5x60g378gbuG67cI5jo4klt90O7YP C25Tep8QUwHlu9v8eilk= Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-8.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP With am43xx enabled, omap4 and omap5 disabled and SMP on, I get these build errors: arch/arm/mach-omap2/built-in.o: In function `scu_gp_set': :(.text+0x7858): undefined reference to `omap4_get_scu_base' arch/arm/mach-omap2/built-in.o: In function `scu_gp_clear': :(.text+0x793c): undefined reference to `omap4_get_scu_base' arch/arm/mach-omap2/built-in.o: In function `omap4_cpu_die': :(.ref.text+0x44): undefined reference to `omap4_hotplug_cpu' The easiest way to work around that is to turn on the missing functions, even though we know they won't be used on am43xx, which is single-CPU. Signed-off-by: Arnd Bergmann Cc: Ankur Kishore Cc: Afzal Mohammed Cc: Tony Lindgren Acked-by: Tony Lindgren --- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index f5038f5..46d7c5f 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -39,7 +39,7 @@ omap-4-5-common = omap4-common.o omap-wakeupgen.o \ sleep44xx.o obj-$(CONFIG_ARCH_OMAP4) += $(omap-4-5-common) $(smp-y) obj-$(CONFIG_SOC_OMAP5) += $(omap-4-5-common) $(smp-y) -obj-$(CONFIG_SOC_AM43XX) += $(omap-4-5-common) +obj-$(CONFIG_SOC_AM43XX) += $(omap-4-5-common) $(smp-y) plus_sec := $(call as-instr,.arch_extension sec,+sec) AFLAGS_omap-headsmp.o :=-Wa,-march=armv7-a$(plus_sec) @@ -89,6 +89,7 @@ obj-$(CONFIG_ARCH_OMAP2) += sleep24xx.o obj-$(CONFIG_ARCH_OMAP3) += pm34xx.o sleep34xx.o obj-$(CONFIG_ARCH_OMAP4) += pm44xx.o omap-mpuss-lowpower.o obj-$(CONFIG_SOC_OMAP5) += omap-mpuss-lowpower.o +obj-$(CONFIG_SOC_AM43XX) += omap-mpuss-lowpower.o obj-$(CONFIG_PM_DEBUG) += pm-debug.o obj-$(CONFIG_POWER_AVS_OMAP) += sr_device.o