mirror/openwrt
1
0
Fork 0
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2024-06-14 03:03:52 +02:00
Code Releases Activity

ramips: use full names for Xiaomi Mi Router devices

Browse Source 
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@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler 2020-12-08 15:05:47 +01:00
parent 89e6cc5c76
commit 6d4382711a
9 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts → target/linux/ramips/dts/mt7621_xiaomi_mi-router-3-pro.dts
View File

@ -6,7 +6,7 @@
#include <dt-bindings/input/input.h> #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"; model = "Xiaomi Mi Router 3 Pro";
aliases { aliases {

2
target/linux/ramips/dts/mt7621_xiaomi_mir3g-v2.dts → target/linux/ramips/dts/mt7621_xiaomi_mi-router-3g-v2.dts
View File

@ -3,6 +3,6 @@
#include "mt7621_xiaomi_mi-router-4a-3g-v2.dtsi" #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"; model = "Xiaomi Mi Router 3G v2";
}; };

2
target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts → target/linux/ramips/dts/mt7621_xiaomi_mi-router-3g.dts
View File

@ -4,7 +4,7 @@
#include <dt-bindings/input/input.h> #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"; model = "Xiaomi Mi Router 3G";
aliases { aliases {

2
target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts → target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m.dts
View File

@ -3,7 +3,7 @@
#include "mt7628an_xiaomi_mi-router-4.dtsi" #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)"; model = "Xiaomi Mi Router 4A (100M Edition)";
}; };

29
target/linux/ramips/image/mt7621.mk
View File

@ -1191,13 +1191,7 @@ define Device/xiaomi-ac2100
uboot-envtools uboot-envtools
endef endef
define Device/xiaomi_mi-router-ac2100 define Device/xiaomi_mi-router-3g
$(Device/xiaomi-ac2100)
DEVICE_MODEL := Mi Router AC2100
endef
TARGET_DEVICES += xiaomi_mi-router-ac2100
define Device/xiaomi_mir3g
$(Device/dsa-migration) $(Device/dsa-migration)
$(Device/uimage-lzma-loader) $(Device/uimage-lzma-loader)
BLOCKSIZE := 128k BLOCKSIZE := 128k
@ -1211,14 +1205,13 @@ define Device/xiaomi_mir3g
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
DEVICE_VENDOR := Xiaomi DEVICE_VENDOR := Xiaomi
DEVICE_MODEL := Mi Router 3G DEVICE_MODEL := Mi Router 3G
SUPPORTED_DEVICES += R3G
SUPPORTED_DEVICES += mir3g
DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
kmod-usb-ledtrig-usbport uboot-envtools kmod-usb-ledtrig-usbport uboot-envtools
SUPPORTED_DEVICES += R3G mir3g xiaomi,mir3g
endef 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/dsa-migration)
$(Device/uimage-lzma-loader) $(Device/uimage-lzma-loader)
IMAGE_SIZE := 14848k IMAGE_SIZE := 14848k
@ -1226,10 +1219,11 @@ define Device/xiaomi_mir3g-v2
DEVICE_MODEL := Mi Router 3G DEVICE_MODEL := Mi Router 3G
DEVICE_VARIANT := v2 DEVICE_VARIANT := v2
DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2
SUPPORTED_DEVICES += xiaomi,mir3g-v2
endef 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/dsa-migration)
$(Device/uimage-lzma-loader) $(Device/uimage-lzma-loader)
BLOCKSIZE := 128k BLOCKSIZE := 128k
@ -1245,8 +1239,9 @@ define Device/xiaomi_mir3p
check-size check-size
DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 \ DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 \
kmod-usb-ledtrig-usbport uboot-envtools kmod-usb-ledtrig-usbport uboot-envtools
SUPPORTED_DEVICES += xiaomi,mir3p
endef endef
TARGET_DEVICES += xiaomi_mir3p TARGET_DEVICES += xiaomi_mi-router-3-pro
define Device/xiaomi_mi-router-4a-gigabit define Device/xiaomi_mi-router-4a-gigabit
$(Device/dsa-migration) $(Device/dsa-migration)
@ -1259,6 +1254,12 @@ define Device/xiaomi_mi-router-4a-gigabit
endef endef
TARGET_DEVICES += xiaomi_mi-router-4a-gigabit 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 define Device/xiaomi_redmi-router-ac2100
$(Device/xiaomi-ac2100) $(Device/xiaomi-ac2100)
DEVICE_MODEL := Redmi Router AC2100 DEVICE_MODEL := Redmi Router AC2100

