Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28c945c8 authored by Wu Zhangjin's avatar Wu Zhangjin Committed by Ralf Baechle
Browse files

MIPS: Loongson: Migrate makefile to new Platform file 



Signed-off-by: default avatarWu Zhangjin <wuzhangjin@gmail.com>
To: linux-mips <linux-mips@linux-mips.org>
Cc: Alexander Clouter <alex@digriz.org.uk>
Cc: Manuel Lauss <manuel.lauss@gmail.com>
Cc: Sam Ravnborg <sam@ravnborg.org>,
Patchwork: https://patchwork.linux-mips.org/patch/1313/
Patchwork: https://patchwork.linux-mips.org/patch/1326/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 5d25b01c

arch/mips/Kbuild.platforms

+1 −0
Original line number Original line Diff line number Diff line 
# All platforms listed in alphabetic order

# All platforms listed in alphabetic order





platforms += ar7

platforms += ar7

platforms += loongson





# include the platform specific files

# include the platform specific files

include $(patsubst %, $(srctree)/arch/mips/%/Platform, $(platforms))
 
include $(patsubst %, $(srctree)/arch/mips/%/Platform, $(platforms))

arch/mips/Makefile

+0 −29
Original line number Original line Diff line number Diff line
@@ -130,26 +130,6 @@ cflags-$(CONFIG_CPU_R4300) += -march=r4300 -Wa,--trap 
cflags-$(CONFIG_CPU_VR41XX)	+= -march=r4100 -Wa,--trap

cflags-$(CONFIG_CPU_VR41XX)	+= -march=r4100 -Wa,--trap

cflags-$(CONFIG_CPU_R4X00)	+= -march=r4600 -Wa,--trap

cflags-$(CONFIG_CPU_R4X00)	+= -march=r4600 -Wa,--trap

cflags-$(CONFIG_CPU_TX49XX)	+= -march=r4600 -Wa,--trap

cflags-$(CONFIG_CPU_TX49XX)	+= -march=r4600 -Wa,--trap

# only gcc >= 4.4 have the 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)

# enable the workarounds for loongson2f

ifdef CONFIG_CPU_LOONGSON2F_WORKAROUNDS

  ifeq ($(call as-option,-Wa$(comma)-mfix-loongson2f-nop,),)

    $(error only binutils >= 2.20.2 have needed option -mfix-loongson2f-nop)

  else

    cflags-$(CONFIG_CPU_NOP_WORKAROUNDS) += -Wa$(comma)-mfix-loongson2f-nop

  endif

  ifeq ($(call as-option,-Wa$(comma)-mfix-loongson2f-jump,),)

    $(error only binutils >= 2.20.2 have needed option -mfix-loongson2f-jump)

  else

    cflags-$(CONFIG_CPU_JUMP_WORKAROUNDS) += -Wa$(comma)-mfix-loongson2f-jump

  endif

endif



cflags-$(CONFIG_CPU_MIPS32_R1)	+= $(call cc-option,-march=mips32,-mips32 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \

cflags-$(CONFIG_CPU_MIPS32_R1)	+= $(call cc-option,-march=mips32,-mips32 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \

			-Wa,-mips32 -Wa,--trap

			-Wa,-mips32 -Wa,--trap

cflags-$(CONFIG_CPU_MIPS32_R2)	+= $(call cc-option,-march=mips32r2,-mips32r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \

cflags-$(CONFIG_CPU_MIPS32_R2)	+= $(call cc-option,-march=mips32r2,-mips32r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \
@@ -345,15 +325,6 @@ core-$(CONFIG_WR_PPMC) += arch/mips/gt64120/wrppmc/ 
cflags-$(CONFIG_WR_PPMC)		+= -I$(srctree)/arch/mips/include/asm/mach-wrppmc

cflags-$(CONFIG_WR_PPMC)		+= -I$(srctree)/arch/mips/include/asm/mach-wrppmc

load-$(CONFIG_WR_PPMC)		+= 0xffffffff80100000

load-$(CONFIG_WR_PPMC)		+= 0xffffffff80100000





#

# Loongson family

#

core-$(CONFIG_MACH_LOONGSON) += arch/mips/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



#

#

# MIPS Malta board

# MIPS Malta board

#

#

arch/mips/loongson/Platform

0 → 100644
+32 −0
Original line number Original line Diff line number Diff line 
#

# Loongson Processors' Support

#



# 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)

# Enable the workarounds for Loongson2f

ifdef CONFIG_CPU_LOONGSON2F_WORKAROUNDS

  ifeq ($(call as-option,-Wa$(comma)-mfix-loongson2f-nop,),)

    $(error only binutils >= 2.20.2 have needed option -mfix-loongson2f-nop)

  else

    cflags-$(CONFIG_CPU_NOP_WORKAROUNDS) += -Wa$(comma)-mfix-loongson2f-nop

  endif

  ifeq ($(call as-option,-Wa$(comma)-mfix-loongson2f-jump,),)

    $(error only binutils >= 2.20.2 have needed option -mfix-loongson2f-jump)

  else

    cflags-$(CONFIG_CPU_JUMP_WORKAROUNDS) += -Wa$(comma)-mfix-loongson2f-jump

  endif

endif



#

# Loongson Machines' Support

#



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

arch/mips/loongson/common/cs5536/Makefile

+0 −2
Original line number Original line Diff line number Diff line
@@ -9,5 +9,3 @@ obj-$(CONFIG_CS5536) += cs5536_pci.o cs5536_ide.o cs5536_acc.o cs5536_ohci.o \ 
# Enable cs5536 mfgpt Timer

# Enable cs5536 mfgpt Timer

#

#

obj-$(CONFIG_CS5536_MFGPT) += cs5536_mfgpt.o
 
obj-$(CONFIG_CS5536_MFGPT) += cs5536_mfgpt.o
 


EXTRA_CFLAGS += -Werror

arch/mips/loongson/fuloong-2e/Makefile

+0 −2
Original line number Original line Diff line number Diff line
@@ -3,5 +3,3 @@ 
#

#





obj-y += irq.o reset.o
 
obj-y += irq.o reset.o
 


EXTRA_CFLAGS += -Werror