MIPS: BMIPS: Fix up Kconfig settings

Factor out common BMIPS options into "CPU_BMIPS".  Add L2 cache for
BMIPS5000.  Add CPU_MIPS32 to satisfy checks in page.h, r4k_switch.S,
tlb-r4k.c, etc.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2953/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index d46f1da..e7587ac 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1413,51 +1413,36 @@ config CPU_CAVIUM_OCTEON
 config CPU_BMIPS3300
        bool "BMIPS3300"
        depends on SYS_HAS_CPU_BMIPS3300
-       select DMA_NONCOHERENT
-       select IRQ_CPU
-       select SWAP_IO_SPACE
-       select SYS_SUPPORTS_32BIT_KERNEL
-       select WEAK_ORDERING
+       select CPU_BMIPS
        help
          Broadcom BMIPS3300 processors.
 
 config CPU_BMIPS4350
        bool "BMIPS4350"
        depends on SYS_HAS_CPU_BMIPS4350
-       select CPU_SUPPORTS_32BIT_KERNEL
-       select DMA_NONCOHERENT
-       select IRQ_CPU
-       select SWAP_IO_SPACE
+       select CPU_BMIPS
        select SYS_SUPPORTS_SMP
        select SYS_SUPPORTS_HOTPLUG_CPU
-       select WEAK_ORDERING
        help
          Broadcom BMIPS4350 ("VIPER") processors.
 
 config CPU_BMIPS4380
        bool "BMIPS4380"
        depends on SYS_HAS_CPU_BMIPS4380
-       select CPU_SUPPORTS_32BIT_KERNEL
-       select DMA_NONCOHERENT
-       select IRQ_CPU
-       select SWAP_IO_SPACE
+       select CPU_BMIPS
        select SYS_SUPPORTS_SMP
        select SYS_SUPPORTS_HOTPLUG_CPU
-       select WEAK_ORDERING
        help
          Broadcom BMIPS4380 processors.
 
 config CPU_BMIPS5000
        bool "BMIPS5000"
        depends on SYS_HAS_CPU_BMIPS5000
-       select CPU_SUPPORTS_32BIT_KERNEL
+       select CPU_BMIPS
        select CPU_SUPPORTS_HIGHMEM
-       select DMA_NONCOHERENT
-       select IRQ_CPU
-       select SWAP_IO_SPACE
+       select MIPS_CPU_SCACHE
        select SYS_SUPPORTS_SMP
        select SYS_SUPPORTS_HOTPLUG_CPU
-       select WEAK_ORDERING
        help
          Broadcom BMIPS5000 processors.
 
@@ -1518,6 +1503,15 @@ config CPU_LOONGSON2
        select CPU_SUPPORTS_64BIT_KERNEL
        select CPU_SUPPORTS_HIGHMEM
 
+config CPU_BMIPS
+       bool
+       select CPU_MIPS32
+       select CPU_SUPPORTS_32BIT_KERNEL
+       select DMA_NONCOHERENT
+       select IRQ_CPU
+       select SWAP_IO_SPACE
+       select WEAK_ORDERING
+
 config SYS_HAS_CPU_LOONGSON2E
        bool