build: unify mips target cflags

Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 38210
12 years ago · a30681dff0
parent 569da024f0
commit a30681dff0
21 changed files with 25 additions and 21 deletions
--- a/include/target.mk
+++ b/include/target.mk
@ -204,7 +204,12 @@ ifeq ($(DUMP),1)
    endif
    CPU_CFLAGS += -mno-branch-likely
    CPU_CFLAGS_mips32 = -mips32 -mtune=mips32
+    CPU_CFLAGS_mips32r2 = -mips32r2 -mtune=mips32r2
    CPU_CFLAGS_mips64 = -mips64 -mtune=mips64 -mabi=64
+    CPU_CFLAGS_24kec = -mips32r2 -mtune=24kec
+    CPU_CFLAGS_34kc = -mips32r2 -mtune=34kc
+    CPU_CFLAGS_dsp = -mdsp
+    CPU_CFLAGS_dsp2 = -mdspr2
  endif
  ifeq ($(ARCH),i386)
    CPU_TYPE ?= i486
@ -218,7 +223,7 @@ ifeq ($(DUMP),1)
    CPU_TYPE = sparc
    CPU_CFLAGS_ultrasparc = -mcpu=ultrasparc
  endif
-  DEFAULT_CFLAGS=$(CPU_CFLAGS) $(CPU_CFLAGS_$(CPU_TYPE))
+  DEFAULT_CFLAGS=$(strip $(CPU_CFLAGS) $(CPU_CFLAGS_$(CPU_TYPE)) $(CPU_CFLAGS_$(CPU_SUBTYPE)))
 endif

 define BuildTargets/DumpCurrent
--- a/target/linux/ar71xx/Makefile
+++ b/target/linux/ar71xx/Makefile
@ -10,7 +10,7 @@ ARCH:=mips
 BOARD:=ar71xx
 BOARDNAME:=Atheros AR7xxx/AR9xxx
 FEATURES:=squashfs targz mips16
-CFLAGS:=-Os -pipe -mips32r2 -mtune=34kc -mno-branch-likely
+CPU_TYPE=34kc
 SUBTARGETS:=generic nand

 LINUX_VERSION:=3.10.12
--- a/target/linux/cobalt/Makefile
+++ b/target/linux/cobalt/Makefile
@ -10,7 +10,8 @@ ARCH:=mipsel
 BOARD:=cobalt
 BOARDNAME:=Cobalt Microservers
 FEATURES:=targz pci ext4 display
-CFLAGS:=-O2 -pipe -mtune=r5000
+CPU_TYPE := 5k
+CPU_CFLAGS_5k := -mtune=r5000
 MAINTAINER:=Florian Fainelli <florian@openwrt.org>

 LINUX_VERSION:=3.3.8
--- a/target/linux/lantiq/Makefile
+++ b/target/linux/lantiq/Makefile
@ -13,7 +13,7 @@ SUBTARGETS=xway xrx200 ase falcon

 LINUX_VERSION:=3.10.12

-CFLAGS=-Os -pipe -mips32r2 -mno-branch-likely
+CPU_TYPE:=mips32r2

 define Target/Description
 	Build firmware images for Lantiq SoC
--- a/target/linux/lantiq/ase/target.mk
+++ b/target/linux/lantiq/ase/target.mk
@ -2,7 +2,6 @@ ARCH:=mips
 SUBTARGET:=ase
 BOARDNAME:=Amazon-SE
 FEATURES:=squashfs atm
-CFLAGS+= -mtune=mips32r2

 DEFAULT_PACKAGES+=kmod-pppoa ppp-mod-pppoa linux-atm atm-tools br2684ctl kmod-ltq-dsl-ase ltq-dsl-app

--- a/target/linux/lantiq/falcon/target.mk
+++ b/target/linux/lantiq/falcon/target.mk
@ -3,7 +3,6 @@ SUBTARGET:=falcon
 BOARDNAME:=Falcon
 FEATURES:=squashfs
 DEVICE_TYPE:=other
