[PATCH 11/12] ARM: initial multiplatform support
From: Rob Herring <hidden>
Date: 2012-09-12 20:20:49
On 09/12/2012 02:49 PM, Arnd Bergmann wrote:
quoted hunk ↗ jump to hunk
On Thursday 06 September 2012, Rob Herring wrote:quoted
+machine-$(CONFIG_ARCH_EXYNOS4) += exynos +machine-$(CONFIG_ARCH_EXYNOS5) += exynosquoted
+machine-$(CONFIG_MACH_SPEAR1310) += spear13xx +machine-$(CONFIG_MACH_SPEAR1340) += spear13xxquoted
+machine-$(CONFIG_MACH_SPEAR300) += spear3xx +machine-$(CONFIG_MACH_SPEAR310) += spear3xxquoted
+machine-$(CONFIG_MACH_SPEAR320) += spear3xx +machine-$(CONFIG_MACH_SPEAR600) += spear6xxI did a little bit of testing and got this message: /home/arnd/linux-arm/Makefile:774: target `arch/arm/mach-spear13xx' given more than once in the same rule. arch/arm/mach-spear13xx/built-in.o:(.init.data+0x0): multiple definition of `spear13xx_smp_ops' arch/arm/mach-spear13xx/built-in.o:(.init.data+0x0): first defined here The patch below ensures that each machine is only listed once. Please fold this into your patch. Arnddiff --git a/arch/arm/Makefile b/arch/arm/Makefile index 32a6485..ff5fb29 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile@@ -233,7 +233,7 @@ ifeq ($(CONFIG_ARCH_MULTIPLATFORM),y) MACHINE := endif -machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y)) +machdirs := $(sort $(patsubst %,arch/arm/mach-%/,$(machine-y))) platdirs := $(patsubst %,arch/arm/plat-%/,$(plat-y)) ifneq ($(CONFIG_ARCH_MULTIPLATFORM),y)
Found this one as well. My fix is to use CONFIG_ARCH_EXYNOS, CONFIG_ARCH_SPEAR3XX, etc. instead and remove the multiple lines. I want to get this into -next and plan to send you a pull request soon. Are you happy with the kconfig parts? Rob