MIPS: BCM63XX: let the individual SoCs select the appropriate CPUs

Let each supported chip select the appropirate SYS_HAS_CPU_BMIPS*
option for its embedded processor, so support will be conditionally
included.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Signed-off-by: John Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/6250/

2 files changed, 8 insertions, 1 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index f2f6c1de2389..17912696994f 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -133,7 +133,6 @@ config BCM63XX
         select DMA_NONCOHERENT
         select IRQ_CPU
         select SYS_HAS_CPU_MIPS32_R1
-        select SYS_HAS_CPU_BMIPS4350 if !BCM63XX_CPU_6338 && !BCM63XX_CPU_6345 && !BCM63XX_CPU_6348
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_BIG_ENDIAN
         select SYS_HAS_EARLY_PRINTK
diff --git a/arch/mips/bcm63xx/Kconfig b/arch/mips/bcm63xx/Kconfig
index b78306ce56c7..a057fdf111c6 100644
--- a/arch/mips/bcm63xx/Kconfig
+++ b/arch/mips/bcm63xx/Kconfig
@@ -3,33 +3,41 @@ menu "CPU support"
 
 config BCM63XX_CPU_3368
         bool "support 3368 CPU"
+        select SYS_HAS_CPU_BMIPS4350
         select HW_HAS_PCI
 
 config BCM63XX_CPU_6328
         bool "support 6328 CPU"
+        select SYS_HAS_CPU_BMIPS4350
         select HW_HAS_PCI
 
 config BCM63XX_CPU_6338
         bool "support 6338 CPU"
+        select SYS_HAS_CPU_BMIPS32_3300
         select HW_HAS_PCI
 
 config BCM63XX_CPU_6345
         bool "support 6345 CPU"
+        select SYS_HAS_CPU_BMIPS32_3300
 
 config BCM63XX_CPU_6348
         bool "support 6348 CPU"
+        select SYS_HAS_CPU_BMIPS32_3300
         select HW_HAS_PCI
 
 config BCM63XX_CPU_6358
         bool "support 6358 CPU"
+        select SYS_HAS_CPU_BMIPS4350
         select HW_HAS_PCI
 
 config BCM63XX_CPU_6362
         bool "support 6362 CPU"
+        select SYS_HAS_CPU_BMIPS4350
         select HW_HAS_PCI
 
 config BCM63XX_CPU_6368
         bool "support 6368 CPU"
+        select SYS_HAS_CPU_BMIPS4350
         select HW_HAS_PCI
 endmenu