tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Jayachandran C <jayachandranc@netlogicmicro.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2962/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Jayachandran C and committed by
Ralf Baechle c3c8cfb9 faabeb9e

+3 -7
-1
arch/mips/Kconfig
··· 761 761 depends on EXPERIMENTAL 762 762 select BOOT_ELF32 763 763 select NLM_COMMON 764 - select NLM_XLR 765 764 select SYS_HAS_CPU_XLR 766 765 select SYS_SUPPORTS_SMP 767 766 select HW_HAS_PCI
-3
arch/mips/netlogic/Kconfig
··· 1 1 config NLM_COMMON 2 2 bool 3 - 4 - config NLM_XLR 5 - bool
+2 -2
arch/mips/netlogic/Platform
··· 7 7 # 8 8 # use mips64 if xlr is not available 9 9 # 10 - cflags-$(CONFIG_NLM_XLR) += $(call cc-option,-march=xlr,-march=mips64) 10 + cflags-$(CONFIG_CPU_XLR) += $(call cc-option,-march=xlr,-march=mips64) 11 11 12 12 # 13 13 # NETLOGIC processor support 14 14 # 15 - platform-$(CONFIG_NLM_XLR) += netlogic/xlr 15 + platform-$(CONFIG_CPU_XLR) += netlogic/xlr 16 16 load-$(CONFIG_NLM_COMMON) += 0xffffffff80100000
+1 -1
arch/mips/pci/Makefile
··· 55 55 obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o 56 56 obj-$(CONFIG_MIKROTIK_RB532) += pci-rc32434.o ops-rc32434.o fixup-rc32434.o 57 57 obj-$(CONFIG_CPU_CAVIUM_OCTEON) += pci-octeon.o pcie-octeon.o 58 - obj-$(CONFIG_NLM_XLR) += pci-xlr.o 58 + obj-$(CONFIG_CPU_XLR) += pci-xlr.o 59 59 60 60 ifdef CONFIG_PCI_MSI 61 61 obj-$(CONFIG_CPU_CAVIUM_OCTEON) += msi-octeon.o