[openwrt/openwrt] ramips: use full names for Xiaomi Mi Router devices
LEDE Commits
lede-commits at lists.infradead.org
Tue Dec 8 11:31:42 EST 2020
adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/6d4382711a65b5606cc9b815e6590b0e36ebf5b5
commit 6d4382711a65b5606cc9b815e6590b0e36ebf5b5
Author: Adrian Schmutzler <freifunk at adrianschmutzler.de>
AuthorDate: Tue Dec 8 15:05:47 2020 +0100
ramips: use full names for Xiaomi Mi Router devices
This aligns the device/image names of the older Xiaomi Mi Router
devices with their "friendly" model and DEVICE_MODEL properties.
This also reintroduces consistency with the newer devices already
following that scheme.
Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
...mir3p.dts => mt7621_xiaomi_mi-router-3-pro.dts} | 2 +-
...3g-v2.dts => mt7621_xiaomi_mi-router-3g-v2.dts} | 2 +-
...mi_mir3g.dts => mt7621_xiaomi_mi-router-3g.dts} | 2 +-
...m.dts => mt7628an_xiaomi_mi-router-4a-100m.dts} | 2 +-
target/linux/ramips/image/mt7621.mk | 29 +++++++++++-----------
target/linux/ramips/image/mt76x8.mk | 5 ++--
.../mt7621/base-files/etc/board.d/02_network | 6 ++---
.../mt7621/base-files/lib/upgrade/platform.sh | 4 +--
.../mt76x8/base-files/etc/board.d/02_network | 6 ++---
9 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts b/target/linux/ramips/dts/mt7621_xiaomi_mi-router-3-pro.dts
similarity index 98%
rename from target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts
rename to target/linux/ramips/dts/mt7621_xiaomi_mi-router-3-pro.dts
index 43e61e9140..b9101b7ccb 100644
--- a/target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts
+++ b/target/linux/ramips/dts/mt7621_xiaomi_mi-router-3-pro.dts
@@ -6,7 +6,7 @@
#include <dt-bindings/input/input.h>
/ {
- compatible = "xiaomi,mir3p", "mediatek,mt7621-soc";
+ compatible = "xiaomi,mi-router-3-pro", "mediatek,mt7621-soc";
model = "Xiaomi Mi Router 3 Pro";
aliases {
diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts b/target/linux/ramips/dts/mt7621_xiaomi_mi-router-3g-v2.dts
similarity index 69%
rename from target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts
rename to target/linux/ramips/dts/mt7621_xiaomi_mi-router-3g-v2.dts
index 50c5a7dafb..fe03ff1e6a 100644
--- a/target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts
+++ b/target/linux/ramips/dts/mt7621_xiaomi_mi-router-3g-v2.dts
@@ -3,6 +3,6 @@
#include "mt7621_xiaomi_mi-router-4a-3g-v2.dtsi"
/ {
- compatible = "xiaomi,mir3g-v2", "mediatek,mt7621-soc";
+ compatible = "xiaomi,mi-router-3g-v2", "mediatek,mt7621-soc";
model = "Xiaomi Mi Router 3G v2";
};
diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts b/target/linux/ramips/dts/mt7621_xiaomi_mi-router-3g.dts
similarity index 98%
rename from target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts
rename to target/linux/ramips/dts/mt7621_xiaomi_mi-router-3g.dts
index 51f4842255..479cfc354c 100644
--- a/target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts
+++ b/target/linux/ramips/dts/mt7621_xiaomi_mi-router-3g.dts
@@ -4,7 +4,7 @@
#include <dt-bindings/input/input.h>
/ {
- compatible = "xiaomi,mir3g", "mediatek,mt7621-soc";
+ compatible = "xiaomi,mi-router-3g", "mediatek,mt7621-soc";
model = "Xiaomi Mi Router 3G";
aliases {
diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m.dts
similarity index 91%
rename from target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts
rename to target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m.dts
index a1a7dc7383..37797fc368 100644
--- a/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m.dts
@@ -3,7 +3,7 @@
#include "mt7628an_xiaomi_mi-router-4.dtsi"
/ {
- compatible = "xiaomi,mir4a-100m", "mediatek,mt7628an-soc";
+ compatible = "xiaomi,mi-router-4a-100m", "mediatek,mt7628an-soc";
model = "Xiaomi Mi Router 4A (100M Edition)";
};
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index 7b8a73c1bd..fad18552c9 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -1191,13 +1191,7 @@ define Device/xiaomi-ac2100
uboot-envtools
endef
-define Device/xiaomi_mi-router-ac2100
- $(Device/xiaomi-ac2100)
- DEVICE_MODEL := Mi Router AC2100
-endef
-TARGET_DEVICES += xiaomi_mi-router-ac2100
-
-define Device/xiaomi_mir3g
+define Device/xiaomi_mi-router-3g
$(Device/dsa-migration)
$(Device/uimage-lzma-loader)
BLOCKSIZE := 128k
@@ -1211,14 +1205,13 @@ define Device/xiaomi_mir3g
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
DEVICE_VENDOR := Xiaomi
DEVICE_MODEL := Mi Router 3G
- SUPPORTED_DEVICES += R3G
- SUPPORTED_DEVICES += mir3g
DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
kmod-usb-ledtrig-usbport uboot-envtools
+ SUPPORTED_DEVICES += R3G mir3g xiaomi,mir3g
endef
-TARGET_DEVICES += xiaomi_mir3g
+TARGET_DEVICES += xiaomi_mi-router-3g
-define Device/xiaomi_mir3g-v2
+define Device/xiaomi_mi-router-3g-v2
$(Device/dsa-migration)
$(Device/uimage-lzma-loader)
IMAGE_SIZE := 14848k
@@ -1226,10 +1219,11 @@ define Device/xiaomi_mir3g-v2
DEVICE_MODEL := Mi Router 3G
DEVICE_VARIANT := v2
DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2
+ SUPPORTED_DEVICES += xiaomi,mir3g-v2
endef
-TARGET_DEVICES += xiaomi_mir3g-v2
+TARGET_DEVICES += xiaomi_mi-router-3g-v2
-define Device/xiaomi_mir3p
+define Device/xiaomi_mi-router-3-pro
$(Device/dsa-migration)
$(Device/uimage-lzma-loader)
BLOCKSIZE := 128k
@@ -1245,8 +1239,9 @@ define Device/xiaomi_mir3p
check-size
DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 \
kmod-usb-ledtrig-usbport uboot-envtools
+ SUPPORTED_DEVICES += xiaomi,mir3p
endef
-TARGET_DEVICES += xiaomi_mir3p
+TARGET_DEVICES += xiaomi_mi-router-3-pro
define Device/xiaomi_mi-router-4a-gigabit
$(Device/dsa-migration)
@@ -1259,6 +1254,12 @@ define Device/xiaomi_mi-router-4a-gigabit
endef
TARGET_DEVICES += xiaomi_mi-router-4a-gigabit
+define Device/xiaomi_mi-router-ac2100
+ $(Device/xiaomi-ac2100)
+ DEVICE_MODEL := Mi Router AC2100
+endef
+TARGET_DEVICES += xiaomi_mi-router-ac2100
+
define Device/xiaomi_redmi-router-ac2100
$(Device/xiaomi-ac2100)
DEVICE_MODEL := Redmi Router AC2100
diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk
index edd42a4dd5..00593dd6f5 100644
--- a/target/linux/ramips/image/mt76x8.mk
+++ b/target/linux/ramips/image/mt76x8.mk
@@ -743,14 +743,15 @@ define Device/wrtnode_wrtnode2r
endef
TARGET_DEVICES += wrtnode_wrtnode2r
-define Device/xiaomi_mir4a-100m
+define Device/xiaomi_mi-router-4a-100m
IMAGE_SIZE := 14976k
DEVICE_VENDOR := Xiaomi
DEVICE_MODEL := Mi Router 4A
DEVICE_VARIANT := 100M Edition
DEVICE_PACKAGES := kmod-mt76x2
+ SUPPORTED_DEVICES += xiaomi,mir4a-100m
endef
-TARGET_DEVICES += xiaomi_mir4a-100m
+TARGET_DEVICES += xiaomi_mi-router-4a-100m
define Device/xiaomi_mi-router-4c
IMAGE_SIZE := 14976k
diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
index fccd9c6985..c5b35145f1 100755
--- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
@@ -16,8 +16,8 @@ ramips_setup_interfaces()
asiarf,ap7621-nv1|\
lenovo,newifi-d1|\
mikrotik,routerboard-m33g|\
- xiaomi,mir3g|\
- xiaomi,mir3g-v2|\
+ xiaomi,mi-router-3g|\
+ xiaomi,mi-router-3g-v2|\
xiaomi,mi-router-4a-gigabit)
ucidef_set_interfaces_lan_wan "lan1 lan2" "wan"
;;
@@ -33,8 +33,8 @@ ramips_setup_interfaces()
;;
gehua,ghl-r-001|\
hiwifi,hc5962|\
+ xiaomi,mi-router-3-pro|\
xiaomi,mi-router-ac2100|\
- xiaomi,mir3p|\
xiaomi,redmi-router-ac2100)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan"
;;
diff --git a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
index b4d07f8146..c68b012d0b 100755
--- a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
@@ -61,9 +61,9 @@ platform_do_upgrade() {
netgear,wac104|\
netgear,wac124|\
netis,wf2881|\
+ xiaomi,mi-router-3g|\
+ xiaomi,mi-router-3-pro|\
xiaomi,mi-router-ac2100|\
- xiaomi,mir3g|\
- xiaomi,mir3p|\
xiaomi,redmi-router-ac2100)
nand_do_upgrade "$1"
;;
diff --git a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network
index 6f0078c70a..fcc2630b3f 100755
--- a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network
@@ -133,7 +133,7 @@ ramips_setup_interfaces()
ucidef_add_switch "switch0" \
"0:wan" "3:lan" "4:lan" "6 at eth0"
;;
- xiaomi,mir4a-100m)
+ xiaomi,mi-router-4a-100m)
ucidef_add_switch "switch0" \
"4:lan:1" "2:lan:2" "0:wan" "6 at eth0"
;;
@@ -238,8 +238,8 @@ ramips_setup_macs()
label_mac=$(mtd_get_mac_binary factory 0x4)
wan_mac=$(mtd_get_mac_binary factory 0x28)
;;
- xiaomi,mi-router-4c|\
- xiaomi,mir4a-100m)
+ xiaomi,mi-router-4a-100m|\
+ xiaomi,mi-router-4c)
wan_mac=$(mtd_get_mac_binary factory 0x4)
;;
esac
More information about the lede-commits
mailing list