1 From 1ecac776e6c652e3059d4f4d9dd8369e89ebef81 Mon Sep 17 00:00:00 2001
2 From: Jonas Gorski <jogo@openwrt.org>
3 Date: Thu, 27 Jun 2013 23:57:20 +0200
4 Subject: [PATCH 05/10] MIPS: bmips: merge CPU options into one option
6 Instead of treating each flavour as an exclusive CPU to select, make
7 BMIPS the only option and let SYS_HAS_CPU_BMIPS* decide for which
8 flavours to include support.
10 Run tested on BMIPS3300 and BMIPS4350, only build tested for BMIPS4380
13 Signed-off-by: Jonas Gorski <jogo@openwrt.org>
15 arch/mips/Kconfig | 77 +++++++++++++++++++++++++----------------------------
16 1 file changed, 36 insertions(+), 41 deletions(-)
18 --- a/arch/mips/Kconfig
19 +++ b/arch/mips/Kconfig
20 @@ -130,6 +130,7 @@ config BCM63XX
21 select DMA_NONCOHERENT
23 select SYS_HAS_CPU_MIPS32_R1
24 + select SYS_HAS_CPU_BMIPS
25 select SYS_HAS_CPU_BMIPS4350 if !BCM63XX_CPU_6338 && !BCM63XX_CPU_6345 && !BCM63XX_CPU_6348
26 select NR_CPUS_DEFAULT_2
27 select SYS_SUPPORTS_32BIT_KERNEL
28 @@ -1453,41 +1454,21 @@ config CPU_CAVIUM_OCTEON
29 can have up to 16 Mips64v2 cores and 8 integrated gigabit ethernets.
30 Full details can be found at http://www.caviumnetworks.com.
34 - depends on SYS_HAS_CPU_BMIPS3300
37 - Broadcom BMIPS3300 processors.
41 - depends on SYS_HAS_CPU_BMIPS4350
43 - select SYS_SUPPORTS_SMP
44 - select SYS_SUPPORTS_HOTPLUG_CPU
46 - Broadcom BMIPS4350 ("VIPER") processors.
50 - depends on SYS_HAS_CPU_BMIPS4380
52 - select SYS_SUPPORTS_SMP
53 - select SYS_SUPPORTS_HOTPLUG_CPU
55 - Broadcom BMIPS4380 processors.
59 - depends on SYS_HAS_CPU_BMIPS5000
61 - select CPU_SUPPORTS_HIGHMEM
62 - select MIPS_CPU_SCACHE
63 - select SYS_SUPPORTS_SMP
64 - select SYS_SUPPORTS_HOTPLUG_CPU
66 + bool "Broadcom BMIPS"
67 + depends on SYS_HAS_CPU_BMIPS
69 + select CPU_BMIPS3300 if SYS_HAS_CPU_BMIPS3300
70 + select CPU_BMIPS4350 if SYS_HAS_CPU_BMIPS4350
71 + select CPU_BMIPS4350 if SYS_HAS_CPU_BMIPS4380
72 + select CPU_BMIPS5000 if SYS_HAS_CPU_BMIPS5000
73 + select CPU_SUPPORTS_32BIT_KERNEL
74 + select DMA_NONCOHERENT
76 + select SWAP_IO_SPACE
77 + select WEAK_ORDERING
79 - Broadcom BMIPS5000 processors.
80 + Support for BMIPS3300/4350/4380 and BMIPS5000 processors.
83 bool "Netlogic XLR SoC"
84 @@ -1568,14 +1549,25 @@ config CPU_LOONGSON1
85 select CPU_SUPPORTS_32BIT_KERNEL
86 select CPU_SUPPORTS_HIGHMEM
92 - select CPU_SUPPORTS_32BIT_KERNEL
93 - select DMA_NONCOHERENT
95 - select SWAP_IO_SPACE
96 - select WEAK_ORDERING
100 + select SYS_SUPPORTS_SMP
101 + select SYS_SUPPORTS_HOTPLUG_CPU
103 +config CPU_BMIPS4380
105 + select SYS_SUPPORTS_SMP
106 + select SYS_SUPPORTS_HOTPLUG_CPU
108 +config CPU_BMIPS5000
110 + select CPU_SUPPORTS_HIGHMEM
111 + select MIPS_CPU_SCACHE
112 + select SYS_SUPPORTS_SMP
113 + select SYS_SUPPORTS_HOTPLUG_CPU
115 config SYS_HAS_CPU_LOONGSON2E
117 @@ -1649,6 +1641,9 @@ config SYS_HAS_CPU_SB1
118 config SYS_HAS_CPU_CAVIUM_OCTEON
121 +config SYS_HAS_CPU_BMIPS
124 config SYS_HAS_CPU_BMIPS3300