Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit d6c2fba5 authored by Paul Burton's avatar Paul Burton
Browse files

MIPS: Loongson32: Fix config brokenness; select SYS_SUPPORTS_32BIT_KERNEL 



Commit a96d68ba ("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 a96d68ba ("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: default avatarPaul Burton <paul.burton@mips.com>
Fixes: a96d68ba ("MIPS: Loongson32: clarify we don't support MIPS16 and merge configs")
parent 9ae1f262

arch/mips/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -1869,10 +1869,6 @@ config CPU_LOONGSON1 
	select CPU_HAS_PREFETCH

	select CPU_HAS_LOAD_STORE_LR

	select CPU_SUPPORTS_32BIT_KERNEL

	select IRQ_MIPS_CPU

	select DMA_NONCOHERENT

	select BOOT_ELF32

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select CPU_SUPPORTS_HIGHMEM

	select CPU_SUPPORTS_CPUFREQ

arch/mips/loongson32/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -9,6 +9,12 @@ config LOONGSON1_LS1B 
	select CEVT_R4K if !MIPS_EXTERNAL_TIMER

	select CSRC_R4K if !MIPS_EXTERNAL_TIMER

	select SYS_HAS_CPU_LOONGSON1B

	select DMA_NONCOHERENT

	select BOOT_ELF32

	select IRQ_MIPS_CPU

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_HIGHMEM

	select SYS_HAS_EARLY_PRINTK

	select USE_GENERIC_EARLY_PRINTK_8250

	select COMMON_CLK
@@ -17,6 +23,13 @@ config LOONGSON1_LS1C 
	bool "Loongson LS1C board"

	select CEVT_R4K if !MIPS_EXTERNAL_TIMER

	select CSRC_R4K if !MIPS_EXTERNAL_TIMER

	select SYS_HAS_CPU_LOONGSON1C

	select DMA_NONCOHERENT

	select BOOT_ELF32

	select IRQ_MIPS_CPU

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_HIGHMEM

	select SYS_HAS_EARLY_PRINTK

	select USE_GENERIC_EARLY_PRINTK_8250

	select COMMON_CLK