[asus] Fix support TRX images of version 2

openwrt-xiaomi · Jan 31, 2024 · 96b8726 · 96b8726
1 parent 02a7657
commit 96b8726
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -5,8 +5,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=facinstall
-PKG_VERSION:=1.4
-PKG_RELEASE:=20240123
+PKG_VERSION:=1.5
+PKG_RELEASE:=20240131
 
 PKG_MAINTAINER:=remittor <remittor@gmail.com>
 PKG_LICENSE:=MIT

diff --git a/files/asus.sh b/files/asus.sh
@@ -14,6 +14,7 @@ FI_UBIFS_PART="UBI_DEV"
 FI_KERNEL_VOL="linux"
 FI_ROOTFS_VOL="rootfs"
 FI_KERNEL_SIZE=
+FI_DEL_TRX_HEADER=
 
 
 fi_get_vol_id_by_name() {
@@ -79,7 +80,9 @@ fi_platform_do_upgrade() {
 
 		skip_size=0
 		if [ "$FI_IMAGE_MAGIC" = "$FI_MAGIC_TRX" ]; then
-			skip_size=64
+			if [ "$FI_DEL_TRX_HEADER" = "1" ]; then
+				skip_size=64
+			fi
 		fi
 
 		filog "Flash data to '$FI_KERNEL_VOL' (dev: $kernel_vol_dev)..."

diff --git a/files/fi_boards.sh b/files/fi_boards.sh
@@ -82,10 +82,12 @@ fi_init_board() {
 	asus,rt-ax52)
 		FI_HW_MODEL="RT-AX52"
 		FI_KERNEL_SIZE=0x45fe000
+		FI_DEL_TRX_HEADER=1
 		;;
 	asus,rt-ax59u)
 		FI_HW_MODEL="RT-AX59U"
 		FI_KERNEL_SIZE=0x45fe000
+		FI_DEL_TRX_HEADER=1
 		;;
 	asus,rt-ax89x)
 		FI_HW_MODEL="RT-AX89U"
@@ -94,10 +96,12 @@ fi_init_board() {
 	asus,tuf-ax4200)
 		FI_HW_MODEL="TUF-AX4200"
 		FI_KERNEL_SIZE=0x45fe000
+		FI_DEL_TRX_HEADER=1
 		;;
 	asus,tuf-ax6000)
 		FI_HW_MODEL="TUF-AX6000"
 		FI_KERNEL_SIZE=0x45fe000
+		FI_DEL_TRX_HEADER=1
 		;;
 	xiaomi,mi-router-3-pro)
 		FI_HDR_MODEL_ID=10