]> git.baikalelectronics.ru Git - kernel.git/commit
MIPS: Fix boot on Fuloong2 systems
authorGuenter Roeck <linux@roeck-us.net>
Wed, 27 Nov 2019 15:26:12 +0000 (07:26 -0800)
committerPaul Burton <paulburton@kernel.org>
Wed, 27 Nov 2019 18:27:45 +0000 (10:27 -0800)
commit7e02d8ef807fe969e0e27027d749f16b8099dd77
tree8633d11d4e07fb287b6a08031525d36838bad2b9
parentf594915bb00831b179a839b8a4fb34e5d390d0cc
MIPS: Fix boot on Fuloong2 systems

Commit 5bd03aeef0f79e ("MIPS: Loongson64: Rename CPU TYPES") changed
Kconfig symbols as follows:
CPU_LOONGSON2 to CPU_LOONGSON2EF
CPU_LOONGSON3 to CPU_LOONGSON64
SYS_HAS_CPU_LOONGSON3 to SYS_HAS_CPU_LOONGSON64

It did not touch SYS_HAS_CPU_LOONGSON2E or SYS_HAS_CPU_LOONGSON2F.
However, the patch changed a conditional from

 #if defined(CONFIG_SYS_HAS_CPU_LOONGSON2E) || \
     defined(CONFIG_SYS_HAS_CPU_LOONGSON2F)

to

 #if defined(CONFIG_SYS_HAS_CPU_LOONGSON2EF)

SYS_HAS_CPU_LOONGSON2EF does not exist, resulting in boot failures
with the qemu fulong2e emulation. Revert to the original code.

Fixes: 5bd03aeef0f79e ("MIPS: Loongson64: Rename CPU TYPES")
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Paul Burton <paulburton@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
arch/mips/include/asm/cpu-type.h