aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2020-11-23 00:28:34 +0000
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-11-23 13:20:53 +0100
commiteb087ae4f46a8cf6158c1a6ec0fb5558f1abdaae (patch)
tree40e67447c1fc09568e7f9f16af358bb5724255a4
parent4799810745393742d4c58f398bb1a6cd2ee80d34 (diff)
downloadupstream-eb087ae4f46a8cf6158c1a6ec0fb5558f1abdaae.tar.gz
upstream-eb087ae4f46a8cf6158c1a6ec0fb5558f1abdaae.tar.bz2
upstream-eb087ae4f46a8cf6158c1a6ec0fb5558f1abdaae.zip
ath79: move the squashfs feature to the parent target
All subtargets define it. Move it to the parent target and remove it from all subtargets. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
-rw-r--r--target/linux/ath79/Makefile2
-rw-r--r--target/linux/ath79/generic/target.mk1
-rw-r--r--target/linux/ath79/mikrotik/target.mk2
-rw-r--r--target/linux/ath79/nand/target.mk2
-rw-r--r--target/linux/ath79/tiny/target.mk2
5 files changed, 4 insertions, 5 deletions
diff --git a/target/linux/ath79/Makefile b/target/linux/ath79/Makefile
index e074cde8ce..2a9857bfb1 100644
--- a/target/linux/ath79/Makefile
+++ b/target/linux/ath79/Makefile
@@ -6,7 +6,7 @@ BOARDNAME:=Atheros ATH79
CPU_TYPE:=24kc
SUBTARGETS:=generic mikrotik nand tiny
-FEATURES:=ramdisk usbgadget
+FEATURES:=ramdisk squashfs usbgadget
KERNEL_PATCHVER:=5.4
KERNEL_TESTING_PATCHVER:=5.4
diff --git a/target/linux/ath79/generic/target.mk b/target/linux/ath79/generic/target.mk
index 0624f79572..4e53c89260 100644
--- a/target/linux/ath79/generic/target.mk
+++ b/target/linux/ath79/generic/target.mk
@@ -1,5 +1,4 @@
BOARDNAME:=Generic
-FEATURES += squashfs
DEFAULT_PACKAGES += wpad-basic-wolfssl
diff --git a/target/linux/ath79/mikrotik/target.mk b/target/linux/ath79/mikrotik/target.mk
index fb5171fea7..f5df904487 100644
--- a/target/linux/ath79/mikrotik/target.mk
+++ b/target/linux/ath79/mikrotik/target.mk
@@ -1,5 +1,5 @@
BOARDNAME := MikroTik devices
-FEATURES += minor nand squashfs
+FEATURES += minor nand
KERNELNAME := vmlinux vmlinuz
IMAGES_DIR := ../../..
diff --git a/target/linux/ath79/nand/target.mk b/target/linux/ath79/nand/target.mk
index a4069d7610..7ea9b57f45 100644
--- a/target/linux/ath79/nand/target.mk
+++ b/target/linux/ath79/nand/target.mk
@@ -1,6 +1,6 @@
BOARDNAME := Generic devices with NAND flash
-FEATURES += squashfs nand
+FEATURES += nand
DEFAULT_PACKAGES += wpad-basic-wolfssl
diff --git a/target/linux/ath79/tiny/target.mk b/target/linux/ath79/tiny/target.mk
index 2ee71ea921..91f135b56e 100644
--- a/target/linux/ath79/tiny/target.mk
+++ b/target/linux/ath79/tiny/target.mk
@@ -1,5 +1,5 @@
BOARDNAME:=Devices with small flash
-FEATURES += squashfs small_flash
+FEATURES += small_flash
DEFAULT_PACKAGES += wpad-basic-wolfssl