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' Link: https://dmz-portal.mips.com/bugz/show_bug.cgi?id=1021 Signed-off-by: Markos Chandras <markos.chandras@xxxxxxxxxx> --- Hi Ralf, Here is v2 of that patch, making SmartMIPS and microMIPS a choice symbol as you requested in http://www.linux-mips.org/archives/linux-mips/2014-06/msg00011.html However, I still feel this is wrong since these two ASEs are completely unrelated. The v1 of the patch is probably better in my opinion. If the user fails to find the 'smartmips' option due to having 'micromips' enabled, he/she can always search for the 'smartmips' symbol in the menuconfig and he/she will notice the dependency on !micromips. And if the user knows what he is doing he will probably never want to use 'smartmips' and 'micromips' together. --- arch/mips/Kconfig | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 4e238e6e661c..f30a43a52a09 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -2090,9 +2090,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 @@ -2104,11 +2112,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" depends on CPU_SUPPORTS_MSA -- 2.0.0