-CFLAGS+= -mtune=mips32r2

 DEFAULT_PACKAGES+= kmod-ifxos gpon-base-files kmod-leds-gpio kmod-ledtrig-heartbeat \
 	kmod-gpon-optic-drv gpon-optic-drv kmod-gpon-onu-drv gpon-onu-drv \
--- a/target/linux/lantiq/svip_be/target.mk
+++ b/target/linux/lantiq/svip_be/target.mk
@ -3,7 +3,6 @@ SUBTARGET:=svip_be
 BOARDNAME:=SVIP Big Endian
 FEATURES:=squashfs
 DEVICE_TYPE:=other
-CFLAGS+= -mtune=mips32r2

 DEFAULT_PACKAGES+= uboot-svip hostapd-mini

--- a/target/linux/lantiq/svip_le/target.mk
+++ b/target/linux/lantiq/svip_le/target.mk
@ -3,7 +3,6 @@ SUBTARGET:=svip_le
 BOARDNAME:=SVIP Little Endian
 FEATURES:=squashfs
 DEVICE_TYPE:=other
-CFLAGS+= -mtune=mips32r2

 DEFAULT_PACKAGES+= uboot-svip hostapd-mini

--- a/target/linux/lantiq/xrx200/target.mk
+++ b/target/linux/lantiq/xrx200/target.mk
@ -2,7 +2,8 @@ ARCH:=mips
 SUBTARGET:=xrx200
 BOARDNAME:=XRX200
 FEATURES:=squashfs atm mips16
-CFLAGS+= -mtune=34kc -mdsp
+CPU_TYPE:=34kc
+CPU_SUBTYPE:=dsp

 DEFAULT_PACKAGES+=kmod-leds-gpio kmod-gpio-button-hotplug

--- a/target/linux/lantiq/xway/target.mk
+++ b/target/linux/lantiq/xway/target.mk
@ -2,7 +2,8 @@ ARCH:=mips
 SUBTARGET:=xway
 BOARDNAME:=XWAY
 FEATURES:=squashfs atm mips16
-CFLAGS+= -mtune=34kc -mdsp
+CPU_TYPE:=34kc
+CPU_SUBTYPE:=dsp

 DEFAULT_PACKAGES+=kmod-leds-gpio kmod-gpio-button-hotplug

--- a/target/linux/malta/be/target.mk
+++ b/target/linux/malta/be/target.mk
@ -3,7 +3,6 @@ ARCH_PACKAGES:=malta_mips
 SUBTARGET:=be
 BOARDNAME:=Big Endian
 FEATURES:=ramdisk mips16
-CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2

 define Target/Description
 	Build BE firmware images for MIPS Malta CoreLV board running in
--- a/target/linux/malta/be64/target.mk
+++ b/target/linux/malta/be64/target.mk
@ -3,7 +3,6 @@ ARCH_PACKAGES:=malta_mips64
 SUBTARGET:=be64
 BOARDNAME:=Big Endian (64-bits)
 FEATURES:=ramdisk
-CFLAGS:=-Os -pipe -mips64 -mtune=mips64

 define Target/Description
 	Build BE firmware images for MIPS Malta CoreLV board running in
--- a/target/linux/malta/le/target.mk
+++ b/target/linux/malta/le/target.mk
@ -3,7 +3,6 @@ ARCH_PACKAGES:=malta_mipsel
 SUBTARGET:=le
 BOARDNAME:=Little Endian
 FEATURES:=ramdisk mips16
-CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2

 define Target/Description
 	Build LE firmware images for MIPS Malta CoreLV board running in
--- a/target/linux/malta/le64/target.mk
+++ b/target/linux/malta/le64/target.mk
@ -3,7 +3,6 @@ ARCH_PACKAGES:=malta_mipsel64
 SUBTARGET:=le64
 BOARDNAME:=Little Endian (64-bits)
 FEATURES:=ramdisk
