aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2017-01-24 12:40:00 +0100
committerFelix Fietkau <nbd@nbd.name>2017-01-24 13:15:01 +0100
commitbfdc56d3a2c8d733ccb40f683f2f058a121933cb (patch)
treea79cea77bade35e9d75f778c4ccdfa635bff0736
parentcbbd71b6e50f057b2ff5acc05980152005e1cfeb (diff)
downloadupstream-bfdc56d3a2c8d733ccb40f683f2f058a121933cb.tar.gz
upstream-bfdc56d3a2c8d733ccb40f683f2f058a121933cb.tar.bz2
upstream-bfdc56d3a2c8d733ccb40f683f2f058a121933cb.zip
build: remove mips16 feature flag from target makefiles
It can be implicitly derived from the MIPS32 revision support in the kernel configuration Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--include/target.mk3
-rw-r--r--target/linux/ar71xx/Makefile2
-rw-r--r--target/linux/brcm47xx/mips74k/target.mk1
-rw-r--r--target/linux/lantiq/falcon/target.mk2
-rw-r--r--target/linux/lantiq/xrx200/target.mk2
-rw-r--r--target/linux/lantiq/xway/target.mk2
-rw-r--r--target/linux/lantiq/xway_legacy/target.mk2
-rw-r--r--target/linux/malta/be/target.mk2
-rw-r--r--target/linux/malta/le/target.mk2
-rw-r--r--target/linux/ramips/Makefile2
10 files changed, 11 insertions, 9 deletions
diff --git a/include/target.mk b/include/target.mk
index 2e0bf4957d..597563d5ec 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -258,6 +258,9 @@ ifeq ($(DUMP),1)
ifneq ($(CONFIG_VIRTIO),)
FEATURES += virtio
endif
+ ifneq ($(CONFIG_CPU_MIPS32_R2),)
+ FEATURES += mips16
+ endif
FEATURES += $(foreach v,6 7,$(if $(CONFIG_CPU_V$(v)),arm_v$(v)))
# remove duplicates
diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile
index ecc6d37051..3f5bc67243 100644
--- a/target/linux/ar71xx/Makefile
+++ b/target/linux/ar71xx/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
ARCH:=mips
BOARD:=ar71xx
BOARDNAME:=Atheros AR7xxx/AR9xxx
-FEATURES:=mips16 usbgadget
+FEATURES:=usbgadget
CPU_TYPE:=24kc
SUBTARGETS:=generic nand mikrotik
diff --git a/target/linux/brcm47xx/mips74k/target.mk b/target/linux/brcm47xx/mips74k/target.mk
index eb006e9a16..e5c2565258 100644
--- a/target/linux/brcm47xx/mips74k/target.mk
+++ b/target/linux/brcm47xx/mips74k/target.mk
@@ -1,6 +1,5 @@
BOARDNAME:=MIPS 74K
CPU_TYPE:=74kc
-FEATURES+=mips16
define Target/Description
Build firmware for Broadcom BCM47xx and BCM53xx devices with
diff --git a/target/linux/lantiq/falcon/target.mk b/target/linux/lantiq/falcon/target.mk
index b87d1dc1b3..3c848dfda7 100644
--- a/target/linux/lantiq/falcon/target.mk
+++ b/target/linux/lantiq/falcon/target.mk
@@ -1,7 +1,7 @@
ARCH:=mips
SUBTARGET:=falcon
BOARDNAME:=Falcon
-FEATURES:=squashfs mips16 nand
+FEATURES:=squashfs nand
CPU_TYPE:=24kc
DEFAULT_PACKAGES+= kmod-leds-gpio \
diff --git a/target/linux/lantiq/xrx200/target.mk b/target/linux/lantiq/xrx200/target.mk
index b998012968..9600f04fd2 100644
--- a/target/linux/lantiq/xrx200/target.mk
+++ b/target/linux/lantiq/xrx200/target.mk
@@ -1,7 +1,7 @@
ARCH:=mips
SUBTARGET:=xrx200
BOARDNAME:=XRX200
-FEATURES:=squashfs atm mips16 nand ubifs
+FEATURES:=squashfs atm nand ubifs
CPU_TYPE:=24kc
DEFAULT_PACKAGES+=kmod-leds-gpio \
diff --git a/target/linux/lantiq/xway/target.mk b/target/linux/lantiq/xway/target.mk
index c60b2db7d0..429be761c4 100644
--- a/target/linux/lantiq/xway/target.mk
+++ b/target/linux/lantiq/xway/target.mk
@@ -1,7 +1,7 @@
ARCH:=mips
SUBTARGET:=xway
BOARDNAME:=XWAY
-FEATURES:=squashfs atm mips16 nand ubifs ramdisk
+FEATURES:=squashfs atm nand ubifs ramdisk
CPU_TYPE:=24kc
DEFAULT_PACKAGES+=kmod-leds-gpio kmod-gpio-button-hotplug swconfig
diff --git a/target/linux/lantiq/xway_legacy/target.mk b/target/linux/lantiq/xway_legacy/target.mk
index 5976f03663..7678030ead 100644
--- a/target/linux/lantiq/xway_legacy/target.mk
+++ b/target/linux/lantiq/xway_legacy/target.mk
@@ -1,7 +1,7 @@
ARCH:=mips
SUBTARGET:=xway_legacy
BOARDNAME:=XWAY Legacy
-FEATURES:=squashfs atm mips16 ramdisk small_flash
+FEATURES:=squashfs atm ramdisk small_flash
CPU_TYPE:=24kc
DEFAULT_PACKAGES+=kmod-leds-gpio kmod-gpio-button-hotplug swconfig
diff --git a/target/linux/malta/be/target.mk b/target/linux/malta/be/target.mk
index ddb65f040d..87d5eeb9df 100644
--- a/target/linux/malta/be/target.mk
+++ b/target/linux/malta/be/target.mk
@@ -1,7 +1,7 @@
ARCH:=mips
SUBTARGET:=be
BOARDNAME:=Big Endian
-FEATURES:=ramdisk mips16
+FEATURES:=ramdisk
define Target/Description
Build BE firmware images for MIPS Malta CoreLV board running in
diff --git a/target/linux/malta/le/target.mk b/target/linux/malta/le/target.mk
index 12c860a50e..ca12faba0c 100644
--- a/target/linux/malta/le/target.mk
+++ b/target/linux/malta/le/target.mk
@@ -1,7 +1,7 @@
ARCH:=mipsel
SUBTARGET:=le
BOARDNAME:=Little Endian
-FEATURES:=ramdisk mips16
+FEATURES:=ramdisk
define Target/Description
Build LE firmware images for MIPS Malta CoreLV board running in
diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile
index 51cd8f3e06..25859024c1 100644
--- a/target/linux/ramips/Makefile
+++ b/target/linux/ramips/Makefile
@@ -10,7 +10,7 @@ ARCH:=mipsel
BOARD:=ramips
BOARDNAME:=MediaTek Ralink MIPS
SUBTARGETS:=rt305x mt7620 mt7621 mt7628 mt7688 rt3883 rt288x
-FEATURES:=squashfs gpio mips16
+FEATURES:=squashfs gpio
MAINTAINER:=John Crispin <john@phrozen.org>
KERNEL_PATCHVER:=4.4