lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MIPS: Netlogic: Use CPU_XLR instead of NLM_XLR

Browse Source 
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>
This commit is contained in:
Jayachandran C
2011-11-11 17:07:40 +05:30
committed by Ralf Baechle
parent faabeb9e57
commit c3c8cfb979
4 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/mips/Kconfig
View File

@@ -761,7 +761,6 @@ config NLM_XLR_BOARD
depends on EXPERIMENTAL depends on EXPERIMENTAL
select BOOT_ELF32 select BOOT_ELF32
select NLM_COMMON select NLM_COMMON
select NLM_XLR
select SYS_HAS_CPU_XLR select SYS_HAS_CPU_XLR
select SYS_SUPPORTS_SMP select SYS_SUPPORTS_SMP
select HW_HAS_PCI select HW_HAS_PCI

3
arch/mips/netlogic/Kconfig
View File

@@ -1,5 +1,2 @@
config NLM_COMMON config NLM_COMMON
bool bool
config NLM_XLR
bool

4
arch/mips/netlogic/Platform
View File

@@ -7,10 +7,10 @@ cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/netlogic
# #
# use mips64 if xlr is not available # 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 # NETLOGIC processor support
# #
platform-$(CONFIG_NLM_XLR) += netlogic/xlr platform-$(CONFIG_CPU_XLR) += netlogic/xlr
load-$(CONFIG_NLM_COMMON) += 0xffffffff80100000 load-$(CONFIG_NLM_COMMON) += 0xffffffff80100000

2
arch/mips/pci/Makefile
View File

@@ -55,7 +55,7 @@ obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capcella.o
obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o
obj-$(CONFIG_MIKROTIK_RB532) += pci-rc32434.o ops-rc32434.o fixup-rc32434.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_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 ifdef CONFIG_PCI_MSI
obj-$(CONFIG_CPU_CAVIUM_OCTEON) += msi-octeon.o obj-$(CONFIG_CPU_CAVIUM_OCTEON) += msi-octeon.o