summaryrefslogtreecommitdiffstats
path: root/arch/mips/netlogic
diff options
context:
space:
mode:
authorJayachandran C2011-11-11 12:37:40 +0100
committerRalf Baechle2011-12-07 23:04:55 +0100
commitc3c8cfb979d1a3c514d6ef88204f05dcbd1934df (patch)
treefe6bdc9e9f13ad6d801bf86e32ef76f2acf35622 /arch/mips/netlogic
parentMIPS: Netlogic: Style fixes for Platform (diff)
downloadkernel-qcow2-linux-c3c8cfb979d1a3c514d6ef88204f05dcbd1934df.tar.gz
kernel-qcow2-linux-c3c8cfb979d1a3c514d6ef88204f05dcbd1934df.tar.xz
kernel-qcow2-linux-c3c8cfb979d1a3c514d6ef88204f05dcbd1934df.zip
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/netlogic')
-rw-r--r--arch/mips/netlogic/Kconfig3
-rw-r--r--arch/mips/netlogic/Platform4
2 files changed, 2 insertions, 5 deletions
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 @@
config NLM_COMMON
bool
-
-config NLM_XLR
- 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
#
# 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