fixup symbol selection
SMP already selects HAVE_ARM_TWD and HAVE_ARM_SCU, ARCH_CNS3XXX already selects MIGHT_HAVE_PCI SVN-Revision: 34114
This commit is contained in:
parent
4d66b749de
commit
efcdc21824
3 changed files with 3 additions and 25 deletions
|
@ -11,16 +11,6 @@ arch/arm/Kconfig | 1 +
|
||||||
arch/arm/mach-cns3xxx/cns3420vb.c | 22 ++++++++++++++++++++++
|
arch/arm/mach-cns3xxx/cns3420vb.c | 22 ++++++++++++++++++++++
|
||||||
3 files changed, 25 insertions(+), 0 deletions(-)
|
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
|
--- a/arch/arm/configs/cns3420vb_defconfig
|
||||||
+++ b/arch/arm/configs/cns3420vb_defconfig
|
+++ b/arch/arm/configs/cns3420vb_defconfig
|
||||||
@@ -53,6 +53,8 @@ CONFIG_LEGACY_PTY_COUNT=16
|
@@ -53,6 +53,8 @@ CONFIG_LEGACY_PTY_COUNT=16
|
||||||
|
|
|
@ -7,22 +7,12 @@
|
||||||
+obj-$(CONFIG_SMP) += platsmp.o headsmp.o
|
+obj-$(CONFIG_SMP) += platsmp.o headsmp.o
|
||||||
+obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
|
+obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
|
||||||
+obj-$(CONFIG_LOCAL_TIMERS) += localtimer.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
|
--- a/arch/arm/Kconfig
|
||||||
+++ b/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 MIGHT_HAVE_PCI
|
||||||
select PCI_DOMAINS if PCI
|
select PCI_DOMAINS if PCI
|
||||||
select HAVE_ARM_TWD
|
|
||||||
+ select HAVE_SMP
|
+ select HAVE_SMP
|
||||||
help
|
help
|
||||||
Support for Cavium Networks CNS3XXX platform.
|
Support for Cavium Networks CNS3XXX platform.
|
||||||
|
|
|
@ -1,13 +1,11 @@
|
||||||
--- a/arch/arm/mach-cns3xxx/Kconfig
|
--- a/arch/arm/mach-cns3xxx/Kconfig
|
||||||
+++ b/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
|
This is a platform with an on-board ARM11 MPCore and has support
|
||||||
for USB, USB-OTG, MMC/SD/SDIO, SATA, PCI-E, etc.
|
for USB, USB-OTG, MMC/SD/SDIO, SATA, PCI-E, etc.
|
||||||
|
|
||||||
+config MACH_GW2388
|
+config MACH_GW2388
|
||||||
+ bool "Support for Gateworks Laguna Platform"
|
+ bool "Support for Gateworks Laguna Platform"
|
||||||
+ select HAVE_ARM_SCU if SMP
|
|
||||||
+ select MIGHT_HAVE_PCI
|
|
||||||
+ help
|
+ help
|
||||||
+ Include support for the Gateworks Laguna Platform
|
+ Include support for the Gateworks Laguna Platform
|
||||||
+
|
+
|
||||||
|
|
Loading…
Reference in a new issue