Skip to content

Commit 87f67cc

Browse files
groeckpaulburton
authored andcommitted
MIPS: Fix boot on Fuloong2 systems
Commit 268a2d6 ("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: 268a2d6 ("MIPS: Loongson64: Rename CPU TYPES") Cc: Jiaxun Yang <[email protected]> Signed-off-by: Guenter Roeck <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Signed-off-by: Paul Burton <[email protected]> Cc: Ralf Baechle <[email protected]> Cc: James Hogan <[email protected]> Cc: [email protected] Cc: [email protected]
1 parent 3b1313e commit 87f67cc

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

arch/mips/include/asm/cpu-type.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
static inline int __pure __get_cpu_type(const int cpu_type)
1616
{
1717
switch (cpu_type) {
18-
#if defined(CONFIG_SYS_HAS_CPU_LOONGSON2EF)
18+
#if defined(CONFIG_SYS_HAS_CPU_LOONGSON2E) || \
19+
defined(CONFIG_SYS_HAS_CPU_LOONGSON2F)
1920
case CPU_LOONGSON2EF:
2021
#endif
2122

0 commit comments

Comments
 (0)