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>

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 04ac89c6ab68b88e9e2b67b119da72384f270691..58515fdf223ecee224169b278f244df8fb7fcc42 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -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

diff --git a/arch/mips/netlogic/Kconfig b/arch/mips/netlogic/Kconfig
index a5ca743613f26149167c58a23e286cde17a960ab..75bec44b5856ee916a3c006af7744a0746242983 100644 (file)
--- a/arch/mips/netlogic/Kconfig
+++ b/arch/mips/netlogic/Kconfig
@@ -1,5 +1,2 @@
 config NLM_COMMON
        bool
-
-config NLM_XLR
-       bool

diff --git a/arch/mips/netlogic/Platform b/arch/mips/netlogic/Platform
index 4fb6b8351c3488e891be7175ebc9663cf8b4214e..18aaf438ee42cbd6832080275daec2249d44fc25 100644 (file)
--- a/arch/mips/netlogic/Platform
+++ b/arch/mips/netlogic/Platform
@@ -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

diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
index bb82cbdbc62a8329a887dd275d56043a2f043b1e..65ca05c776d5675946c7d286178568721542cb86 100644 (file)
--- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile
@@ -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