Backups/immortalwrt-mt798x
1
0
Fork 0
mirror of https://github.com/hanwckf/immortalwrt-mt798x.git synced 2025-01-10 03:09:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ath79: rename ubnt_bullet-m to ubnt_bullet-m-ar7241

Browse Source 
Since there exists another variant of the Bullet M with AR7240 SoC
under the same name, this patch introduces the SoC into the device
name to be able to distinguish these variants.

Signed-off-by: Russell Senior <russell@personaltelco.net>
[add commit message, adjust model in DTS, fix 02_network and
SUPPORTED_DEVICES]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Russell Senior 2020-03-10 18:06:03 -07:00 committed by Adrian Schmutzler
parent 572278d3a0
commit 8cacb84041
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts → target/linux/ath79/dts/ar7241_ubnt_bullet-m-ar7241.dts
View File

@ -6,8 +6,8 @@
#include "ar724x_ubnt_xm_outdoor.dtsi" #include "ar724x_ubnt_xm_outdoor.dtsi"
/ { / {
compatible = "ubnt,bullet-m", "ubnt,xm", "qca,ar7241"; compatible = "ubnt,bullet-m-ar7241", "ubnt,xm", "qca,ar7241";
model = "Ubiquiti Bullet M"; model = "Ubiquiti Bullet M XM (AR7241)";
}; };
&eth1 { &eth1 {

2
target/linux/ath79/generic/base-files/etc/board.d/01_leds
View File

@ -245,7 +245,7 @@ tplink,tl-wr842n-v2)
trendnet,tew-823dru) trendnet,tew-823dru)
ucidef_set_led_netdev "wan" "WAN" "trendnet:green:planet" "eth0" ucidef_set_led_netdev "wan" "WAN" "trendnet:green:planet" "eth0"
;; ;;
ubnt,bullet-m|\ ubnt,bullet-m-ar7241|\
ubnt,bullet-m-xw|\ ubnt,bullet-m-xw|\
ubnt,nanostation-loco-m|\ ubnt,nanostation-loco-m|\
ubnt,nanostation-loco-m-xw|\ ubnt,nanostation-loco-m-xw|\

4
target/linux/ath79/generic/base-files/etc/board.d/02_network
View File

@ -40,7 +40,7 @@ ath79_setup_interfaces()
tplink,re450-v1|\ tplink,re450-v1|\
tplink,re450-v2|\ tplink,re450-v2|\
tplink,tl-wr902ac-v1|\ tplink,tl-wr902ac-v1|\
ubnt,bullet-m|\ ubnt,bullet-m-ar7241|\
ubnt,bullet-m-xw|\ ubnt,bullet-m-xw|\
ubnt,lap-120|\ ubnt,lap-120|\
ubnt,litebeam-ac-gen2|\ ubnt,litebeam-ac-gen2|\
@ -440,7 +440,7 @@ ath79_setup_macs()
label_mac=$wan_mac label_mac=$wan_mac
;; ;;
ubnt,airrouter|\ ubnt,airrouter|\
ubnt,bullet-m|\ ubnt,bullet-m-ar7241|\
ubnt,nanostation-loco-m|\ ubnt,nanostation-loco-m|\
ubnt,nanostation-m|\ ubnt,nanostation-m|\
ubnt,picostation-m|\ ubnt,picostation-m|\

2
target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
View File

@ -85,7 +85,7 @@ case "$FIRMWARE" in
tplink,tl-wr2543-v1|\ tplink,tl-wr2543-v1|\
tplink,tl-wr842n-v1|\ tplink,tl-wr842n-v1|\
ubnt,airrouter|\ ubnt,airrouter|\
ubnt,bullet-m|\ ubnt,bullet-m-ar7241|\
ubnt,nanostation-loco-m|\ ubnt,nanostation-loco-m|\
ubnt,nanostation-m|\ ubnt,nanostation-m|\
ubnt,picostation-m|\ ubnt,picostation-m|\

7
target/linux/ath79/image/generic-ubnt.mk
View File

@ -113,14 +113,15 @@ define Device/ubnt_airrouter
endef endef
TARGET_DEVICES += ubnt_airrouter TARGET_DEVICES += ubnt_airrouter
define Device/ubnt_bullet-m define Device/ubnt_bullet-m-ar7241
$(Device/ubnt-xm) $(Device/ubnt-xm)
SOC := ar7241 SOC := ar7241
DEVICE_MODEL := Bullet-M DEVICE_MODEL := Bullet-M
DEVICE_VARIANT := XM (AR7241)
DEVICE_PACKAGES += rssileds DEVICE_PACKAGES += rssileds
SUPPORTED_DEVICES += bullet-m SUPPORTED_DEVICES += bullet-m ubnt,bullet-m
endef endef
TARGET_DEVICES += ubnt_bullet-m TARGET_DEVICES += ubnt_bullet-m-ar7241
define Device/ubnt_bullet-m-xw define Device/ubnt_bullet-m-xw
$(Device/ubnt-xw) $(Device/ubnt-xw)