diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-12-06 14:51:56 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-12 17:40:14 +0100 |
commit | 5b65fc560398dd849dbe9f0df68d3934089c894a (patch) | |
tree | 9a3bbc0e6846649ee485538ead95d86f406484d0 /arch/arm/configs | |
parent | 553e7f75a171654d032d0eacbb1ba75bd9be7e8a (diff) | |
download | op-kernel-dev-5b65fc560398dd849dbe9f0df68d3934089c894a.zip op-kernel-dev-5b65fc560398dd849dbe9f0df68d3934089c894a.tar.gz |
ARM: spear: use multiplatform configuration options.
The spear platform is now multiplatform capable in principle,
and everything still builds when enabled. This slightly rearranges
the Kconfig options for spear to enable both single- and multiplatform
support. As a side-effect, even building the single spear kernel
can now enable spear3xx and spear6xx simultaneously, although
not together with spear13xx, because they are a different archicture
version (v7 instead of v5).
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/spear3xx_defconfig | 2 | ||||
-rw-r--r-- | arch/arm/configs/spear6xx_defconfig | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/spear3xx_defconfig b/arch/arm/configs/spear3xx_defconfig index 865980c..7ff23a0 100644 --- a/arch/arm/configs/spear3xx_defconfig +++ b/arch/arm/configs/spear3xx_defconfig @@ -6,7 +6,9 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_PARTITION_ADVANCED=y +# CONFIG_ARCH_MULTI_V7 is not set CONFIG_PLAT_SPEAR=y +CONFIG_ARCH_SPEAR3XX=y CONFIG_MACH_SPEAR300=y CONFIG_MACH_SPEAR310=y CONFIG_MACH_SPEAR320=y diff --git a/arch/arm/configs/spear6xx_defconfig b/arch/arm/configs/spear6xx_defconfig index a2a1265..7822980 100644 --- a/arch/arm/configs/spear6xx_defconfig +++ b/arch/arm/configs/spear6xx_defconfig @@ -6,6 +6,7 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_PARTITION_ADVANCED=y +# CONFIG_ARCH_MULTI_V7 is not set CONFIG_PLAT_SPEAR=y CONFIG_ARCH_SPEAR6XX=y CONFIG_BINFMT_MISC=y |