mirror of
https://github.com/FUjr/gl-infra-builder.git
synced 2025-12-16 17:15:08 +00:00
65 lines
1.8 KiB
Diff
65 lines
1.8 KiB
Diff
From 5743dc601072dbff157258255b5832382967c0aa Mon Sep 17 00:00:00 2001
|
|
From: "GL.iNet-Xinfa.Deng" <xinfa.deng@gl-inet.com>
|
|
Date: Tue, 22 Jun 2021 12:25:17 +0800
|
|
Subject: [PATCH] fix: sft1200 support nand tar upgrade
|
|
|
|
Signed-off-by: GL.iNet-Xinfa.Deng <xinfa.deng@gl-inet.com>
|
|
---
|
|
.../base-files/files/lib/upgrade/platform.sh | 25 ++++++++++++++++------
|
|
1 file changed, 18 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/openwrt-18.06/package/base-files/files/lib/upgrade/platform.sh b/openwrt-18.06/package/base-files/files/lib/upgrade/platform.sh
|
|
index 60666e7..e8d213a 100644
|
|
--- a/openwrt-18.06/package/base-files/files/lib/upgrade/platform.sh
|
|
+++ b/openwrt-18.06/package/base-files/files/lib/upgrade/platform.sh
|
|
@@ -9,7 +9,7 @@ platform_expected_image() {
|
|
|
|
case "$machine" in
|
|
# this is from dts
|
|
- "GL") echo "siwifi-1688a"; return;;
|
|
+ "GL") [ -e /dev/ubi0 ] && echo "siwifi-1688a-nand" || echo "siwifi-1688a"; return;;
|
|
"sf16a18") echo "siwifi-1688a"; return;;
|
|
"sf19a28") echo "siwifi-1688a"; return;;
|
|
esac
|
|
@@ -59,8 +59,11 @@ platform_check_image() {
|
|
fi
|
|
;;
|
|
*)
|
|
- echo "Invalid image type. Please use only .trx files"
|
|
- error=1
|
|
+ local dev_siwifi_id=$(platform_expected_image)
|
|
+ if [ "$dev_siwifi_id" != "siwifi-1688a-nand" ]; then
|
|
+ echo "Invalid image type. Please use only .trx files"
|
|
+ error=1
|
|
+ fi
|
|
;;
|
|
esac
|
|
|
|
@@ -72,11 +75,19 @@ platform_do_upgrade() {
|
|
local cmd=""
|
|
|
|
case "$siwifi_id" in
|
|
- "siwifi-1688a") cmd=$ARGV;;
|
|
- "siwifi-1688b") cmd=$ARGV;;
|
|
+ "siwifi-1688a-nand")
|
|
+ cmd=$ARGV
|
|
+ nand_do_upgrade "$cmd"
|
|
+ ;;
|
|
+ "siwifi-1688a" |\
|
|
+ "siwifi-1688b")
|
|
+ cmd=$ARGV
|
|
+ default_do_upgrade "$cmd"
|
|
+ ;;
|
|
+ *)
|
|
+ default_do_upgrade "$cmd"
|
|
+ ;;
|
|
esac
|
|
-
|
|
- default_do_upgrade "$cmd"
|
|
}
|
|
|
|
disable_watchdog() {
|
|
--
|
|
2.7.4
|
|
|