From fcea027df6951a9a4b352019a324b6decb3beb51 Mon Sep 17 00:00:00 2001 From: Aleksander Jan Bajkowski Date: Sat, 28 Nov 2020 22:57:06 +0100 Subject: [PATCH] lantiq: fix build of squashfs images This patch fixes build of squashfs image on lantiq. Currently the FEATURE variable is overwritten by the subtarget. Fixes: FS#3480 Fixes: f1c652337628 ("lantiq: clean up target/subtarget features") Signed-off-by: Aleksander Jan Bajkowski [reformat Fixes:] Signed-off-by: Adrian Schmutzler --- 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 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target/linux/lantiq/ase/target.mk b/target/linux/lantiq/ase/target.mk index 82a162bbb1..daabbfc74a 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:=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 ddab198849..90f81d25ca 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:=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 8497db51ba..f7dc8ac1c7 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:=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 9ad240e8ca..cb2a446dea 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:=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 641c590d48..653698d6d7 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:=atm ramdisk small_flash +FEATURES+=atm ramdisk small_flash CPU_TYPE:=24kc DEFAULT_PACKAGES+=kmod-leds-gpio kmod-gpio-button-hotplug swconfig -- 2.30.2