mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-30 18:52:14 +00:00
1343acc8cd
Deleted (upstreamed): bcm27xx/patches-5.10/950-0669-drm-vc4-hdmi-Make-sure-the-device-is-powered-with-CE.patch [1] bcm27xx/patches-5.10/950-0672-drm-vc4-hdmi-Move-initial-register-read-after-pm_run.patch [1] gemini/patches-5.10/0003-ARM-dts-gemini-NAS4220-B-fis-index-block-with-128-Ki.patch [2] Manually rebased: bcm27xx/patches-5.10/950-0675-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-CEC-int.patch Manually reverted: generic/pending-5.10/860-Revert-ASoC-mediatek-Check-for-error-clk-pointer.patch [3] [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=55b10b88ac8654fc2f31518aa349a2e643b37f18 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=958a8819d41420d7a74ed922a09cacc0ba3a4218 [3] https://lore.kernel.org/all/trinity-2a727d96-0335-4d03-8f30-e22a0e10112d-1643363480085@3c-app-gmx-bap33/ Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
From 6523061868212473f63812a0c477a161742bed42 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 | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/arch/mips/Kconfig
|
|
+++ b/arch/mips/Kconfig
|
|
@@ -2088,7 +2088,7 @@ config CPU_MIPS32
|
|
config CPU_MIPS64
|
|
bool
|
|
default y if CPU_MIPS64_R1 || CPU_MIPS64_R2 || CPU_MIPS64_R5 || \
|
|
- CPU_MIPS64_R6
|
|
+ CPU_MIPS64_R6 || CPU_LOONGSON64 || CPU_CAVIUM_OCTEON
|
|
|
|
#
|
|
# These indicate the revision of the architecture
|