Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit baaac02e authored by Jonas Gorski's avatar Jonas Gorski Committed by Ralf Baechle
Browse files

MIPS: cpu-type: guard BMIPS variants with SYS_HAS_CPU_BMIPS* 



BMIPS32 and  BMIPS3300 also need to be available for MIPS32R1, as
bcm47xx might not select BMIPS.

Signed-off-by: default avatarJonas Gorski <jogo@openwrt.org>
Signed-off-by: default avatarJohn Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/6245/
parent 75d5f429

arch/mips/include/asm/cpu-type.h

+10 −3
Original line number Diff line number Diff line
@@ -27,10 +27,7 @@ static inline int __pure __get_cpu_type(const int cpu_type) 
#ifdef CONFIG_SYS_HAS_CPU_MIPS32_R1

	case CPU_4KC:

	case CPU_ALCHEMY:

	case CPU_BMIPS3300:

	case CPU_BMIPS4350:

	case CPU_PR4450:

	case CPU_BMIPS32:

	case CPU_JZRISC:

#endif
@@ -163,6 +160,16 @@ static inline int __pure __get_cpu_type(const int cpu_type) 
	case CPU_CAVIUM_OCTEON2:

#endif



#if defined(CONFIG_SYS_HAS_CPU_BMIPS32_3300) || \

	defined (CONFIG_SYS_HAS_CPU_MIPS32_R1)

	case CPU_BMIPS32:

	case CPU_BMIPS3300:

#endif



#ifdef CONFIG_SYS_HAS_CPU_BMIPS4350

	case CPU_BMIPS4350:

#endif



#ifdef CONFIG_SYS_HAS_CPU_BMIPS4380

	case CPU_BMIPS4380:

#endif