MIPS: Loongson32: Fix config brokenness; select SYS_SUPPORTS_32BIT_KERNEL

Commit a96d68ba3b41 ("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 a96d68ba3b41 ("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: a96d68ba3b41 ("MIPS: Loongson32: clarify we don't support MIPS16 and merge configs")

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 6767a2104fcb2c316432ec13dda2b819199a3518..25266d1fc8365397e08bbc22f49a63007957c075 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -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
 

diff --git a/arch/mips/loongson32/Kconfig b/arch/mips/loongson32/Kconfig
index b4eed5b59b39847d394519bb3519799897a39f99..6dacc14389062315104b84b3b7d123eccf823514 100644 (file)
--- a/arch/mips/loongson32/Kconfig
+++ b/arch/mips/loongson32/Kconfig
@@ -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