diff options
| author | Paul Burton | 2019-02-04 23:33:06 +0100 |
|---|---|---|
| committer | Paul Burton | 2019-02-04 23:44:06 +0100 |
| commit | d6c2fba5e7ddea07804cd94bce575d9ad0999a5b (patch) | |
| tree | 23958cabaefd2fce36647fc210a59eb539224fe0 /arch/mips/Kconfig | |
| parent | MIPS: Don't select ARCH_HAS_SYNC_DMA_FOR_CPU when DMA is coherent (diff) | |
| download | kernel-qcow2-linux-d6c2fba5e7ddea07804cd94bce575d9ad0999a5b.tar.gz kernel-qcow2-linux-d6c2fba5e7ddea07804cd94bce575d9ad0999a5b.tar.xz kernel-qcow2-linux-d6c2fba5e7ddea07804cd94bce575d9ad0999a5b.zip | |
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/Kconfig')
| -rw-r--r-- | arch/mips/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 6767a2104fcb..25266d1fc836 100644 --- 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 |