ramips: remove testing-kernrl

target/linux/mpc85xx/Makefile

@@ -11,9 +11,11 @@ BOARD:=mpc85xx
 BOARDNAME:=Freescale MPC85xx
 CPU_TYPE:=8540
 FEATURES:=squashfs ramdisk
+MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 SUBTARGETS:=generic p1020 p2020
 
-KERNEL_PATCHVER:=5.4
+KERNEL_PATCHVER:=4.14
+KERNEL_TESTING_PATCHVER := 5.4
 
 KERNELNAME:=zImage
 

target/linux/mvebu/base-files/lib/preinit/79_move_config

@@ -18,7 +18,7 @@ move_config() {
 		esac
 		mkdir -p /boot
 		mount -o rw,noatime "/dev/$partdev" /boot
-		[ -f "/boot/$BACKUP_FILE" ] && mv -f "/boot/$BACKUP_FILE" /
+		[ -f /boot/sysupgrade.tgz ] && mv -f /boot/sysupgrade.tgz /
 		umount /boot
 	fi
 }

target/linux/mvebu/cortexa53/base-files/lib/preinit/82_uDPU

@@ -15,10 +15,10 @@ preinit_mount_udpu() {
 		if [ -b "${mmcdev}p4" ]; then
 			mkdir /misc
 			mount -t f2fs ${mmcdev}p4 /misc
-			[ -f "/misc/$BACKUP_FILE" ] && {
+			[ -f /misc/sysupgrade.tgz ] && {
 				echo "- Restoring configuration files -"
-				tar xzf "/misc/$BACKUP_FILE" -C /
-				rm -f "/misc/$BACKUP_FILE"
+				tar xzf /misc/sysupgrade.tgz -C /
+				rm -f /misc/sysupgrade.tgz"
 				sync
 			}
 			[ -f "/misc/firmware/recovery.itb" ] && {

target/linux/mvebu/cortexa53/base-files/lib/upgrade/uDPU.sh

@@ -149,8 +149,8 @@ platform_do_upgrade_uDPU() {
 
 platform_copy_config_uDPU() {
 	# Config is saved on the /misc partition and copied on the rootfs after the reboot
-	if [ -f "$UPGRADE_BACKUP" ]; then
-		cp -f "$UPGRADE_BACKUP" "/misc/$BACKUP_FILE"
+	if [ -f /tmp/sysupgrade.tgz ]; then
+		cp -f /tmp/sysupgrade.tgz /misc/
 		sync
 	fi
 }

target/linux/ramips/Makefile

@@ -14,7 +14,6 @@ FEATURES:=squashfs gpio
 MAINTAINER:=John Crispin <john@phrozen.org>
 
 KERNEL_PATCHVER:=4.14
-KERNEL_TESTING_PATCHVER:=5.4
 
 define Target/Description
 	Build firmware images for Ralink RT288x/RT3xxx based boards.