Skip to content

Commit d6c2fba

Browse files
paulburtonpaulburton
committed
MIPS: Loongson32: Fix config brokenness; select SYS_SUPPORTS_32BIT_KERNEL
Commit a96d68b ("MIPS: Loongson32: clarify we don't support MIPS16 and merge configs") attempted to reduce duplication in Kconfig by consolidating some selects common to Loongson 1B & 1C CPUs under CPU_LOONGSON1. Unfortunately it clearly wasn't tested because by removing SYS_SUPPORTS_32BIT_KERNEL it prevented 32BIT from being enabled leading to all sorts of strange build errors from a kernel configured to build as neither 32 nor 64 bit. Both loongson1b_defconfig & loongson1c_defconfig failed to build due to this problem. Revert the cleanup portions of commit a96d68b ("MIPS: Loongson32: clarify we don't support MIPS16 and merge configs"), keeping only its removal of the selection of SYS_SUPPORTS_MIPS16. Signed-off-by: Paul Burton <paul.burton@mips.com> Fixes: a96d68b ("MIPS: Loongson32: clarify we don't support MIPS16 and merge configs")
1 parent 9ae1f26 commit d6c2fba

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

‎arch/mips/Kconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1869,10 +1869,6 @@ config CPU_LOONGSON1
18691869
select CPU_HAS_PREFETCH
18701870
select CPU_HAS_LOAD_STORE_LR
18711871
select CPU_SUPPORTS_32BIT_KERNEL
1872-
select IRQ_MIPS_CPU
1873-
select DMA_NONCOHERENT
1874-
select BOOT_ELF32
1875-
select SYS_SUPPORTS_LITTLE_ENDIAN
18761872
select CPU_SUPPORTS_HIGHMEM
18771873
select CPU_SUPPORTS_CPUFREQ
18781874

‎arch/mips/loongson32/Kconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ config LOONGSON1_LS1B
99
select CEVT_R4K if !MIPS_EXTERNAL_TIMER
1010
select CSRC_R4K if !MIPS_EXTERNAL_TIMER
1111
select SYS_HAS_CPU_LOONGSON1B
12+
select DMA_NONCOHERENT
13+
select BOOT_ELF32
14+
select IRQ_MIPS_CPU
15+
select SYS_SUPPORTS_32BIT_KERNEL
16+
select SYS_SUPPORTS_LITTLE_ENDIAN
17+
select SYS_SUPPORTS_HIGHMEM
1218
select SYS_HAS_EARLY_PRINTK
1319
select USE_GENERIC_EARLY_PRINTK_8250
1420
select COMMON_CLK
@@ -17,6 +23,13 @@ config LOONGSON1_LS1C
1723
bool "Loongson LS1C board"
1824
select CEVT_R4K if !MIPS_EXTERNAL_TIMER
1925
select CSRC_R4K if !MIPS_EXTERNAL_TIMER
26+
select SYS_HAS_CPU_LOONGSON1C
27+
select DMA_NONCOHERENT
28+
select BOOT_ELF32
29+
select IRQ_MIPS_CPU
30+
select SYS_SUPPORTS_32BIT_KERNEL
31+
select SYS_SUPPORTS_LITTLE_ENDIAN
32+
select SYS_SUPPORTS_HIGHMEM
2033
select SYS_HAS_EARLY_PRINTK
2134
select USE_GENERIC_EARLY_PRINTK_8250
2235
select COMMON_CLK

0 commit comments

Comments
 (0)