mirror of
https://github.com/torvalds/linux.git
synced 2024-12-22 02:52:56 +00:00
d6c2fba5e7
Commita96d68ba3b("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 commita96d68ba3b("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:a96d68ba3b("MIPS: Loongson32: clarify we don't support MIPS16 and merge configs")
76 lines
1.7 KiB
Plaintext
76 lines
1.7 KiB
Plaintext
# SPDX-License-Identifier: GPL-2.0
|
|
if MACH_LOONGSON32
|
|
|
|
choice
|
|
prompt "Machine Type"
|
|
|
|
config LOONGSON1_LS1B
|
|
bool "Loongson LS1B board"
|
|
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
|
|
|
|
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
|
|
endchoice
|
|
|
|
menuconfig CEVT_CSRC_LS1X
|
|
bool "Use PWM Timer for clockevent/clocksource"
|
|
select MIPS_EXTERNAL_TIMER
|
|
depends on CPU_LOONGSON1
|
|
help
|
|
This option changes the default clockevent/clocksource to PWM Timer,
|
|
and is required by Loongson1 CPUFreq support.
|
|
|
|
If unsure, say N.
|
|
|
|
choice
|
|
prompt "Select clockevent/clocksource"
|
|
depends on CEVT_CSRC_LS1X
|
|
default TIMER_USE_PWM0
|
|
|
|
config TIMER_USE_PWM0
|
|
bool "Use PWM Timer 0"
|
|
help
|
|
Use PWM Timer 0 as the default clockevent/clocksourcer.
|
|
|
|
config TIMER_USE_PWM1
|
|
bool "Use PWM Timer 1"
|
|
help
|
|
Use PWM Timer 1 as the default clockevent/clocksourcer.
|
|
|
|
config TIMER_USE_PWM2
|
|
bool "Use PWM Timer 2"
|
|
help
|
|
Use PWM Timer 2 as the default clockevent/clocksourcer.
|
|
|
|
config TIMER_USE_PWM3
|
|
bool "Use PWM Timer 3"
|
|
help
|
|
Use PWM Timer 3 as the default clockevent/clocksourcer.
|
|
|
|
endchoice
|
|
|
|
endif # MACH_LOONGSON32
|