[source] build: remove mips16 feature flag from target makefiles

LEDE Commits lede-commits at lists.infradead.org
Tue Jan 24 04:42:12 PST 2017


nbd pushed a commit to source.git, branch lede-17.01:
https://git.lede-project.org/392cccb7f4189cb8f2f62df467af980b593ce073

commit 392cccb7f4189cb8f2f62df467af980b593ce073
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Tue Jan 24 12:40:00 2017 +0100

    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 at nbd.name>
---
 include/target.mk                         | 3 +++
 target/linux/ar71xx/Makefile              | 2 +-
 target/linux/brcm47xx/mips74k/target.mk   | 1 -
 target/linux/lantiq/falcon/target.mk      | 2 +-
 target/linux/lantiq/xrx200/target.mk      | 2 +-
 target/linux/lantiq/xway/target.mk        | 2 +-
 target/linux/lantiq/xway_legacy/target.mk | 2 +-
 target/linux/malta/be/target.mk           | 2 +-
 target/linux/malta/le/target.mk           | 2 +-
 target/linux/ramips/Makefile              | 2 +-
 10 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/include/target.mk b/include/target.mk
index 2e0bf49..597563d 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 a8df2b0..4341a9a 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
+FEATURES:=
 CPU_TYPE:=24kc
 SUBTARGETS:=generic nand mikrotik
 
diff --git a/target/linux/brcm47xx/mips74k/target.mk b/target/linux/brcm47xx/mips74k/target.mk
index eb006e9..e5c2565 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 b87d1dc..3c848df 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 b998012..9600f04 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 c60b2db..429be76 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 5976f03..7678030 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 ddb65f0..87d5eeb 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 12c860a..ca12fab 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 51cd8f3..2585902 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 at phrozen.org>
 
 KERNEL_PATCHVER:=4.4



More information about the lede-commits mailing list