linux-mips
[Top] [All Lists]

[PATCH] mips/loongson: unify compiler flags and load location for

To: linux-mips@linux-mips.org, debian-mips@lists.debian.org
Subject: [PATCH] mips/loongson: unify compiler flags and load location for Loongson 2E and 2F
From: Andreas Barth <aba@not.so.argh.org>
Date: Sun, 21 Aug 2011 03:05:13 +0200
Mail-followup-to: Andreas Barth <aba@not.so.argh.org>, linux-mips@linux-mips.org, debian-mips@lists.debian.org
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mutt/1.5.18 (2008-05-17)
This patch is the first one in a series to unify the kernels for the different
loongson machines. More patches will follow after more testing.

Signed-off-by: Andreas Barth <aba@not.so.argh.org>
---
 arch/mips/Kconfig           |    4 ++--
 arch/mips/loongson/Platform |    9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index b122adc..5d3e753 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1481,7 +1481,7 @@ config CPU_XLR
          Netlogic Microsystems XLR/XLS processors.
 endchoice
 
-if CPU_LOONGSON2F
+if CPU_LOONGSON2
 config CPU_NOP_WORKAROUNDS
        bool
 
@@ -1506,7 +1506,7 @@ config CPU_LOONGSON2F_WORKAROUNDS
          systems.
 
          If unsure, please say Y.
-endif # CPU_LOONGSON2F
+endif # CPU_LOONGSON2
 
 config SYS_SUPPORTS_ZBOOT
        bool
diff --git a/arch/mips/loongson/Platform b/arch/mips/loongson/Platform
index 29692e5..d6471a5 100644
--- a/arch/mips/loongson/Platform
+++ b/arch/mips/loongson/Platform
@@ -4,10 +4,8 @@
 
 # Only gcc >= 4.4 have Loongson specific support
 cflags-$(CONFIG_CPU_LOONGSON2) += -Wa,--trap
-cflags-$(CONFIG_CPU_LOONGSON2E) += \
-       $(call cc-option,-march=loongson2e,-march=r4600)
-cflags-$(CONFIG_CPU_LOONGSON2F) += \
-       $(call cc-option,-march=loongson2f,-march=r4600)
+cflags-$(CONFIG_CPU_LOONGSON2) += \
+       $(call cc-option,-march=r4600)
 # Enable the workarounds for Loongson2f
 ifdef CONFIG_CPU_LOONGSON2F_WORKAROUNDS
   ifeq ($(call as-option,-Wa$(comma)-mfix-loongson2f-nop,),)
@@ -28,5 +26,4 @@ endif
 
 platform-$(CONFIG_MACH_LOONGSON) += loongson/
 cflags-$(CONFIG_MACH_LOONGSON) += 
-I$(srctree)/arch/mips/include/asm/mach-loongson -mno-branch-likely
-load-$(CONFIG_LEMOTE_FULOONG2E) += 0xffffffff80100000
-load-$(CONFIG_LEMOTE_MACH2F) += 0xffffffff80200000
+load-$(CONFIG_MACH_LOONGSON) += 0xffffffff80200000
-- 
1.5.6.5


<Prev in Thread] Current Thread [Next in Thread>