[openwrt/openwrt] ath79: move the squashfs feature to the parent target
LEDE Commits
lede-commits at lists.infradead.org
Mon Nov 23 09:56:46 EST 2020
adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/eb087ae4f46a8cf6158c1a6ec0fb5558f1abdaae
commit eb087ae4f46a8cf6158c1a6ec0fb5558f1abdaae
Author: Rui Salvaterra <rsalvaterra at gmail.com>
AuthorDate: Mon Nov 23 00:28:34 2020 +0000
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 at gmail.com>
---
target/linux/ath79/Makefile | 2 +-
target/linux/ath79/generic/target.mk | 1 -
target/linux/ath79/mikrotik/target.mk | 2 +-
target/linux/ath79/nand/target.mk | 2 +-
target/linux/ath79/tiny/target.mk | 2 +-
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
More information about the lede-commits
mailing list