-CFLAGS:=-Os -pipe -mips64 -mtune=mips64

 define Target/Description
 	Build LE firmware images for MIPS Malta CoreLV board running in
--- a/target/linux/octeon/Makefile
+++ b/target/linux/octeon/Makefile
@ -10,7 +10,8 @@ ARCH:=mips
 BOARD:=octeon
 BOARDNAME:=Cavium Networks Octeon
 FEATURES:=squashfs jffs2 pci usb
-CFLAGS:=-Os -pipe -march=octeon -fno-caller-saves
+CPU_TYPE:=octeon
+CPU_CFLAGS_octeon:=-march=octeon
 MAINTAINER:=John Crispin <blogic@openwrt.org>

 LINUX_VERSION:=3.10.12
--- a/target/linux/ramips/Makefile
+++ b/target/linux/ramips/Makefile
@ -10,7 +10,6 @@ ARCH:=mipsel
 BOARD:=ramips
 BOARDNAME:=Ralink RT288x/RT3xxx
 SUBTARGETS:=rt305x rt3883 mt7620a rt288x
-CFLAGS:=-Os -pipe -mno-branch-likely
 FEATURES:=squashfs gpio

 LINUX_VERSION:=3.10.12
--- a/target/linux/ramips/mt7620a/target.mk
+++ b/target/linux/ramips/mt7620a/target.mk
@ -6,7 +6,8 @@ SUBTARGET:=mt7620a
 BOARDNAME:=MT7620a based boards
 ARCH_PACKAGES:=ramips_24kec
 FEATURES+=usb
-CFLAGS+= -march=24kec -mdsp
+CPU_TYPE:=24kec
+CPU_SUBTYPE:=dsp

 define Target/Description
 	Build firmware images for Ralink MT7620a based boards.
--- a/target/linux/ramips/rt288x/target.mk
+++ b/target/linux/ramips/rt288x/target.mk
@ -4,7 +4,7 @@

 SUBTARGET:=rt288x
 BOARDNAME:=RT288x based boards
-CFLAGS+= -mips32r2 -mtune=mips32r2
+CPU_TYPE:=mips32r2

 define Target/Description
 	Build firmware images for Ralink RT288x based boards.
--- a/target/linux/ramips/rt305x/target.mk
+++ b/target/linux/ramips/rt305x/target.mk
@ -6,7 +6,8 @@ SUBTARGET:=rt305x
 BOARDNAME:=RT3x5x/RT5350 based boards
 ARCH_PACKAGES:=ramips_24kec
 FEATURES+=usb
-CFLAGS+= -march=24kec -mdsp
+CPU_TYPE:=24kec
+CPU_SUBTYPE:=dsp

 define Target/Description
 	Build firmware images for Ralink RT3x5x/RT5350 based boards.
--- a/target/linux/ramips/rt3883/target.mk
+++ b/target/linux/ramips/rt3883/target.mk
@ -6,7 +6,8 @@ SUBTARGET:=rt3883
 BOARDNAME:=RT3662/RT3883 based boards
 ARCH_PACKAGES:=ramips_24kec
 FEATURES+=usb pci
-CFLAGS+= -march=24kec -mdspr2
+CPU_TYPE:=24kec
+CPU_SUBTYPE:=dsp2

 define Target/Description
 	Build firmware images for Ralink RT3662/RT3883 based boards.
--- a/target/linux/sibyte/Makefile
+++ b/target/linux/sibyte/Makefile
@ -10,7 +10,8 @@ ARCH:=mips
 BOARD:=sibyte
 BOARDNAME:=Broadcom/SiByte SB-1
 FEATURES:=fpu ramdisk broken
-CFLAGS:=-Os -pipe -march=sb1
+CPU_TYPE:=sb1
+CPU_CFLAGS_sb1:=-march=sb1
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>

 LINUX_VERSION:=3.3.8