aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2012-11-08 05:40:34 +0000
committerImre Kaloz <kaloz@openwrt.org>2012-11-08 05:40:34 +0000
commitefcdc21824f04c32aa9f12fcbb18d38827d2f639 (patch)
tree70fbe9a95a345cdb0a010cb4cfdc2bf44baed7bc
parent4d66b749deda7115ad59b3b90c287c5fd1ef770b (diff)
downloadupstream-efcdc21824f04c32aa9f12fcbb18d38827d2f639.tar.gz
upstream-efcdc21824f04c32aa9f12fcbb18d38827d2f639.tar.bz2
upstream-efcdc21824f04c32aa9f12fcbb18d38827d2f639.zip
fixup symbol selection
SMP already selects HAVE_ARM_TWD and HAVE_ARM_SCU, ARCH_CNS3XXX already selects MIGHT_HAVE_PCI SVN-Revision: 34114
-rw-r--r--target/linux/cns3xxx/patches-3.3/002-cns3xxx_wdt.patch10
-rw-r--r--target/linux/cns3xxx/patches-3.3/049-cns3xxx_smp_support.patch14
-rw-r--r--target/linux/cns3xxx/patches-3.3/300-laguna_support.patch4
3 files changed, 3 insertions, 25 deletions
diff --git a/target/linux/cns3xxx/patches-3.3/002-cns3xxx_wdt.patch b/target/linux/cns3xxx/patches-3.3/002-cns3xxx_wdt.patch
index d013334267..46347621e4 100644
--- a/target/linux/cns3xxx/patches-3.3/002-cns3xxx_wdt.patch
+++ b/target/linux/cns3xxx/patches-3.3/002-cns3xxx_wdt.patch
@@ -11,16 +11,6 @@ arch/arm/Kconfig | 1 +
arch/arm/mach-cns3xxx/cns3420vb.c | 22 ++++++++++++++++++++++
3 files changed, 25 insertions(+), 0 deletions(-)
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -372,6 +372,7 @@ config ARCH_CNS3XXX
- select MIGHT_HAVE_CACHE_L2X0
- select MIGHT_HAVE_PCI
- select PCI_DOMAINS if PCI
-+ select HAVE_ARM_TWD
- help
- Support for Cavium Networks CNS3XXX platform.
-
--- a/arch/arm/configs/cns3420vb_defconfig
+++ b/arch/arm/configs/cns3420vb_defconfig
@@ -53,6 +53,8 @@ CONFIG_LEGACY_PTY_COUNT=16
diff --git a/target/linux/cns3xxx/patches-3.3/049-cns3xxx_smp_support.patch b/target/linux/cns3xxx/patches-3.3/049-cns3xxx_smp_support.patch
index c2225ae02e..578cbaf35e 100644
--- a/target/linux/cns3xxx/patches-3.3/049-cns3xxx_smp_support.patch
+++ b/target/linux/cns3xxx/patches-3.3/049-cns3xxx_smp_support.patch
@@ -7,22 +7,12 @@
+obj-$(CONFIG_SMP) += platsmp.o headsmp.o
+obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
+obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o
---- a/arch/arm/mach-cns3xxx/Kconfig
-+++ b/arch/arm/mach-cns3xxx/Kconfig
-@@ -3,6 +3,7 @@ menu "CNS3XXX platform type"
-
- config MACH_CNS3420VB
- bool "Support for CNS3420 Validation Board"
-+ select HAVE_ARM_SCU if SMP
- select MIGHT_HAVE_PCI
- help
- Include support for the Cavium Networks CNS3420 MPCore Platform
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -373,6 +373,7 @@ config ARCH_CNS3XXX
+@@ -372,6 +372,7 @@ config ARCH_CNS3XXX
+ select MIGHT_HAVE_CACHE_L2X0
select MIGHT_HAVE_PCI
select PCI_DOMAINS if PCI
- select HAVE_ARM_TWD
+ select HAVE_SMP
help
Support for Cavium Networks CNS3XXX platform.
diff --git a/target/linux/cns3xxx/patches-3.3/300-laguna_support.patch b/target/linux/cns3xxx/patches-3.3/300-laguna_support.patch
index 6fa474cb61..e73d7bd9d1 100644
--- a/target/linux/cns3xxx/patches-3.3/300-laguna_support.patch
+++ b/target/linux/cns3xxx/patches-3.3/300-laguna_support.patch
@@ -1,13 +1,11 @@
--- a/arch/arm/mach-cns3xxx/Kconfig
+++ b/arch/arm/mach-cns3xxx/Kconfig
-@@ -11,4 +11,14 @@ config MACH_CNS3420VB
+@@ -10,4 +10,12 @@ config MACH_CNS3420VB
This is a platform with an on-board ARM11 MPCore and has support
for USB, USB-OTG, MMC/SD/SDIO, SATA, PCI-E, etc.
+config MACH_GW2388
+ bool "Support for Gateworks Laguna Platform"
-+ select HAVE_ARM_SCU if SMP
-+ select MIGHT_HAVE_PCI
+ help
+ Include support for the Gateworks Laguna Platform
+