diff options
| author | Markos Chandras <markos.chandras@imgtec.com> | 2015-07-09 10:40:38 +0100 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-03-22 11:10:36 -0400 |
| commit | 7c196e5a2e90d172ce2bca85bb368f70a016b02c (patch) | |
| tree | 2d5f5db7000a568ce1d535590618dcddf439921d /arch | |
| parent | e652be4b177954875b8d2d842abfda3626cb1d6a (diff) | |
MIPS: Kconfig: Disable MIPS MT and SMP implementations for R6
[ Upstream commit 5676319c91c8d668635ac0b9b6d9145c4fa418ac ]
R6 does not support the MIPS MT ASE and the CMP/SMP options so
restrict them in order to prevent users from selecting incompatible
SMP configuration for R6 cores. We also disable the CPS/SMP option
because its support hasn't been added to the CPS code yet.
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/10637/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index d9f4612df69d..8901acf1eefa 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -2103,7 +2103,7 @@ config CPU_R4K_CACHE_TLB config MIPS_MT_SMP bool "MIPS MT SMP support (1 TC on each available VPE)" - depends on SYS_SUPPORTS_MULTITHREADING + depends on SYS_SUPPORTS_MULTITHREADING && !CPU_MIPSR6 select CPU_MIPSR2_IRQ_VI select CPU_MIPSR2_IRQ_EI select SYNC_R4K @@ -2204,7 +2204,7 @@ config MIPS_VPE_APSP_API_MT config MIPS_CMP bool "MIPS CMP framework support (DEPRECATED)" - depends on SYS_SUPPORTS_MIPS_CMP + depends on SYS_SUPPORTS_MIPS_CMP && !CPU_MIPSR6 select MIPS_GIC_IPI select SMP select SYNC_R4K @@ -2221,7 +2221,7 @@ config MIPS_CMP config MIPS_CPS bool "MIPS Coherent Processing System support" - depends on SYS_SUPPORTS_MIPS_CPS + depends on SYS_SUPPORTS_MIPS_CPS && !CPU_MIPSR6 select MIPS_CM select MIPS_CPC select MIPS_CPS_PM if HOTPLUG_CPU |