Commit 7fb6f7b0 authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer
Browse files

MIPS: Remove deprecated CONFIG_MIPS_CMP 



Commit 5cac93b3 ("MIPS: Deprecate CONFIG_MIPS_CMP") deprecated
CONFIG_MIPS_CMP and after 9 years it's time to remove it.

Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
Reviewed-by: default avatarJiaxun Yang <jiaxun.yang@flygoat.com>
Acked-by: default avatarMarc Zyngier <maz@kernel.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 045c340c

arch/mips/Kconfig

+2 −32
Original line number Diff line number Diff line
@@ -568,7 +568,6 @@ config MIPS_MALTA 
	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_MICROMIPS

	select SYS_SUPPORTS_MIPS16

	select SYS_SUPPORTS_MIPS_CMP

	select SYS_SUPPORTS_MIPS_CPS

	select SYS_SUPPORTS_MULTITHREADING

	select SYS_SUPPORTS_RELOCATABLE
@@ -2270,15 +2269,10 @@ config MIPS_VPE_LOADER 
	  Includes a loader for loading an elf relocatable object

	  onto another VPE and running it.



config MIPS_VPE_LOADER_CMP

	bool

	default "y"

	depends on MIPS_VPE_LOADER && MIPS_CMP



config MIPS_VPE_LOADER_MT

	bool

	default "y"

	depends on MIPS_VPE_LOADER && !MIPS_CMP

	depends on MIPS_VPE_LOADER



config MIPS_VPE_LOADER_TOM

	bool "Load VPE program into memory hidden from linux"
@@ -2294,31 +2288,10 @@ config MIPS_VPE_APSP_API 
	bool "Enable support for AP/SP API (RTLX)"

	depends on MIPS_VPE_LOADER



config MIPS_VPE_APSP_API_CMP

	bool

	default "y"

	depends on MIPS_VPE_APSP_API && MIPS_CMP



config MIPS_VPE_APSP_API_MT

	bool

	default "y"

	depends on MIPS_VPE_APSP_API && !MIPS_CMP



config MIPS_CMP

	bool "MIPS CMP framework support (DEPRECATED)"

	depends on SYS_SUPPORTS_MIPS_CMP && !CPU_MIPSR6

	select SMP

	select SYNC_R4K

	select SYS_SUPPORTS_SMP

	select WEAK_ORDERING

	default n

	help

	  Select this if you are using a bootloader which implements the "CMP

	  framework" protocol (ie. YAMON) and want your kernel to make use of

	  its ability to start secondary CPUs.



	  Unless you have a specific need, you should use CONFIG_MIPS_CPS

	  instead of this.

	depends on MIPS_VPE_APSP_API



config MIPS_CPS

	bool "MIPS Coherent Processing System support"
@@ -2774,9 +2747,6 @@ config HOTPLUG_CPU 
config SMP_UP

	bool



config SYS_SUPPORTS_MIPS_CMP

	bool



config SYS_SUPPORTS_MIPS_CPS

	bool

arch/mips/include/asm/rtlx.h

+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ struct rtlx_channel { 
extern struct rtlx_info {

	unsigned long id;

	enum rtlx_state state;

	int ap_int_pending;	/* Status of 0 or 1 for CONFIG_MIPS_CMP only */



	struct rtlx_channel channel[RTLX_CHANNELS];

} *rtlx;

arch/mips/include/asm/smp-ops.h

+0 −16
Original line number Diff line number Diff line
@@ -80,22 +80,6 @@ static inline int register_up_smp_ops(void) 
#endif

}



static inline int register_cmp_smp_ops(void)

{

#ifdef CONFIG_MIPS_CMP

	extern const struct plat_smp_ops cmp_smp_ops;



	if (!mips_cm_present())

		return -ENODEV;



	register_smp_ops(&cmp_smp_ops);



	return 0;

#else

	return -ENODEV;

#endif

}



static inline int register_vsmp_smp_ops(void)

{

#ifdef CONFIG_MIPS_MT_SMP

arch/mips/include/asm/vpe.h

+0 −4
Original line number Diff line number Diff line
@@ -29,12 +29,8 @@ 


static inline int aprp_cpu_index(void)

{

#ifdef CONFIG_MIPS_CMP

	return setup_max_cpus;

#else

	extern int tclimit;

	return tclimit;

#endif

}



enum vpe_state {

arch/mips/kernel/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -58,16 +58,13 @@ obj-$(CONFIG_CPU_BMIPS) += smp-bmips.o bmips_vec.o bmips_5xxx_init.o 
obj-$(CONFIG_MIPS_MT)		+= mips-mt.o

obj-$(CONFIG_MIPS_MT_FPAFF)	+= mips-mt-fpaff.o

obj-$(CONFIG_MIPS_MT_SMP)	+= smp-mt.o

obj-$(CONFIG_MIPS_CMP)		+= smp-cmp.o

obj-$(CONFIG_MIPS_CPS)		+= smp-cps.o cps-vec.o

obj-$(CONFIG_MIPS_CPS_NS16550)	+= cps-vec-ns16550.o

obj-$(CONFIG_MIPS_SPRAM)	+= spram.o



obj-$(CONFIG_MIPS_VPE_LOADER)	+= vpe.o

obj-$(CONFIG_MIPS_VPE_LOADER_CMP) += vpe-cmp.o

obj-$(CONFIG_MIPS_VPE_LOADER_MT) += vpe-mt.o

obj-$(CONFIG_MIPS_VPE_APSP_API) += rtlx.o

obj-$(CONFIG_MIPS_VPE_APSP_API_CMP) += rtlx-cmp.o

obj-$(CONFIG_MIPS_VPE_APSP_API_MT) += rtlx-mt.o



obj-$(CONFIG_MIPS_MSC)		+= irq-msc01.o