Unverified Commit 6fbde6b4 authored by Jiaxun Yang's avatar Jiaxun Yang Committed by Paul Burton
Browse files

MIPS: Loongson64: Move files to the top-level directory 



Current Loongson-3 code can share among all Loongson64 processors.

Signed-off-by: default avatarJiaxun Yang <jiaxun.yang@flygoat.com>
Signed-off-by: default avatarPaul Burton <paulburton@kernel.org>
Cc: linux-mips@vger.kernel.org
Cc: chenhc@lemote.com
Cc: paul.burton@mips.com
parent 1bdb7b76

arch/mips/Kconfig

+26 −0
Original line number Diff line number Diff line
@@ -461,7 +461,33 @@ config MACH_LOONGSON2EF 


config MACH_LOONGSON64

	bool "Loongson-2/3 GSx64 family of machines"

	select ARCH_SPARSEMEM_ENABLE

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_MIGHT_HAVE_PC_SERIO

	select GENERIC_ISA_DMA_SUPPORT_BROKEN

	select BOOT_ELF32

	select BOARD_SCACHE

	select CSRC_R4K

	select CEVT_R4K

	select CPU_HAS_WB

	select FORCE_PCI

	select ISA

	select I8259

	select IRQ_MIPS_CPU

	select NR_CPUS_DEFAULT_4

	select USE_GENERIC_EARLY_PRINTK_8250

	select SYS_HAS_CPU_LOONGSON64

	select SYS_HAS_EARLY_PRINTK

	select SYS_SUPPORTS_SMP

	select SYS_SUPPORTS_HOTPLUG_CPU

	select SYS_SUPPORTS_NUMA

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_HIGHMEM

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_ZBOOT

	select LOONGSON_MC146818

	select ZONE_DMA32

	select NUMA

	help

	  This enables the support of Loongson-2/3 family of processors with

	  GSx64 microarchitecture.

arch/mips/configs/loongson3_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ CONFIG_BLK_DEV_INITRD=y 
CONFIG_SYSCTL_SYSCALL=y

CONFIG_EMBEDDED=y

CONFIG_MACH_LOONGSON64=y

CONFIG_LOONGSON_MACH3X=y

CONFIG_SMP=y

CONFIG_HZ_256=y

CONFIG_KEXEC=y

arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
#define cpu_has_vint		0

#define cpu_has_vtag_icache	0

#define cpu_has_watch		1



#define cpu_has_wsbh		1

#define cpu_has_ic_fills_f_dc	1

#define cpu_hwrena_impl_bits	0xc0000000

arch/mips/loongson64/Kconfig

+1 −37
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

if MACH_LOONGSON64



choice

	prompt "Machine Type"



config LOONGSON_MACH3X

	bool "Generic Loongson 3 family machines"

	select ARCH_SPARSEMEM_ENABLE

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_MIGHT_HAVE_PC_SERIO

	select GENERIC_ISA_DMA_SUPPORT_BROKEN

	select BOOT_ELF32

	select BOARD_SCACHE

	select CSRC_R4K

	select CEVT_R4K

	select CPU_HAS_WB

	select FORCE_PCI

	select ISA

	select I8259

	select IRQ_MIPS_CPU

	select NR_CPUS_DEFAULT_4

	select USE_GENERIC_EARLY_PRINTK_8250

	select SYS_HAS_CPU_LOONGSON64

	select SYS_HAS_EARLY_PRINTK

	select SYS_SUPPORTS_SMP

	select SYS_SUPPORTS_HOTPLUG_CPU

	select SYS_SUPPORTS_NUMA

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_HIGHMEM

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select LOONGSON_MC146818

	select ZONE_DMA32

	select NUMA

	help

		Generic Loongson 3 family machines utilize the 3A/3B revision

		of Loongson processor and RS780/SBX00 chipset.

endchoice



config RS780_HPET

	bool "RS780/SBX00 HPET Timer"

	depends on LOONGSON_MACH3X

	depends on CONFIG_MACH_LOONGSON64

	select MIPS_EXTERNAL_TIMER

	help

	  This option enables the hpet timer of AMD RS780/SBX00.

arch/mips/loongson64/Makefile

+9 −8
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

#

# Common code for all Loongson based systems

# Makefile for Loongson-3 family machines

#

obj-$(CONFIG_MACH_LOONGSON64) += irq.o cop2-ex.o platform.o acpi_init.o dma.o \

				setup.o init.o cmdline.o env.o time.o reset.o \



obj-$(CONFIG_MACH_LOONGSON64) += common/



#

# All Loongson-3 family machines

#



obj-$(CONFIG_CPU_LOONGSON64)  += loongson-3/
 
obj-$(CONFIG_SMP)	+= smp.o

obj-$(CONFIG_NUMA)	+= numa.o

obj-$(CONFIG_RS780_HPET) += hpet.o

obj-$(CONFIG_PCI) += pci.o

obj-$(CONFIG_LOONGSON_MC146818) += rtc.o

obj-$(CONFIG_SUSPEND) += pm.o