[openwrt/openwrt] apm821xx: clean up target/subtarget features

[LEDE Commits]

adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/8e8fcce60950fab2428b5ad91fdd83154710797c

commit 8e8fcce60950fab2428b5ad91fdd83154710797c
Author: Rui Salvaterra <rsalvaterra at gmail.com>
AuthorDate: Wed Nov 25 09:38:51 2020 +0000

    apm821xx: clean up target/subtarget features
    
    Move features common to all subtargets to the parent target.
    
    Signed-off-by: Rui Salvaterra <rsalvaterra at gmail.com>
    [split patch to make it target-specific, adjust commit title/message]
    Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
 target/linux/apm821xx/Makefile       | 2 +-
 target/linux/apm821xx/nand/target.mk | 2 +-
 target/linux/apm821xx/sata/target.mk | 2 +-
 3 files changed, 3 insertions(+), 3 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