diff options
author | Paul Burton <paul.burton@mips.com> | 2019-02-04 17:33:06 -0500 |
---|---|---|
committer | Paul Burton <paul.burton@mips.com> | 2019-02-04 17:44:06 -0500 |
commit | d6c2fba5e7ddea07804cd94bce575d9ad0999a5b (patch) | |
tree | 23958cabaefd2fce36647fc210a59eb539224fe0 /arch/mips/loongson32 | |
parent | 9ae1f262cd482f9ff28d179883f9e281d578e6ec (diff) |
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")
Diffstat (limited to 'arch/mips/loongson32')
-rw-r--r-- | arch/mips/loongson32/Kconfig | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/mips/loongson32/Kconfig b/arch/mips/loongson32/Kconfig index b4eed5b59b39..6dacc1438906 100644 --- a/arch/mips/loongson32/Kconfig +++ b/arch/mips/loongson32/Kconfig | |||
@@ -9,6 +9,12 @@ config LOONGSON1_LS1B | |||
9 | select CEVT_R4K if !MIPS_EXTERNAL_TIMER | 9 | select CEVT_R4K if !MIPS_EXTERNAL_TIMER |
10 | select CSRC_R4K if !MIPS_EXTERNAL_TIMER | 10 | select CSRC_R4K if !MIPS_EXTERNAL_TIMER |
11 | select SYS_HAS_CPU_LOONGSON1B | 11 | 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 | ||
12 | select SYS_HAS_EARLY_PRINTK | 18 | select SYS_HAS_EARLY_PRINTK |
13 | select USE_GENERIC_EARLY_PRINTK_8250 | 19 | select USE_GENERIC_EARLY_PRINTK_8250 |
14 | select COMMON_CLK | 20 | select COMMON_CLK |
@@ -17,6 +23,13 @@ config LOONGSON1_LS1C | |||
17 | bool "Loongson LS1C board" | 23 | bool "Loongson LS1C board" |
18 | select CEVT_R4K if !MIPS_EXTERNAL_TIMER | 24 | select CEVT_R4K if !MIPS_EXTERNAL_TIMER |
19 | select CSRC_R4K if !MIPS_EXTERNAL_TIMER | 25 | 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 | ||
20 | select SYS_HAS_EARLY_PRINTK | 33 | select SYS_HAS_EARLY_PRINTK |
21 | select USE_GENERIC_EARLY_PRINTK_8250 | 34 | select USE_GENERIC_EARLY_PRINTK_8250 |
22 | select COMMON_CLK | 35 | select COMMON_CLK |