diff options
| author | Jiaxun Yang <jiaxun.yang@flygoat.com> | 2019-01-22 21:04:13 +0800 |
|---|---|---|
| committer | Paul Burton <paul.burton@mips.com> | 2019-01-22 11:18:50 -0800 |
| commit | a96d68ba3b419513244f9b8ba4b41b1c1a134863 (patch) | |
| tree | 67365753454e2cfa4bc1ba4ab1a237f2da14c40f | |
| parent | 427be6a7e16cb79b007df48f3adbc0e9aceab3d3 (diff) | |
MIPS: Loongson32: clarify we don't support MIPS16 and merge configs
Accorading to GS232 core user's manual, it doesn't support MIPS16.
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: linux-mips@vger.kernel.org
Cc: keguang.zhang@gmail.com
| -rw-r--r-- | arch/mips/Kconfig | 4 | ||||
| -rw-r--r-- | arch/mips/loongson32/Kconfig | 15 |
2 files changed, 4 insertions, 15 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 6584278f542e..09537d4f656d 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -1868,6 +1868,10 @@ 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 462b126f45aa..b4eed5b59b39 100644 --- a/arch/mips/loongson32/Kconfig +++ b/arch/mips/loongson32/Kconfig @@ -9,13 +9,6 @@ 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_SUPPORTS_MIPS16 select SYS_HAS_EARLY_PRINTK select USE_GENERIC_EARLY_PRINTK_8250 select COMMON_CLK @@ -24,14 +17,6 @@ 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_SUPPORTS_MIPS16 select SYS_HAS_EARLY_PRINTK select USE_GENERIC_EARLY_PRINTK_8250 select COMMON_CLK |