update

devices/ipq807x_generic/patches/zte_mf269.patch

@@ -1,59 +1,19 @@
-From c22aa0be3e2df4d46010fa57a1004c17c1288781 Mon Sep 17 00:00:00 2001
-From: Chukun Pan <amadeus@jmu.edu.cn>
-Date: Sat, 3 Jun 2023 23:20:13 +0800
-Subject: [PATCH] ipq807x: add support for ZTE MF269
-
-Hardware specifications:
-  SoC: Qualcomm IPQ8071A
-  RAM: 512MB of DDR3
-  Flash1: Eon EN25S64 8MB
-  Flash2: MX30UF2G18AC 256MB
-  Ethernet: 2x 2.5G RJ45 port
-  Phone: 1x RJ11 port (SPI)
-  USB: 1x Type-C 2.0 port
-  WiFi1: QCN5024 2.4GHz
-  WiFi2: QCN5054 5GHz
-  Button: Reset, WPS
-
-Flash instructions:
-  1. Connect the router via serial port (115200 8N1 1.8V)
-  2. Download the initramfs image, rename it to initramfs.bin,
-     and host it with the tftp server.
-  3. Interrupt U-Boot and run these commands:
-     tftpboot initramfs.bin
-     bootm
-  4. After openwrt boots up, use scp or luci web
-     to upload sysupgrade.bin to upgrade.
-
-Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
-Reviewed-by: Robert Marko <robimarko@gmail.com>
----
- package/firmware/ipq-wifi/Makefile            |   2 +
- .../arm64/boot/dts/qcom/ipq8071-mf269.dts     | 448 ++++++++++++++++++
- target/linux/ipq807x/image/generic.mk      |  14 +
- .../ipq807x/base-files/etc/board.d/02_network |   3 +-
- .../etc/hotplug.d/firmware/11-ath11k-caldata  |   1 +
- .../etc/hotplug.d/ieee80211/11_fix_wifi_mac   |   4 +
- .../base-files/lib/upgrade/platform.sh        |   5 +
- 7 files changed, 476 insertions(+), 1 deletion(-)
- create mode 100644 target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/ipq8071-mf269.dts
-
-diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
-index cbd61c5be8a8e..ef1a456403a71 100644
 --- a/package/firmware/ipq-wifi/Makefile
 +++ b/package/firmware/ipq-wifi/Makefile
-@@ -46,6 +46,7 @@ ALLWIFIBOARDS:= \
+@@ -40,6 +40,8 @@ ALLWIFIBOARDS:= \
+ 	wallys_dr40x9 \
+ 	xiaomi_ax3600 \
  	xiaomi_ax9000 \
- 	yyets_le1 \
- 	yuncore_ax880 \
++	cmcc_rm2-6 \
 +	zte_mf269 \
  	zte_mf289f \
  	zte_mf287 \
  	zte_mf287plus \
-@@ -155,6 +156,7 @@ $(eval $(call generate-ipq-wifi-package,xiaomi_ax3600,Xiaomi AX3600))
+@@ -129,6 +131,8 @@ $(eval $(call generate-ipq-wifi-package,redmi_ax6,Redmi AX6))
+ $(eval $(call generate-ipq-wifi-package,wallys_dr40x9,Wallys DR40X9))
+ $(eval $(call generate-ipq-wifi-package,xiaomi_ax3600,Xiaomi AX3600))
  $(eval $(call generate-ipq-wifi-package,xiaomi_ax9000,Xiaomi AX9000))
- $(eval $(call generate-ipq-wifi-package,yyets_le1,YYeTs LE1))
- $(eval $(call generate-ipq-wifi-package,yuncore_ax880,Yuncore AX880))
++$(eval $(call generate-ipq-wifi-package,cmcc_rm2-6,CMCC RM2-6))
 +$(eval $(call generate-ipq-wifi-package,zte_mf269,ZTE MF269))
  $(eval $(call generate-ipq-wifi-package,zte_mf289f,ZTE MF289F))
  $(eval $(call generate-ipq-wifi-package,zte_mf287,ZTE MF287))
@@ -126,19 +86,18 @@ index cbd61c5be8a8e..ef1a456403a71 100644
  		caldata_extract "0:art" 0x1000 0x20000
  		;;
 
-diff --git a/target/linux/ipq807x/base-files/lib/upgrade/platform.sh b/target/linux/ipq807x/base-files/lib/upgrade/platform.sh
-index 5a40d5388371f..67fd0f540226b 100644
 --- a/target/linux/ipq807x/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/ipq807x/base-files/lib/upgrade/platform.sh
-@@ -110,6 +110,11 @@ platform_do_upgrade() {
- 		fw_setenv upgrade_available 1
- 		nand_do_upgrade "$1"
+@@ -51,6 +51,12 @@ platform_do_upgrade() {
+ 		nand_do_restore_config || nand_do_upgrade_failed
+ 		buffalo_upgrade_optvol
  		;;
 +	zte,mf269)
 +		CI_KERN_UBIPART="ubi_kernel"
 +		CI_ROOT_UBIPART="rootfs"
 +		nand_do_upgrade "$1"
 +		;;
- 	zyxel,nbg7815)
- 		local config_mtdnum="$(find_mtd_index 0:bootconfig)"
- 		[ -z "$config_mtdnum" ] && reboot
++	cmcc,rm2-6|\
+ 	dynalink,dl-wrx36)
+ 		nand_do_upgrade "$1"
+ 		;;