From 04c2018c4f28dd82b7701bb546710554f2c8f9ec Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Thu, 16 Apr 2020 19:53:42 +0800
Subject: [PATCH] ramips: remove testing-kernrl

---
 target/linux/mpc85xx/Makefile                               | 4 +++-
 target/linux/mvebu/base-files/lib/preinit/79_move_config    | 2 +-
 target/linux/mvebu/cortexa53/base-files/lib/preinit/82_uDPU | 6 +++---
 target/linux/mvebu/cortexa53/base-files/lib/upgrade/uDPU.sh | 4 ++--
 .../linux/mvebu/cortexa9/base-files/etc/board.d/02_network  | 0
 target/linux/mvebu/cortexa9/base-files/etc/init.d/bootcount | 0
 target/linux/ramips/Makefile                                | 1 -
 7 files changed, 9 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 target/linux/mvebu/cortexa9/base-files/etc/board.d/02_network
 mode change 100644 => 100755 target/linux/mvebu/cortexa9/base-files/etc/init.d/bootcount

diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile
index 4bb4d8812d..c19973c841 100644
--- a/target/linux/mpc85xx/Makefile
+++ b/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
 
diff --git a/target/linux/mvebu/base-files/lib/preinit/79_move_config b/target/linux/mvebu/base-files/lib/preinit/79_move_config
index 195be0e137..640fb5cdad 100644
--- a/target/linux/mvebu/base-files/lib/preinit/79_move_config
+++ b/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
 }
diff --git a/target/linux/mvebu/cortexa53/base-files/lib/preinit/82_uDPU b/target/linux/mvebu/cortexa53/base-files/lib/preinit/82_uDPU
index 12bbfc3725..ae369b51d6 100644
--- a/target/linux/mvebu/cortexa53/base-files/lib/preinit/82_uDPU
+++ b/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" ] && {
diff --git a/target/linux/mvebu/cortexa53/base-files/lib/upgrade/uDPU.sh b/target/linux/mvebu/cortexa53/base-files/lib/upgrade/uDPU.sh
index 0bb1dd12cc..8786164811 100644
--- a/target/linux/mvebu/cortexa53/base-files/lib/upgrade/uDPU.sh
+++ b/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
 }
diff --git a/target/linux/mvebu/cortexa9/base-files/etc/board.d/02_network b/target/linux/mvebu/cortexa9/base-files/etc/board.d/02_network
old mode 100644
new mode 100755
diff --git a/target/linux/mvebu/cortexa9/base-files/etc/init.d/bootcount b/target/linux/mvebu/cortexa9/base-files/etc/init.d/bootcount
old mode 100644
new mode 100755
diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile
index da2de81464..887b5909e4 100644
--- a/target/linux/ramips/Makefile
+++ b/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.