| From 31ca877744d95713e4925de542e1c686ab08a542 Mon Sep 17 00:00:00 2001 |
| From: "Jason A. Donenfeld" <Jason@zx2c4.com> |
| Date: Sat, 27 Feb 2021 13:20:24 +0100 |
| Subject: [PATCH] MIPS: select CPU_MIPS64 for remaining MIPS64 CPUs |
| |
| The CPU_MIPS64 and CPU_MIPS32 variables are supposed to be able to |
| distinguish broadly between 64-bit and 32-bit MIPS CPUs. However, they |
| weren't selected by the specialty CPUs, Octeon and Loongson, which meant |
| it was possible to hit a weird state of: |
| |
| MIPS=y, CONFIG_64BIT=y, CPU_MIPS64=n |
| |
| This commit rectifies the issue by having CPU_MIPS64 be selected when |
| the missing Octeon or Loongson models are selected. |
| |
| Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> |
| Cc: Ralf Baechle <ralf@linux-mips.org> |
| Cc: George Cherian <gcherian@marvell.com> |
| Cc: Huacai Chen <chenhuacai@kernel.org> |
| Cc: Jiaxun Yang <jiaxun.yang@flygoat.com> |
| Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> |
| --- |
| arch/mips/Kconfig | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/arch/mips/Kconfig |
| +++ b/arch/mips/Kconfig |
| @@ -2041,7 +2041,8 @@ config CPU_MIPS32 |
| |
| config CPU_MIPS64 |
| bool |
| - default y if CPU_MIPS64_R1 || CPU_MIPS64_R2 || CPU_MIPS64_R6 |
| + default y if CPU_MIPS64_R1 || CPU_MIPS64_R2 || CPU_MIPS64_R6 || \ |
| + CPU_LOONGSON64 || CPU_CAVIUM_OCTEON |
| |
| # |
| # These indicate the revision of the architecture |