5
target/linux/ramips/image/mt76x8.mk
View File

@ -743,14 +743,15 @@ define Device/wrtnode_wrtnode2r
endef endef
TARGET_DEVICES += wrtnode_wrtnode2r TARGET_DEVICES += wrtnode_wrtnode2r
define Device/xiaomi_mir4a-100m define Device/xiaomi_mi-router-4a-100m
IMAGE_SIZE := 14976k IMAGE_SIZE := 14976k
DEVICE_VENDOR := Xiaomi DEVICE_VENDOR := Xiaomi
DEVICE_MODEL := Mi Router 4A DEVICE_MODEL := Mi Router 4A
DEVICE_VARIANT := 100M Edition DEVICE_VARIANT := 100M Edition
DEVICE_PACKAGES := kmod-mt76x2 DEVICE_PACKAGES := kmod-mt76x2
SUPPORTED_DEVICES += xiaomi,mir4a-100m
endef endef
TARGET_DEVICES += xiaomi_mir4a-100m TARGET_DEVICES += xiaomi_mi-router-4a-100m
define Device/xiaomi_mi-router-4c define Device/xiaomi_mi-router-4c
IMAGE_SIZE := 14976k IMAGE_SIZE := 14976k

6
target/linux/ramips/mt7621/base-files/etc/board.d/02_network
View File

@ -16,8 +16,8 @@ ramips_setup_interfaces()
asiarf,ap7621-nv1|\ asiarf,ap7621-nv1|\
lenovo,newifi-d1|\ lenovo,newifi-d1|\
mikrotik,routerboard-m33g|\ mikrotik,routerboard-m33g|\
xiaomi,mir3g|\ xiaomi,mi-router-3g|\
xiaomi,mir3g-v2|\ xiaomi,mi-router-3g-v2|\
xiaomi,mi-router-4a-gigabit) xiaomi,mi-router-4a-gigabit)
ucidef_set_interfaces_lan_wan "lan1 lan2" "wan" ucidef_set_interfaces_lan_wan "lan1 lan2" "wan"
;; ;;
@ -33,8 +33,8 @@ ramips_setup_interfaces()
;; ;;
gehua,ghl-r-001|\ gehua,ghl-r-001|\
hiwifi,hc5962|\ hiwifi,hc5962|\
xiaomi,mi-router-3-pro|\
xiaomi,mi-router-ac2100|\ xiaomi,mi-router-ac2100|\
xiaomi,mir3p|\
xiaomi,redmi-router-ac2100) xiaomi,redmi-router-ac2100)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan" ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan"
;; ;;

4
target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
View File

@ -61,9 +61,9 @@ platform_do_upgrade() {
netgear,wac104|\ netgear,wac104|\
netgear,wac124|\ netgear,wac124|\
netis,wf2881|\ netis,wf2881|\
xiaomi,mi-router-3g|\
xiaomi,mi-router-3-pro|\
xiaomi,mi-router-ac2100|\ xiaomi,mi-router-ac2100|\
xiaomi,mir3g|\
xiaomi,mir3p|\
xiaomi,redmi-router-ac2100) xiaomi,redmi-router-ac2100)
nand_do_upgrade "$1" nand_do_upgrade "$1"
;; ;;

6
target/linux/ramips/mt76x8/base-files/etc/board.d/02_network
View File

@ -133,7 +133,7 @@ ramips_setup_interfaces()
ucidef_add_switch "switch0" \ ucidef_add_switch "switch0" \
"0:wan" "3:lan" "4:lan" "6@eth0" "0:wan" "3:lan" "4:lan" "6@eth0"
;; ;;
xiaomi,mir4a-100m) xiaomi,mi-router-4a-100m)
ucidef_add_switch "switch0" \ ucidef_add_switch "switch0" \
"4:lan:1" "2:lan:2" "0:wan" "6@eth0" "4:lan:1" "2:lan:2" "0:wan" "6@eth0"
;; ;;
@ -238,8 +238,8 @@ ramips_setup_macs()
label_mac=$(mtd_get_mac_binary factory 0x4) label_mac=$(mtd_get_mac_binary factory 0x4)
wan_mac=$(mtd_get_mac_binary factory 0x28) wan_mac=$(mtd_get_mac_binary factory 0x28)
;; ;;
xiaomi,mi-router-4c|\ xiaomi,mi-router-4a-100m|\
xiaomi,mir4a-100m) xiaomi,mi-router-4c)
wan_mac=$(mtd_get_mac_binary factory 0x4) wan_mac=$(mtd_get_mac_binary factory 0x4)
;; ;;
esac esac