[PATCH] treewide: clean up target/subtarget features

Rui Salvaterra rsalvaterra at gmail.com
Wed Nov 25 04:38:51 EST 2020


Move features common to all subtargets to the parent target, where applicable.

Signed-off-by: Rui Salvaterra <rsalvaterra at gmail.com>
---
After cleaning up ath79, I noticed other targets had the same issue. I think I
cleaned up all the remaning ones, but I may have missed something.

 target/linux/apm821xx/Makefile            | 2 +-
 target/linux/apm821xx/nand/target.mk      | 2 +-
 target/linux/apm821xx/sata/target.mk      | 2 +-
 target/linux/lantiq/ase/target.mk         | 2 +-
 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 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/target/linux/apm821xx/Makefile b/target/linux/apm821xx/Makefile
index c7e27d3214..bae20d0d04 100644
--- a/target/linux/apm821xx/Makefile
+++ b/target/linux/apm821xx/Makefile
@@ -8,7 +8,7 @@ ARCH:=powerpc
 BOARD:=apm821xx
 BOARDNAME:=AppliedMicro APM821xx
 CPU_TYPE:=464fp
-FEATURES:=fpu dt gpio
+FEATURES:=fpu dt gpio ramdisk squashfs usb
 SUBTARGETS:=nand sata
 
 KERNEL_PATCHVER:=5.4
diff --git a/target/linux/apm821xx/nand/target.mk b/target/linux/apm821xx/nand/target.mk
index d40b0fbc19..208ea10b91 100644
--- a/target/linux/apm821xx/nand/target.mk
+++ b/target/linux/apm821xx/nand/target.mk
@@ -1,5 +1,5 @@
 BOARDNAME:=Devices with NAND flash (Routers)
-FEATURES += nand pcie ramdisk squashfs usb
+FEATURES += nand pcie
 
 DEFAULT_PACKAGES += kmod-ath9k swconfig wpad-basic-wolfssl
 
diff --git a/target/linux/apm821xx/sata/target.mk b/target/linux/apm821xx/sata/target.mk
index 43b1aa0324..b27b7ff583 100644
--- a/target/linux/apm821xx/sata/target.mk
+++ b/target/linux/apm821xx/sata/target.mk
@@ -1,6 +1,6 @@
 BOARDNAME := Devices which boot from SATA (NAS)
 DEVICE_TYPE := nas
-FEATURES += ext4 usb ramdisk squashfs rootfs-part boot-part
+FEATURES += boot-part ext4 rootfs-part
 DEFAULT_PACKAGES += badblocks block-mount e2fsprogs kmod-hwmon-drivetemp \
 		    kmod-dm kmod-md-mod partx-utils mkf2fs f2fsck
 
diff --git a/target/linux/lantiq/ase/target.mk b/target/linux/lantiq/ase/target.mk
index 5f6c03b38e..82a162bbb1 100644
--- a/target/linux/lantiq/ase/target.mk
+++ b/target/linux/lantiq/ase/target.mk
@@ -7,7 +7,7 @@
 ARCH:=mips
 SUBTARGET:=ase
 BOARDNAME:=Amazon-SE
-FEATURES:=squashfs atm mips16 small_flash
+FEATURES:=atm mips16 small_flash
 CPU_TYPE:=mips32
 
 DEFAULT_PACKAGES+=kmod-leds-gpio kmod-gpio-button-hotplug \
diff --git a/target/linux/lantiq/falcon/target.mk b/target/linux/lantiq/falcon/target.mk
index 3c848dfda7..ddab198849 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 nand
+FEATURES:=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 4d92b25bcb..8497db51ba 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 nand ramdisk
+FEATURES:=atm nand ramdisk
 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 550c61edf0..9ad240e8ca 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 nand ramdisk
+FEATURES:=atm nand 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 7678030ead..641c590d48 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 ramdisk small_flash
+FEATURES:=atm ramdisk small_flash
 CPU_TYPE:=24kc
 
 DEFAULT_PACKAGES+=kmod-leds-gpio kmod-gpio-button-hotplug swconfig
-- 
2.29.2




More information about the openwrt-devel mailing list