system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-07-24 12:11:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MIPS: BMIPS: merge CPU options into one option

Browse source 
Instead of treating each flavour as an exclusive CPU to select, make
BMIPS the only option and let SYS_HAS_CPU_BMIPS* decide for which
flavours to include support.

Run tested on BMIPS3300 and BMIPS4350, only build tested for BMIPS4380
and BMIPS5000.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Signed-off-by: John Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/6240/
This commit is contained in:
Jonas Gorski 2013-12-18 14:12:02 +01:00 committed by Ralf Baechle
parent 6465460c92
commit cd746249b7
1 changed files with 39 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
arch/mips/Kconfig
View file

@ -1379,41 +1379,21 @@ config CPU_CAVIUM_OCTEON
can have up to 16 Mips64v2 cores and 8 integrated gigabit ethernets. can have up to 16 Mips64v2 cores and 8 integrated gigabit ethernets.
Full details can be found at http://www.caviumnetworks.com. Full details can be found at http://www.caviumnetworks.com.
config CPU_BMIPS3300 config CPU_BMIPS
bool "BMIPS3300" bool "Broadcom BMIPS"
depends on SYS_HAS_CPU_BMIPS3300 depends on SYS_HAS_CPU_BMIPS
select CPU_BMIPS select CPU_MIPS32
select CPU_BMIPS3300 if SYS_HAS_CPU_BMIPS3300
select CPU_BMIPS4350 if SYS_HAS_CPU_BMIPS4350
select CPU_BMIPS4380 if SYS_HAS_CPU_BMIPS4380
select CPU_BMIPS5000 if SYS_HAS_CPU_BMIPS5000
select CPU_SUPPORTS_32BIT_KERNEL
select DMA_NONCOHERENT
select IRQ_CPU
select SWAP_IO_SPACE
select WEAK_ORDERING
help help
Broadcom BMIPS3300 processors. Support for BMIPS3300/4350/4380 and BMIPS5000 processors.
config CPU_BMIPS4350
bool "BMIPS4350"
depends on SYS_HAS_CPU_BMIPS4350
select CPU_BMIPS
select SYS_SUPPORTS_SMP
select SYS_SUPPORTS_HOTPLUG_CPU
help
Broadcom BMIPS4350 ("VIPER") processors.
config CPU_BMIPS4380
bool "BMIPS4380"
depends on SYS_HAS_CPU_BMIPS4380
select CPU_BMIPS
select SYS_SUPPORTS_SMP
select SYS_SUPPORTS_HOTPLUG_CPU
help
Broadcom BMIPS4380 processors.
config CPU_BMIPS5000
bool "BMIPS5000"
depends on SYS_HAS_CPU_BMIPS5000
select CPU_BMIPS
select CPU_SUPPORTS_HIGHMEM
select MIPS_CPU_SCACHE
select SYS_SUPPORTS_SMP
select SYS_SUPPORTS_HOTPLUG_CPU
help
Broadcom BMIPS5000 processors.
config CPU_XLR config CPU_XLR
bool "Netlogic XLR SoC" bool "Netlogic XLR SoC"
@ -1496,14 +1476,25 @@ config CPU_LOONGSON1
select CPU_SUPPORTS_32BIT_KERNEL select CPU_SUPPORTS_32BIT_KERNEL
select CPU_SUPPORTS_HIGHMEM select CPU_SUPPORTS_HIGHMEM
config CPU_BMIPS config CPU_BMIPS3300
bool bool
select CPU_MIPS32
select CPU_SUPPORTS_32BIT_KERNEL config CPU_BMIPS4350
select DMA_NONCOHERENT bool
select IRQ_CPU select SYS_SUPPORTS_SMP
select SWAP_IO_SPACE select SYS_SUPPORTS_HOTPLUG_CPU
select WEAK_ORDERING
config CPU_BMIPS4380
bool
select SYS_SUPPORTS_SMP
select SYS_SUPPORTS_HOTPLUG_CPU
config CPU_BMIPS5000
bool
select CPU_SUPPORTS_HIGHMEM
select MIPS_CPU_SCACHE
select SYS_SUPPORTS_SMP
select SYS_SUPPORTS_HOTPLUG_CPU
config SYS_HAS_CPU_LOONGSON2E config SYS_HAS_CPU_LOONGSON2E
bool bool
@ -1577,17 +1568,24 @@ config SYS_HAS_CPU_SB1
config SYS_HAS_CPU_CAVIUM_OCTEON config SYS_HAS_CPU_CAVIUM_OCTEON
bool bool
config SYS_HAS_CPU_BMIPS
bool
config SYS_HAS_CPU_BMIPS3300 config SYS_HAS_CPU_BMIPS3300
bool bool
select SYS_HAS_CPU_BMIPS
config SYS_HAS_CPU_BMIPS4350 config SYS_HAS_CPU_BMIPS4350
bool bool
select SYS_HAS_CPU_BMIPS
config SYS_HAS_CPU_BMIPS4380 config SYS_HAS_CPU_BMIPS4380
bool bool
select SYS_HAS_CPU_BMIPS
config SYS_HAS_CPU_BMIPS5000 config SYS_HAS_CPU_BMIPS5000
bool bool
select SYS_HAS_CPU_BMIPS
config SYS_HAS_CPU_XLR config SYS_HAS_CPU_XLR
bool bool