dumalogiya
/
openwrt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ath79: harmonize model names for Ubiquiti devices

Browse Source 
This harmonizes the model names for the ath79 Ubiquiti devices by
applying a few minor cosmetic adjustments:

- Removes hyphens where they are not found in the product names
  (Ubiquiti uses hyphens only for the abbreviated version names
  like UAP-AC-PRO which we don't use anyway.)

- Add (XM) suffix for DTS model strings to help with distinguishing
  them from their XW counterparts.

- Remove DEVICE_VARIANT for LAP-120 which actually was an alternate
  device name.

- Generally make DTS model names and those from generic-ubnt.mk
  more consistent.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
master
Adrian Schmutzler 4 years ago
parent e49fac097c
commit 9f3415d30b
17 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File

2
target/linux/ath79/dts/ar7161_ubnt_routerstation.dts
Unescape Escape View File

@ -5,7 +5,7 @@
/ { / {
compatible = "ubnt,routerstation", "qca,ar7161"; compatible = "ubnt,routerstation", "qca,ar7161";
model = "Ubiquiti Networks RouterStation"; model = "Ubiquiti RouterStation";
}; };
&eth0 { &eth0 {

2
target/linux/ath79/dts/ar7240_ubnt_bullet-m-ar7240.dts
Unescape Escape View File

@ -7,7 +7,7 @@
/ { / {
compatible = "ubnt,bullet-m-ar7240", "ubnt,xm", "qca,ar7240"; compatible = "ubnt,bullet-m-ar7240", "ubnt,xm", "qca,ar7240";
model = "Ubiquiti Bullet M XM (AR7240)"; model = "Ubiquiti Bullet M (XM AR7240)";
}; };
&eth0 { &eth0 {

2
target/linux/ath79/dts/ar7241_ubnt_airrouter.dts
Unescape Escape View File

@ -6,7 +6,7 @@
/ { / {
compatible = "ubnt,airrouter", "ubnt,xm", "qca,ar7241"; compatible = "ubnt,airrouter", "ubnt,xm", "qca,ar7241";
model = "Ubiquiti AirRouter"; model = "Ubiquiti AirRouter (XM)";
aliases { aliases {
led-boot = &led_globe; led-boot = &led_globe;

2
target/linux/ath79/dts/ar7241_ubnt_bullet-m-ar7241.dts
Unescape Escape View File

@ -7,7 +7,7 @@
/ { / {
compatible = "ubnt,bullet-m-ar7241", "ubnt,xm", "qca,ar7241"; compatible = "ubnt,bullet-m-ar7241", "ubnt,xm", "qca,ar7241";
model = "Ubiquiti Bullet M XM (AR7241)"; model = "Ubiquiti Bullet M (XM AR7241)";
}; };
&eth1 { &eth1 {

2
target/linux/ath79/dts/ar7241_ubnt_nanobridge-m.dts
Unescape Escape View File

@ -7,7 +7,7 @@
/ { / {
compatible = "ubnt,nanobridge-m", "ubnt,xm", "qca,ar7241"; compatible = "ubnt,nanobridge-m", "ubnt,xm", "qca,ar7241";
model = "Ubiquiti NanoBridge M"; model = "Ubiquiti NanoBridge M (XM)";
}; };
&eth1 { &eth1 {

2
target/linux/ath79/dts/ar7241_ubnt_nanostation-loco-m.dts
Unescape Escape View File

@ -7,7 +7,7 @@
/ { / {
compatible = "ubnt,nanostation-loco-m", "ubnt,xm", "qca,ar7241"; compatible = "ubnt,nanostation-loco-m", "ubnt,xm", "qca,ar7241";
model = "Ubiquiti Nanostation Loco M"; model = "Ubiquiti Nanostation Loco M (XM)";
}; };
&eth1 { &eth1 {

2
target/linux/ath79/dts/ar7241_ubnt_nanostation-m.dts
Unescape Escape View File

@ -7,5 +7,5 @@
/ { / {
compatible = "ubnt,nanostation-m", "ubnt,xm", "qca,ar7241"; compatible = "ubnt,nanostation-m", "ubnt,xm", "qca,ar7241";
model = "Ubiquiti Nanostation M"; model = "Ubiquiti Nanostation M (XM)";
}; };

2
target/linux/ath79/dts/ar7241_ubnt_picostation-m.dts
Unescape Escape View File

@ -7,7 +7,7 @@
/ { / {
compatible = "ubnt,picostation-m", "ubnt,xm", "qca,ar7241"; compatible = "ubnt,picostation-m", "ubnt,xm", "qca,ar7241";
model = "Ubiquiti Picostation M"; model = "Ubiquiti Picostation M (XM)";
}; };
&eth1 { &eth1 {

2
target/linux/ath79/dts/ar7241_ubnt_powerbridge-m.dts
Unescape Escape View File

@ -7,7 +7,7 @@
/ { / {
compatible = "ubnt,powerbridge-m", "ubnt,xm", "qca,ar7241"; compatible = "ubnt,powerbridge-m", "ubnt,xm", "qca,ar7241";
model = "Ubiquiti PowerBridge M"; model = "Ubiquiti PowerBridge M (XM)";
}; };
&eth1 { &eth1 {

2
target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts
Unescape Escape View File

@ -7,7 +7,7 @@
/ { / {
compatible = "ubnt,rocket-m", "ubnt,xm", "qca,ar7241"; compatible = "ubnt,rocket-m", "ubnt,xm", "qca,ar7241";
model = "Ubiquiti Rocket M"; model = "Ubiquiti Rocket M (XM)";
}; };
&eth1 { &eth1 {

2
target/linux/ath79/dts/ar7241_ubnt_unifi.dts
Unescape Escape View File

@ -8,7 +8,7 @@
/ { / {
compatible = "ubnt,unifi", "qca,ar7241"; compatible = "ubnt,unifi", "qca,ar7241";
model = "Ubiquiti UniFi AP"; model = "Ubiquiti UniFi";
aliases { aliases {
led-boot = &led_dome_green; led-boot = &led_dome_green;

2
target/linux/ath79/dts/qca9563_ubnt_unifiac-lite.dts
Unescape Escape View File

@ -5,5 +5,5 @@
/ { / {
compatible = "ubnt,unifiac-lite", "qca,qca9563"; compatible = "ubnt,unifiac-lite", "qca,qca9563";
model = "Ubiquiti UniFi-AC-LITE"; model = "Ubiquiti UniFi AC Lite";
}; };

2
target/linux/ath79/dts/qca9563_ubnt_unifiac-lr.dts
Unescape Escape View File

@ -5,5 +5,5 @@
/ { / {
compatible = "ubnt,unifiac-lr", "qca,qca9563"; compatible = "ubnt,unifiac-lr", "qca,qca9563";
model = "Ubiquiti UniFi-AC-LR"; model = "Ubiquiti UniFi AC LR";
}; };

2
target/linux/ath79/dts/qca9563_ubnt_unifiac-mesh-pro.dts
Unescape Escape View File

@ -5,5 +5,5 @@
/ { / {
compatible = "ubnt,unifiac-mesh-pro", "qca,qca9563"; compatible = "ubnt,unifiac-mesh-pro", "qca,qca9563";
model = "Ubiquiti UniFi-AC-MESH PRO"; model = "Ubiquiti UniFi AC Mesh Pro";
}; };

2
target/linux/ath79/dts/qca9563_ubnt_unifiac-mesh.dts
Unescape Escape View File

@ -5,5 +5,5 @@
/ { / {
compatible = "ubnt,unifiac-mesh", "qca,qca9563"; compatible = "ubnt,unifiac-mesh", "qca,qca9563";
model = "Ubiquiti UniFi-AC-MESH"; model = "Ubiquiti UniFi AC Mesh";
}; };

2
target/linux/ath79/dts/qca9563_ubnt_unifiac-pro.dts
Unescape Escape View File

@ -5,7 +5,7 @@
/ { / {
compatible = "ubnt,unifiac-pro", "qca,qca9563"; compatible = "ubnt,unifiac-pro", "qca,qca9563";
model = "Ubiquiti UniFi-AC-PRO"; model = "Ubiquiti UniFi AC Pro";
}; };
&usb_phy0 { &usb_phy0 {

21
target/linux/ath79/image/generic-ubnt.mk
Unescape Escape View File

@ -125,7 +125,7 @@ TARGET_DEVICES += ubnt_airrouter
define Device/ubnt_bullet-m-ar7240 define Device/ubnt_bullet-m-ar7240
$(Device/ubnt-xm) $(Device/ubnt-xm)
SOC := ar7240 SOC := ar7240
DEVICE_MODEL := Bullet-M DEVICE_MODEL := Bullet M
DEVICE_VARIANT := XM (AR7240) DEVICE_VARIANT := XM (AR7240)
DEVICE_PACKAGES += rssileds DEVICE_PACKAGES += rssileds
SUPPORTED_DEVICES += bullet-m SUPPORTED_DEVICES += bullet-m
@ -135,7 +135,7 @@ TARGET_DEVICES += ubnt_bullet-m-ar7240
define Device/ubnt_bullet-m-ar7241 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_VARIANT := XM (AR7241)
DEVICE_PACKAGES += rssileds DEVICE_PACKAGES += rssileds
SUPPORTED_DEVICES += bullet-m ubnt,bullet-m SUPPORTED_DEVICES += bullet-m ubnt,bullet-m
@ -144,7 +144,7 @@ TARGET_DEVICES += ubnt_bullet-m-ar7241
define Device/ubnt_bullet-m-xw define Device/ubnt_bullet-m-xw
$(Device/ubnt-xw) $(Device/ubnt-xw)
DEVICE_MODEL := Bullet-M DEVICE_MODEL := Bullet M
DEVICE_PACKAGES += rssileds DEVICE_PACKAGES += rssileds
SUPPORTED_DEVICES += bullet-m-xw SUPPORTED_DEVICES += bullet-m-xw
endef endef
@ -165,8 +165,7 @@ TARGET_DEVICES += ubnt_edgeswitch-8xp
define Device/ubnt_lap-120 define Device/ubnt_lap-120
$(Device/ubnt-wa) $(Device/ubnt-wa)
DEVICE_MODEL := LiteAP ac DEVICE_MODEL := LiteAP ac (LAP-120)
DEVICE_VARIANT := LAP-120
DEVICE_PACKAGES += kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct DEVICE_PACKAGES += kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct
endef endef
TARGET_DEVICES += ubnt_lap-120 TARGET_DEVICES += ubnt_lap-120
@ -281,7 +280,7 @@ TARGET_DEVICES += ubnt_powerbridge-m
define Device/ubnt_rocket-m define Device/ubnt_rocket-m
$(Device/ubnt-xm) $(Device/ubnt-xm)
SOC := ar7241 SOC := ar7241
DEVICE_MODEL := Rocket-M DEVICE_MODEL := Rocket M
DEVICE_PACKAGES += rssileds DEVICE_PACKAGES += rssileds
SUPPORTED_DEVICES += rocket-m SUPPORTED_DEVICES += rocket-m
endef endef
@ -337,35 +336,35 @@ endef
define Device/ubnt_unifiac-lite define Device/ubnt_unifiac-lite
$(Device/ubnt_unifiac) $(Device/ubnt_unifiac)
DEVICE_MODEL := UniFi AC-Lite DEVICE_MODEL := UniFi AC Lite
SUPPORTED_DEVICES += unifiac-lite SUPPORTED_DEVICES += unifiac-lite
endef endef
TARGET_DEVICES += ubnt_unifiac-lite TARGET_DEVICES += ubnt_unifiac-lite
define Device/ubnt_unifiac-lr define Device/ubnt_unifiac-lr
$(Device/ubnt_unifiac) $(Device/ubnt_unifiac)
DEVICE_MODEL := UniFi AC-LR DEVICE_MODEL := UniFi AC LR
SUPPORTED_DEVICES += unifiac-lite ubnt,unifiac-lite SUPPORTED_DEVICES += unifiac-lite ubnt,unifiac-lite
endef endef
TARGET_DEVICES += ubnt_unifiac-lr TARGET_DEVICES += ubnt_unifiac-lr
define Device/ubnt_unifiac-mesh define Device/ubnt_unifiac-mesh
$(Device/ubnt_unifiac) $(Device/ubnt_unifiac)
DEVICE_MODEL := UniFi AC-Mesh DEVICE_MODEL := UniFi AC Mesh
SUPPORTED_DEVICES += unifiac-lite SUPPORTED_DEVICES += unifiac-lite
endef endef
TARGET_DEVICES += ubnt_unifiac-mesh TARGET_DEVICES += ubnt_unifiac-mesh
define Device/ubnt_unifiac-mesh-pro define Device/ubnt_unifiac-mesh-pro
$(Device/ubnt_unifiac) $(Device/ubnt_unifiac)
DEVICE_MODEL := UniFi AC-Mesh Pro DEVICE_MODEL := UniFi AC Mesh Pro
SUPPORTED_DEVICES += unifiac-pro SUPPORTED_DEVICES += unifiac-pro
endef endef
TARGET_DEVICES += ubnt_unifiac-mesh-pro TARGET_DEVICES += ubnt_unifiac-mesh-pro
define Device/ubnt_unifiac-pro define Device/ubnt_unifiac-pro
$(Device/ubnt_unifiac) $(Device/ubnt_unifiac)
DEVICE_MODEL := UniFi AC-Pro DEVICE_MODEL := UniFi AC Pro
DEVICE_PACKAGES += kmod-usb2 DEVICE_PACKAGES += kmod-usb2
SUPPORTED_DEVICES += unifiac-pro SUPPORTED_DEVICES += unifiac-pro
endef endef

Write Preview
Loading…
Cancel
Save