diff options
| author |   Paul Burton <paul.burton@mips.com> | 2019-02-04 14:33:06 -0800 |
|---|---|---|
| committer | Paul Burton <paul.burton@mips.com> | 2019-02-04 14:44:06 -0800 |
| commit | d6c2fba5e7ddea07804cd94bce575d9ad0999a5b (patch) | |
| tree | 23958cabaefd2fce36647fc210a59eb539224fe0 /arch/mips | |
| parent | MIPS: Don't select ARCH_HAS_SYNC_DMA_FOR_CPU when DMA is coherent (diff) | |
| download | linux-dev-d6c2fba5e7ddea07804cd94bce575d9ad0999a5b.tar.xz linux-dev-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')
| -rw-r--r-- | arch/mips/Kconfig | 4 | ||||
| -rw-r--r-- | arch/mips/loongson32/Kconfig | 13 |
2 files changed, 13 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 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 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 |