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

Commit 9e2b5372 authored by Markos Chandras's avatar Markos Chandras Committed by Ralf Baechle
Browse files

MIPS: Kconfig: Don't allow both microMIPS and SmartMIPS to be selected. 



microMIPS and SmartMIPS can't be used together. This fixes the
following build problem:

Warning: the 32-bit microMIPS architecture does not support the `smartmips' extension
arch/mips/kernel/entry.S:90: Error: unrecognized opcode `mtlhx $24'
[...]
arch/mips/kernel/entry.S:109: Error: unrecognized opcode `mtlhx $24'

Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/7421/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 76cff829

arch/mips/Kconfig

+12 −2
Original line number Diff line number Diff line
@@ -2101,9 +2101,17 @@ config 64BIT_PHYS_ADDR 
config ARCH_PHYS_ADDR_T_64BIT

       def_bool 64BIT_PHYS_ADDR



choice

	prompt "SmartMIPS or microMIPS ASE support"



config CPU_NEEDS_NO_SMARTMIPS_OR_MICROMIPS

	bool "None"

	help

	  Select this if you want neither microMIPS nor SmartMIPS support



config CPU_HAS_SMARTMIPS

	depends on SYS_SUPPORTS_SMARTMIPS

	bool "Support for the SmartMIPS ASE"

	bool "SmartMIPS"

	help

	  SmartMIPS is a extension of the MIPS32 architecture aimed at

	  increased security at both hardware and software level for
@@ -2115,11 +2123,13 @@ config CPU_HAS_SMARTMIPS 


config CPU_MICROMIPS

	depends on SYS_SUPPORTS_MICROMIPS

	bool "Build kernel using microMIPS ISA"

	bool "microMIPS"

	help

	  When this option is enabled the kernel will be built using the

	  microMIPS ISA



endchoice



config CPU_HAS_MSA

	bool "Support for the MIPS SIMD Architecture (EXPERIMENTAL)"

	depends on CPU_SUPPORTS_MSA