From 4c73c34ec4215deb690bf03faea2a0fe725476f0 Mon Sep 17 00:00:00 2001 From: Alexey Dobrovolsky Date: Wed, 5 Aug 2020 22:50:53 +0300 Subject: [PATCH] ramips: switch rt305x subtarget to kernel 5.4 RT3x5x seems to work fine with kernel 5.4. Set the default kernel version to 5.4 to bring this to a broader audience. Since 4 of 6 targets are on kernel 5.4 now, invert the kernel version setup logic in Makefile/target.mk files. Tested on ZyXEL Keenetic. Signed-off-by: Alexey Dobrovolsky [invert version setup logic] Signed-off-by: Adrian Schmutzler --- target/linux/ramips/Makefile | 2 +- target/linux/ramips/mt7620/target.mk | 2 -- target/linux/ramips/mt7621/target.mk | 2 -- target/linux/ramips/mt76x8/target.mk | 1 - target/linux/ramips/rt288x/target.mk | 2 ++ target/linux/ramips/rt3883/target.mk | 2 ++ 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile index 864cfa543d05..c3d118b2ab22 100644 --- a/target/linux/ramips/Makefile +++ b/target/linux/ramips/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=MediaTek Ralink MIPS SUBTARGETS:=mt7620 mt7621 mt76x8 rt288x rt305x rt3883 FEATURES:=squashfs gpio -KERNEL_PATCHVER:=4.14 +KERNEL_PATCHVER:=5.4 KERNEL_TESTING_PATCHVER:=5.4 define Target/Description diff --git a/target/linux/ramips/mt7620/target.mk b/target/linux/ramips/mt7620/target.mk index ff890c554095..56ceaee37fff 100644 --- a/target/linux/ramips/mt7620/target.mk +++ b/target/linux/ramips/mt7620/target.mk @@ -9,8 +9,6 @@ CPU_TYPE:=24kc DEFAULT_PACKAGES += kmod-rt2800-soc wpad-basic swconfig -KERNEL_PATCHVER:=5.4 - define Target/Description Build firmware images for Ralink MT7620 based boards. endef diff --git a/target/linux/ramips/mt7621/target.mk b/target/linux/ramips/mt7621/target.mk index 2684ea5b64dd..c2eba1d0da6f 100644 --- a/target/linux/ramips/mt7621/target.mk +++ b/target/linux/ramips/mt7621/target.mk @@ -7,8 +7,6 @@ BOARDNAME:=MT7621 based boards FEATURES+=nand ramdisk rtc usb minor CPU_TYPE:=24kc -KERNEL_PATCHVER:=5.4 - define Target/Description Build firmware images for Ralink MT7621 based boards. endef diff --git a/target/linux/ramips/mt76x8/target.mk b/target/linux/ramips/mt76x8/target.mk index 4ecc19ff6202..e13a12cf582b 100644 --- a/target/linux/ramips/mt76x8/target.mk +++ b/target/linux/ramips/mt76x8/target.mk @@ -8,7 +8,6 @@ FEATURES+=usb ramdisk CPU_TYPE:=24kc DEFAULT_PACKAGES += kmod-mt7603 wpad-basic swconfig -KERNEL_PATCHVER:=5.4 define Target/Description Build firmware images for Ralink MT76x8 based boards. diff --git a/target/linux/ramips/rt288x/target.mk b/target/linux/ramips/rt288x/target.mk index 57b0ee22514f..917f150f2405 100644 --- a/target/linux/ramips/rt288x/target.mk +++ b/target/linux/ramips/rt288x/target.mk @@ -9,6 +9,8 @@ CPU_TYPE:=24kc DEFAULT_PACKAGES += kmod-rt2800-soc wpad-mini swconfig +KERNEL_PATCHVER:=4.14 + define Target/Description Build firmware images for Ralink RT288x based boards. endef diff --git a/target/linux/ramips/rt3883/target.mk b/target/linux/ramips/rt3883/target.mk index 4a032f543747..9c719f8b76fd 100644 --- a/target/linux/ramips/rt3883/target.mk +++ b/target/linux/ramips/rt3883/target.mk @@ -9,6 +9,8 @@ CPU_TYPE:=74kc DEFAULT_PACKAGES += kmod-rt2800-pci kmod-rt2800-soc wpad-mini swconfig +KERNEL_PATCHVER:=4.14 + define Target/Description Build firmware images for Ralink RT3662/RT3883 based boards. endef -- 2.30.2