aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaul Burton <paul.burton@imgtec.com>2014-01-15 05:32:00 -0500
committerRalf Baechle <ralf@linux-mips.org>2014-03-26 18:09:08 -0400
commit5cac93b35c148fb53a9667d92b5251a8eca55701 (patch)
treeeffd405f725d6af17751c5abfd4708af41d70d56 /arch
parenta6ce202ead8c834913d068fd65cf29891478acde (diff)
MIPS: Deprecate CONFIG_MIPS_CMP
CONFIG_MIPS_CPS is a better option for systems where it is supported, which as far as I am aware should be all systems where CONFIG_MIPS_CMP could provide any value (ie. where there are multiple cores for YAMON to bring up). This option is therefore deprecated, and marked as such. It is left intact for the time being in order to provide a fallback should someone find a system where CONFIG_MIPS_CPS will not function (ie. where the reset vector cannot be moved), and should be removed entirely in the future assuming that does not happen. Signed-off-by: Paul Burton <paul.burton@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/6369/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/Kconfig5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index d0b446e154d5..82aa06974c53 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1999,7 +1999,7 @@ config MIPS_VPE_APSP_API_MT
1999 depends on MIPS_VPE_APSP_API && !MIPS_CMP 1999 depends on MIPS_VPE_APSP_API && !MIPS_CMP
2000 2000
2001config MIPS_CMP 2001config MIPS_CMP
2002 bool "MIPS CMP framework support" 2002 bool "MIPS CMP framework support (DEPRECATED)"
2003 depends on SYS_SUPPORTS_MIPS_CMP && !MIPS_MT_SMTC 2003 depends on SYS_SUPPORTS_MIPS_CMP && !MIPS_MT_SMTC
2004 select MIPS_GIC_IPI 2004 select MIPS_GIC_IPI
2005 select SYNC_R4K 2005 select SYNC_R4K
@@ -2010,6 +2010,9 @@ config MIPS_CMP
2010 framework" protocol (ie. YAMON) and want your kernel to make use of 2010 framework" protocol (ie. YAMON) and want your kernel to make use of
2011 its ability to start secondary CPUs. 2011 its ability to start secondary CPUs.
2012 2012
2013 Unless you have a specific need, you should use CONFIG_MIPS_CPS
2014 instead of this.
2015
2013config MIPS_CPS 2016config MIPS_CPS
2014 bool "MIPS Coherent Processing System support" 2017 bool "MIPS Coherent Processing System support"
2015 depends on SYS_SUPPORTS_MIPS_CPS 2018 depends on SYS_SUPPORTS_MIPS_CPS