Commit: 55fddb614311ca783c893ff37cb919d10faa975a - immortalwrt-fa (git)

Mirror only - Please move to https://github.com/immortalwrt/immortalwrt

Commit MetaInfo

• Revision: 55fddb614311ca783c893ff37cb919d10faa975a (tree)
• Time: 2022-10-13 16:29:57
• Author: Tianling Shen <cnsztl@immo...>
• Commiter: Tianling Shen

Log Message

ipq806x: rename Xiaomi R3D to Xiaomi Mi Router HD

This makes it constant with other mi router series.

Signed-off-by: Tianling Shen <[e-mail]>

Change Summary

• modified: package/boot/uboot-envtools/files/ipq806x
• modified: target/linux/ipq806x/base-files/etc/board.d/02_network
• modified: target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
• modified: target/linux/ipq806x/base-files/etc/init.d/bootcount
• modified: target/linux/ipq806x/base-files/lib/upgrade/platform.sh
• delete: target/linux/ipq806x/files/arch/arm/boot/dts/{qcom-ipq8064-r3d.dts => qcom-ipq8064-mi-router-hd.dts}
• modified: target/linux/ipq806x/image/Makefile
• modified: target/linux/ipq806x/patches-5.4/0069-arm-boot-add-dts-files.patch

Incremental Difference

--- a/package/boot/uboot-envtools/files/ipq806x
+++ b/package/boot/uboot-envtools/files/ipq806x
@@ -45,7 +45,7 @@ qcom,ipq8064-ap148 |\
 qcom,ipq8064-db149)
 	ubootenv_add_uci_config $(ubootenv_mtdinfo)
 	;;
-xiaomi,r3d)
+xiaomi,mi-router-hd)
 	ubootenv_add_uci_config "/dev/mtd9" "0x0" "0x10000" "0x10000"
 	ubootenv_add_uci_sys_config "/dev/mtd12" "0x0" "0x10000" "0x10000"
 	;;

--- a/target/linux/ipq806x/base-files/etc/board.d/02_network
+++ b/target/linux/ipq806x/base-files/etc/board.d/02_network
@@ -72,7 +72,7 @@ tplink,ad7200)
 ubnt,unifi-ac-hd)
 	ucidef_set_interface_lan "eth0 eth1"
 	;;
-xiaomi,r3d)
+xiaomi,mi-router-hd)
 	ucidef_add_switch "switch0" \
 		"1:lan:3" "2:lan:2" "3:lan:1" "6@eth1" "5:wan" "0@eth0"
 	;;

--- a/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -44,7 +44,7 @@ case "$FIRMWARE" in
 		caldata_extract "ART" 0x1000 0x2f20
 		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary default-mac 0x0) -1)
 		;;
-	xiaomi,r3d)
+	xiaomi,mi-router-hd)
 		caldata_extract "ART" 0x1000 0x2f20
 		;;
 	zyxel,nbg6817)
@@ -87,7 +87,7 @@ case "$FIRMWARE" in
 		caldata_extract "ART" 0x5000 0x2f20
 		ath10k_patch_mac $(mtd_get_mac_binary default-mac 0x0)
 		;;
-	xiaomi,r3d)
+	xiaomi,mi-router-hd)
 		caldata_extract "ART" 0x5000 0x2f20
 		;;
 	zyxel,nbg6817)

--- a/target/linux/ipq806x/base-files/etc/init.d/bootcount
+++ b/target/linux/ipq806x/base-files/etc/init.d/bootcount
@@ -16,7 +16,7 @@ boot() {
 	linksys,ea8500)
 		mtd resetbc s_env || true
 		;;
-	xiaomi,r3d)
+	xiaomi,mi-router-hd)
 		local boot_wait=$( fw_printenv boot_wait | cut -d = -f 2 )
 		[ "$boot_wait" != "on" ] && fw_setenv boot_wait on
 		local bootdelay=$( fw_printenv bootdelay | cut -d = -f 2 )

--- a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
@@ -54,7 +54,7 @@ platform_do_upgrade() {
 		MTD_CONFIG_ARGS="-s 0x200000"
 		default_do_upgrade "$1"
 		;;
-	xiaomi,r3d)
+	xiaomi,mi-router-hd)
 		platform_do_upgrade_xiaomi "$1" 0x2800000
 		;;
 	zyxel,nbg6817)

--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-r3d.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-mi-router-hd.dts
@@ -5,8 +5,8 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	model = "Xiaomi Mi Router HD (R3D)";
-	compatible = "xiaomi,r3d", "qcom,ipq8064";
+	model = "Xiaomi Mi Router HD";
+	compatible = "xiaomi,mi-router-hd", "qcom,ipq8064";
 
 	memory@0 {
 		device_type = "memory";

--- a/target/linux/ipq806x/image/Makefile
+++ b/target/linux/ipq806x/image/Makefile
@@ -393,10 +393,10 @@ define Device/ubnt_unifi-ac-hd
 endef
 TARGET_DEVICES += ubnt_unifi-ac-hd
 
-define Device/xiaomi_r3d
+define Device/xiaomi_mi-router-hd
 	$(call Device/LegacyImage)
 	DEVICE_VENDOR := Xiaomi
-	DEVICE_MODEL := R3D
+	DEVICE_MODEL := Mi Router HD
 	SOC := qcom-ipq8064
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
@@ -408,7 +408,7 @@ define Device/xiaomi_r3d
 	DEVICE_PACKAGES := kmod-i2c-gpio kmod-hwmon-lm75 hwmon-drivetemp \
 		kmod-usb-storage-uas ath10k-firmware-qca9984-ct ath10k-firmware-qca99x0-ct
 endef
-TARGET_DEVICES += xiaomi_r3d
+TARGET_DEVICES += xiaomi_mi-router-hd
 
 define Device/zyxel_nbg6817
 	DEVICE_VENDOR := ZyXEL

--- a/target/linux/ipq806x/patches-5.4/0069-arm-boot-add-dts-files.patch
+++ b/target/linux/ipq806x/patches-5.4/0069-arm-boot-add-dts-files.patch
@@ -23,7 +23,7 @@ Signed-off-by: John Crispin <[e-mail]>
 +	qcom-ipq8064-ea7500-v1.dtb \
 +	qcom-ipq8064-ea8500.dtb \
 +	qcom-ipq8064-g10.dtb \
-+	qcom-ipq8064-r3d.dtb \
++	qcom-ipq8064-mi-router-hd.dtb \
 +	qcom-ipq8064-r7500.dtb \
 +	qcom-ipq8064-r7500v2.dtb \
 +	qcom-ipq8064-unifi-ac-hd.dtb \