Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f058e85 authored by Jayachandran C's avatar Jayachandran C Committed by Ralf Baechle
Browse files

MIPS: Kconfig and Makefile update for Netlogic XLR/XLS 



Add NLM_XLR_BOARD, CPU_XLR and other config options
Makefile updates, mostly based on r4k

Signed-off-by: default avatarJayachandran C <jayachandranc@netlogicmicro.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2334/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 5c642506

arch/mips/Kconfig

+42 −0
Original line number Diff line number Diff line
@@ -736,6 +736,33 @@ config CAVIUM_OCTEON_REFERENCE_BOARD 
		Hikari

	  Say Y here for most Octeon reference boards.



config NLM_XLR_BOARD

	bool "Netlogic XLR/XLS based systems"

	depends on EXPERIMENTAL

	select BOOT_ELF32

	select NLM_COMMON

	select NLM_XLR

	select SYS_HAS_CPU_XLR

	select SYS_SUPPORTS_SMP

	select HW_HAS_PCI

	select SWAP_IO_SPACE

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL

	select 64BIT_PHYS_ADDR

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_HIGHMEM

	select DMA_COHERENT

	select NR_CPUS_DEFAULT_32

	select CEVT_R4K

	select CSRC_R4K

	select IRQ_CPU

	select ZONE_DMA if 64BIT

	select SYNC_R4K

	select SYS_HAS_EARLY_PRINTK

	help

	  Support for systems based on Netlogic XLR and XLS processors.

	  Say Y here if you have a XLR or XLS based board.



endchoice



source "arch/mips/alchemy/Kconfig"
@@ -752,6 +779,7 @@ source "arch/mips/txx9/Kconfig" 
source "arch/mips/vr41xx/Kconfig"

source "arch/mips/cavium-octeon/Kconfig"

source "arch/mips/loongson/Kconfig"

source "arch/mips/netlogic/Kconfig"



endmenu
@@ -1420,6 +1448,17 @@ config CPU_BMIPS5000 
	help

	  Broadcom BMIPS5000 processors.



config CPU_XLR

	bool "Netlogic XLR SoC"

	depends on SYS_HAS_CPU_XLR

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_64BIT_KERNEL

	select CPU_SUPPORTS_HIGHMEM

	select WEAK_ORDERING

	select WEAK_REORDERING_BEYOND_LLSC

	select CPU_SUPPORTS_HUGEPAGES

	help

	  Netlogic Microsystems XLR/XLS processors.

endchoice



if CPU_LOONGSON2F
@@ -1550,6 +1589,9 @@ config SYS_HAS_CPU_BMIPS4380 
config SYS_HAS_CPU_BMIPS5000

	bool



config SYS_HAS_CPU_XLR

	bool



#

# CPU may reorder R->R, R->W, W->R, W->W

# Reordering beyond LL and SC is handled in WEAK_REORDERING_BEYOND_LLSC

arch/mips/Makefile

+12 −0
Original line number Diff line number Diff line
@@ -191,6 +191,18 @@ endif 
#

include $(srctree)/arch/mips/Kbuild.platforms



#

# NETLOGIC SOC Common (common)

#

cflags-$(CONFIG_NLM_COMMON)		+= -I$(srctree)/arch/mips/include/asm/mach-netlogic

cflags-$(CONFIG_NLM_COMMON)		+= -I$(srctree)/arch/mips/include/asm/netlogic



#

# NETLOGIC XLR/XLS SoC, Simulator and boards

#

core-$(CONFIG_NLM_XLR)      		+= arch/mips/netlogic/xlr/

load-$(CONFIG_NLM_XLR_BOARD)		+= 0xffffffff84000000



cflags-y			+= -I$(srctree)/arch/mips/include/asm/mach-generic

drivers-$(CONFIG_PCI)		+= arch/mips/pci/

arch/mips/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ obj-$(CONFIG_CPU_TX39XX) += r2300_fpu.o r2300_switch.o 
obj-$(CONFIG_CPU_TX49XX)	+= r4k_fpu.o r4k_switch.o

obj-$(CONFIG_CPU_VR41XX)	+= r4k_fpu.o r4k_switch.o

obj-$(CONFIG_CPU_CAVIUM_OCTEON)	+= octeon_switch.o

obj-$(CONFIG_CPU_XLR)		+= r4k_fpu.o r4k_switch.o



obj-$(CONFIG_SMP)		+= smp.o

obj-$(CONFIG_SMP_UP)		+= smp-up.o

arch/mips/lib/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ obj-$(CONFIG_CPU_TX39XX) += r3k_dump_tlb.o 
obj-$(CONFIG_CPU_TX49XX)	+= dump_tlb.o

obj-$(CONFIG_CPU_VR41XX)	+= dump_tlb.o

obj-$(CONFIG_CPU_CAVIUM_OCTEON)	+= dump_tlb.o

obj-$(CONFIG_CPU_XLR)		+= dump_tlb.o



# libgcc-style stuff needed in the kernel

obj-y += ashldi3.o ashrdi3.o cmpdi2.o lshrdi3.o ucmpdi2.o

arch/mips/mm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ obj-$(CONFIG_CPU_TX39XX) += c-tx39.o tlb-r3k.o 
obj-$(CONFIG_CPU_TX49XX)	+= c-r4k.o cex-gen.o tlb-r4k.o

obj-$(CONFIG_CPU_VR41XX)	+= c-r4k.o cex-gen.o tlb-r4k.o

obj-$(CONFIG_CPU_CAVIUM_OCTEON)	+= c-octeon.o cex-oct.o tlb-r4k.o

obj-$(CONFIG_CPU_XLR)		+= c-r4k.o tlb-r4k.o cex-gen.o



obj-$(CONFIG_IP22_CPU_SCACHE)	+= sc-ip22.o

obj-$(CONFIG_R5000_CPU_SCACHE)  += sc-r5k.o