diff options
author | Jayachandran C <jayachandranc@netlogicmicro.com> | 2011-11-11 06:37:40 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2011-12-07 17:04:55 -0500 |
commit | c3c8cfb979d1a3c514d6ef88204f05dcbd1934df (patch) | |
tree | fe6bdc9e9f13ad6d801bf86e32ef76f2acf35622 /arch/mips | |
parent | faabeb9e57d665154fbc423e6e02bc16d6384d8e (diff) |
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>
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/Kconfig | 1 | ||||
-rw-r--r-- | arch/mips/netlogic/Kconfig | 3 | ||||
-rw-r--r-- | arch/mips/netlogic/Platform | 4 | ||||
-rw-r--r-- | arch/mips/pci/Makefile | 2 |
4 files changed, 3 insertions, 7 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 04ac89c6ab68..58515fdf223e 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -761,7 +761,6 @@ config NLM_XLR_BOARD | |||
761 | depends on EXPERIMENTAL | 761 | depends on EXPERIMENTAL |
762 | select BOOT_ELF32 | 762 | select BOOT_ELF32 |
763 | select NLM_COMMON | 763 | select NLM_COMMON |
764 | select NLM_XLR | ||
765 | select SYS_HAS_CPU_XLR | 764 | select SYS_HAS_CPU_XLR |
766 | select SYS_SUPPORTS_SMP | 765 | select SYS_SUPPORTS_SMP |
767 | select HW_HAS_PCI | 766 | select HW_HAS_PCI |
diff --git a/arch/mips/netlogic/Kconfig b/arch/mips/netlogic/Kconfig index a5ca743613f2..75bec44b5856 100644 --- a/arch/mips/netlogic/Kconfig +++ b/arch/mips/netlogic/Kconfig | |||
@@ -1,5 +1,2 @@ | |||
1 | config NLM_COMMON | 1 | config NLM_COMMON |
2 | bool | 2 | bool |
3 | |||
4 | config NLM_XLR | ||
5 | bool | ||
diff --git a/arch/mips/netlogic/Platform b/arch/mips/netlogic/Platform index 4fb6b8351c34..18aaf438ee42 100644 --- 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 | |||
7 | # | 7 | # |
8 | # use mips64 if xlr is not available | 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 | # NETLOGIC processor support | 13 | # NETLOGIC processor support |
14 | # | 14 | # |
15 | platform-$(CONFIG_NLM_XLR) += netlogic/xlr | 15 | platform-$(CONFIG_CPU_XLR) += netlogic/xlr |
16 | load-$(CONFIG_NLM_COMMON) += 0xffffffff80100000 | 16 | load-$(CONFIG_NLM_COMMON) += 0xffffffff80100000 |
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile index bb82cbdbc62a..65ca05c776d5 100644 --- a/arch/mips/pci/Makefile +++ b/arch/mips/pci/Makefile | |||
@@ -55,7 +55,7 @@ obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capcella.o | |||
55 | obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o | 55 | obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o |
56 | obj-$(CONFIG_MIKROTIK_RB532) += pci-rc32434.o ops-rc32434.o fixup-rc32434.o | 56 | obj-$(CONFIG_MIKROTIK_RB532) += pci-rc32434.o ops-rc32434.o fixup-rc32434.o |
57 | obj-$(CONFIG_CPU_CAVIUM_OCTEON) += pci-octeon.o pcie-octeon.o | 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 | ifdef CONFIG_PCI_MSI | 60 | ifdef CONFIG_PCI_MSI |
61 | obj-$(CONFIG_CPU_CAVIUM_OCTEON) += msi-octeon.o | 61 | obj-$(CONFIG_CPU_CAVIUM_OCTEON) += msi-octeon.o |