103-MIPS-select-CPU_MIPS64-for-remaining-MIPS64-CPUs.patch 1.3 KB

12345678910111213141516171819202122232425262728293031323334353637
  1. From 31ca877744d95713e4925de542e1c686ab08a542 Mon Sep 17 00:00:00 2001
  2. From: "Jason A. Donenfeld" <[email protected]>
  3. Date: Sat, 27 Feb 2021 13:20:24 +0100
  4. Subject: [PATCH] MIPS: select CPU_MIPS64 for remaining MIPS64 CPUs
  5. The CPU_MIPS64 and CPU_MIPS32 variables are supposed to be able to
  6. distinguish broadly between 64-bit and 32-bit MIPS CPUs. However, they
  7. weren't selected by the specialty CPUs, Octeon and Loongson, which meant
  8. it was possible to hit a weird state of:
  9. MIPS=y, CONFIG_64BIT=y, CPU_MIPS64=n
  10. This commit rectifies the issue by having CPU_MIPS64 be selected when
  11. the missing Octeon or Loongson models are selected.
  12. Cc: Thomas Bogendoerfer <[email protected]>
  13. Cc: Ralf Baechle <[email protected]>
  14. Cc: George Cherian <[email protected]>
  15. Cc: Huacai Chen <[email protected]>
  16. Cc: Jiaxun Yang <[email protected]>
  17. Signed-off-by: Jason A. Donenfeld <[email protected]>
  18. ---
  19. arch/mips/Kconfig | 3 ++-
  20. 1 file changed, 2 insertions(+), 1 deletion(-)
  21. --- a/arch/mips/Kconfig
  22. +++ b/arch/mips/Kconfig
  23. @@ -2037,7 +2037,8 @@ config CPU_MIPS32
  24. config CPU_MIPS64
  25. bool
  26. - default y if CPU_MIPS64_R1 || CPU_MIPS64_R2 || CPU_MIPS64_R6
  27. + default y if CPU_MIPS64_R1 || CPU_MIPS64_R2 || CPU_MIPS64_R6 || \
  28. + CPU_LOONGSON64 || CPU_CAVIUM_OCTEON
  29. #
  30. # These indicate the revision of the architecture