From: Daniel González Cabanelas <dgcbueu@gmail.com>
Date: Mon, 15 Jun 2020 22:09:33 +0000 (+0200)
Subject: bcm63xx: use the generic nand upgrade on Sercomm devices
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e3eaf52ba3e6970d28dffe371a577e5eeea1b87e;p=oweals%2Fopenwrt.git

bcm63xx: use the generic nand upgrade on Sercomm devices

The Sercomm devices don't need the jffs2 cleanmarkers for the kernel
partition. With the stock firmware they are only added when the
bootloader partition is upgraded.

Furthermore, on the Sercomm H500-s, the specific cfe_jffs2_upgrade_tar
function causes OOB corruption. As a result of this, combined with the
nature of the mtdsplit driver, the upgrade procedure ends in a bricked
device.

Use the generic nand_do_upgrade provided by the OpenWrt common functions.

Signed-off-by: Daniel González Cabanelas <dgcbueu@gmail.com>
---

diff --git a/target/linux/bcm63xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm63xx/base-files/lib/upgrade/platform.sh
index 525d3b90b5..0d836729ee 100644
--- a/target/linux/bcm63xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/bcm63xx/base-files/lib/upgrade/platform.sh
@@ -70,12 +70,15 @@ platform_do_upgrade() {
 		comtrend,vg-8050|\
 		comtrend,vr-3032u|\
 		huawei,hg253s-v2|\
-		netgear,dgnd3700-v2|\
+		netgear,dgnd3700-v2)
+			REQUIRE_IMAGE_METADATA=1
+			cfe_jffs2_upgrade_tar "$1"
+			;;
 		sercomm,ad1018|\
 		sercomm,h500-s-lowi|\
 		sercomm,h500-s-vfes)
 			REQUIRE_IMAGE_METADATA=1
-			cfe_jffs2_upgrade_tar "$1"
+			nand_do_upgrade "$1"
 			;;
 		*)
 			default_do_upgrade "$1"