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

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

MIPS: Netlogic: Use CPU_XLR instead of NLM_XLR 



The CPU_XLR config variable is sufficient for XLR compilation, the
variable NLM_XLR can be removed.

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


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

arch/mips/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -761,7 +761,6 @@ config NLM_XLR_BOARD 
	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

arch/mips/netlogic/Kconfig

+0 −3
Original line number Diff line number Diff line 
config NLM_COMMON

	bool
 


config NLM_XLR

	bool

arch/mips/netlogic/Platform

+2 −2
Original line number Diff line number Diff line
@@ -7,10 +7,10 @@ cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/netlogic 
#

# use mips64 if xlr is not available

#

cflags-$(CONFIG_NLM_XLR)	+= $(call cc-option,-march=xlr,-march=mips64)

cflags-$(CONFIG_CPU_XLR)	+= $(call cc-option,-march=xlr,-march=mips64)



#

# NETLOGIC processor support

#

platform-$(CONFIG_NLM_XLR)  	+= netlogic/xlr

platform-$(CONFIG_CPU_XLR)  	+= netlogic/xlr

load-$(CONFIG_NLM_COMMON)  	+= 0xffffffff80100000

arch/mips/pci/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capcella.o 
obj-$(CONFIG_WR_PPMC)		+= fixup-wrppmc.o

obj-$(CONFIG_MIKROTIK_RB532)	+= pci-rc32434.o ops-rc32434.o fixup-rc32434.o

obj-$(CONFIG_CPU_CAVIUM_OCTEON)	+= pci-octeon.o pcie-octeon.o

obj-$(CONFIG_NLM_XLR)		+= pci-xlr.o

obj-$(CONFIG_CPU_XLR)		+= pci-xlr.o



ifdef CONFIG_PCI_MSI

obj-$(CONFIG_CPU_CAVIUM_OCTEON)	+= msi-octeon.o