aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-12-18 08:12:05 -0500
committerRalf Baechle <ralf@linux-mips.org>2014-01-22 14:18:52 -0500
commitfe7f62c0c2122e0df3edb73bbfedc5cf399a3beb (patch)
tree0a41b463effbbe9813211c076f3b618817bf2160
parent69aaf9c8133ea787b9e10e2f387c3b1eec500e3d (diff)
MIPS: BMIPS: extend BMIPS3300 to include BMIPS32
Codewise there is no difference between these two, so it does not make sense to treat them differently. Also chip families having one of these tend to have the other. Signed-off-by: Jonas Gorski <jogo@openwrt.org> Signed-off-by: John Crispin <blogic@openwrt.org> Patchwork: http://patchwork.linux-mips.org/patch/6247/
-rw-r--r--arch/mips/Kconfig8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 748bd6d39781..7eaa4129dbcc 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1383,7 +1383,7 @@ config CPU_BMIPS
1383 bool "Broadcom BMIPS" 1383 bool "Broadcom BMIPS"
1384 depends on SYS_HAS_CPU_BMIPS 1384 depends on SYS_HAS_CPU_BMIPS
1385 select CPU_MIPS32 1385 select CPU_MIPS32
1386 select CPU_BMIPS3300 if SYS_HAS_CPU_BMIPS3300 1386 select CPU_BMIPS32_3300 if SYS_HAS_CPU_BMIPS32_3300
1387 select CPU_BMIPS4350 if SYS_HAS_CPU_BMIPS4350 1387 select CPU_BMIPS4350 if SYS_HAS_CPU_BMIPS4350
1388 select CPU_BMIPS4380 if SYS_HAS_CPU_BMIPS4380 1388 select CPU_BMIPS4380 if SYS_HAS_CPU_BMIPS4380
1389 select CPU_BMIPS5000 if SYS_HAS_CPU_BMIPS5000 1389 select CPU_BMIPS5000 if SYS_HAS_CPU_BMIPS5000
@@ -1395,7 +1395,7 @@ config CPU_BMIPS
1395 select CPU_SUPPORTS_HIGHMEM 1395 select CPU_SUPPORTS_HIGHMEM
1396 select CPU_HAS_PREFETCH 1396 select CPU_HAS_PREFETCH
1397 help 1397 help
1398 Support for BMIPS3300/4350/4380 and BMIPS5000 processors. 1398 Support for BMIPS32/3300/4350/4380 and BMIPS5000 processors.
1399 1399
1400config CPU_XLR 1400config CPU_XLR
1401 bool "Netlogic XLR SoC" 1401 bool "Netlogic XLR SoC"
@@ -1478,7 +1478,7 @@ config CPU_LOONGSON1
1478 select CPU_SUPPORTS_32BIT_KERNEL 1478 select CPU_SUPPORTS_32BIT_KERNEL
1479 select CPU_SUPPORTS_HIGHMEM 1479 select CPU_SUPPORTS_HIGHMEM
1480 1480
1481config CPU_BMIPS3300 1481config CPU_BMIPS32_3300
1482 bool 1482 bool
1483 1483
1484config CPU_BMIPS4350 1484config CPU_BMIPS4350
@@ -1572,7 +1572,7 @@ config SYS_HAS_CPU_CAVIUM_OCTEON
1572config SYS_HAS_CPU_BMIPS 1572config SYS_HAS_CPU_BMIPS
1573 bool 1573 bool
1574 1574
1575config SYS_HAS_CPU_BMIPS3300 1575config SYS_HAS_CPU_BMIPS32_3300
1576 bool 1576 bool
1577 select SYS_HAS_CPU_BMIPS 1577 select SYS_HAS_CPU_BMIPS
1578 1578