From: Arnd Bergmann <arnd@arndb.de>
To: arm@kernel.org
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Russell King <linux@arm.linux.org.uk>,
Arnd Bergmann <arnd@arndb.de>,
Gregory Clement <gregory.clement@free-electrons.com>,
Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Subject: [PATCH 09/11] ARM: mvebu: allow selecting mvebu without Armada XP
Date: Thu, 14 Feb 2013 14:49:25 +0100 [thread overview]
Message-ID: <1360849767-1463135-10-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1360849767-1463135-1-git-send-email-arnd@arndb.de>
Selecting only CONFIG_ARCH_MVEBU but not the respective
options for Armada 370 or Armada XP results in these
link errors:
arch/arm/mach-mvebu/built-in.o: In function `armada_xp_smp_init_cpus':
arch/arm/mach-mvebu/platsmp.c:91: undefined reference to `coherency_get_cpu_count'
arch/arm/mach-mvebu/platsmp.c:104: undefined reference to `armada_mpic_send_doorbell'
arch/arm/mach-mvebu/built-in.o: In function `armada_xp_smp_prepare_cpus':
arch/arm/mach-mvebu/platsmp.c:111: undefined reference to `set_cpu_coherent'
arch/arm/mach-mvebu/built-in.o: In function `armada_xp_boot_secondary':
arch/arm/mach-mvebu/platsmp.c:83: undefined reference to `armada_xp_boot_cpu'
arch/arm/mach-mvebu/built-in.o: In function `armada_xp_secondary_init':
arch/arm/mach-mvebu/platsmp.c:75: undefined reference to `armada_xp_mpic_smp_cpu_init'
arch/arm/mach-mvebu/built-in.o: In function `armada_xp_secondary_startup':
arch/arm/mach-mvebu/headsmp.S:46: undefined reference to `ll_set_cpu_coherent'
We can solve this by enabling all common MVEBU files that are
referenced by the SMP files. This means we enable code that
is not going to be used without a machine descriptor referencing
it, but only if the kernel is configured specifically for this
case.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
arch/arm/mach-mvebu/Makefile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile
index 99df4df..da93bcb 100644
--- a/arch/arm/mach-mvebu/Makefile
+++ b/arch/arm/mach-mvebu/Makefile
@@ -3,7 +3,8 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
AFLAGS_coherency_ll.o := -Wa,-march=armv7-a
-obj-y += system-controller.o
-obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o irq-armada-370-xp.o addr-map.o coherency.o coherency_ll.o pmsu.o
+obj-y += system-controller.o
+obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o
+obj-$(CONFIG_ARCH_MVEBU) += addr-map.o coherency.o coherency_ll.o pmsu.o irq-armada-370-xp.o
obj-$(CONFIG_SMP) += platsmp.o headsmp.o
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
--
1.8.1.2
next prev parent reply other threads:[~2013-02-14 13:49 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-14 13:49 [PATCH 00/11] ARM warning fixes for arm-soc Arnd Bergmann
2013-02-14 13:49 ` [PATCH 01/11] ARM: disable virt_to_bus/virt_to_bus almost everywhere Arnd Bergmann
2013-02-16 22:18 ` Emilio López
2013-02-16 23:15 ` Arnd Bergmann
2013-02-20 15:14 ` James Hogan
2013-02-20 16:00 ` Arnd Bergmann
2013-02-20 16:32 ` James Hogan
2013-02-21 7:37 ` Vineet Gupta
2013-02-21 23:13 ` Stephen Rothwell
2013-02-25 14:18 ` Vineet Gupta
2013-02-25 14:54 ` Arnd Bergmann
2013-02-14 13:49 ` [PATCH 02/11] ARM: samsung: fix assembly syntax for new gas Arnd Bergmann
2013-02-16 23:25 ` Russell King - ARM Linux
2013-02-17 14:01 ` Arnd Bergmann
2013-02-17 15:37 ` Mikael Pettersson
2013-02-17 15:47 ` Arnd Bergmann
2013-02-17 0:38 ` Aaro Koskinen
2013-02-17 15:37 ` Arnd Bergmann
2013-02-14 13:49 ` [PATCH 03/11] ARM: w90x900: fix legacy assembly syntax Arnd Bergmann
2013-02-14 13:49 ` [PATCH 04/11] ARM: shmobile: fix defconfig warning on CONFIG_USB Arnd Bergmann
2013-02-14 13:49 ` [PATCH 05/11] ARM: sa1100: don't warn about mach/ide.h Arnd Bergmann
2013-02-14 13:49 ` [PATCH 06/11] ARM: integrator/versatile: fix NOMMU warnings Arnd Bergmann
2013-02-15 9:12 ` Linus Walleij
2013-02-14 13:49 ` [PATCH 07/11] ARM: integrator: fix build with INTEGRATOR_AP off Arnd Bergmann
2013-02-15 9:13 ` Linus Walleij
2013-02-14 13:49 ` [PATCH 08/11] ARM: pick Versatile by default for !MMU Arnd Bergmann
2013-02-14 13:49 ` Arnd Bergmann [this message]
2013-02-14 13:49 ` [PATCH 10/11] ARM: s3c: i2c: add platform_device forward declaration Arnd Bergmann
2013-02-15 11:54 ` Wolfram Sang
2013-02-14 13:49 ` [PATCH 11/11] scripts/sortextable: silence script output Arnd Bergmann
2013-02-14 19:25 ` H. Peter Anvin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1360849767-1463135-10-git-send-email-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=arm@kernel.org \
--cc=ezequiel.garcia@free-electrons.com \
--cc=gregory.clement@free-electrons.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®