From ee3efefc5e059773e9fea56f1f65bf39f5d75cbc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Thu, 18 Jul 2024 10:37:38 +0200 Subject: [PATCH] treewide: fixup models names for UniFi U6 series MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Ubiquiti has a set of UniFi 802.11ax (Wi-Fi 6) AP devices. All models include "U6" in their names and also have code names with no special characters (including spaces). Examples: 1. U6 Lite (codename U6-Lite) 2. U6 Long-Range (codename U6-LR) 3. U6+ (codename U6-PLUS) 4. U6 Pro (codename U6-Pro) 5. U6 Mesh (codename U6-Mesh) 6. U6 Mesh Pro (codename U6-Mesh-Pro) 7. U6 Enterprise (codename U6-Enterprise) Use proper full names for those devices. Names in OpenWrt/DTS code may need updating too but it can be handled later. Cc: Elbert Mai Cc: Daniel Golle Cc: Henrik Riomar Cc: David Bauer Signed-off-by: Rafał Miłecki (cherry picked from commit 74879140a1aa0b8a8c237e0b67e94c3508e2e249) --- target/linux/mediatek/image/filogic.mk | 2 +- target/linux/mediatek/image/mt7622.mk | 12 ++++++------ target/linux/ramips/image/mt7621.mk | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk index 42185842b8..88b279140c 100644 --- a/target/linux/mediatek/image/filogic.mk +++ b/target/linux/mediatek/image/filogic.mk @@ -852,7 +852,7 @@ TARGET_DEVICES += tplink_tl-xdr6088 define Device/ubnt_unifi-6-plus DEVICE_VENDOR := Ubiquiti - DEVICE_MODEL := UniFi 6 Plus + DEVICE_MODEL := UniFi U6+ DEVICE_DTS := mt7981a-ubnt-unifi-6-plus DEVICE_DTS_DIR := ../dts DEVICE_PACKAGES := kmod-mt7981-firmware mt7981-wo-firmware e2fsprogs f2fsck mkf2fs fdisk partx-utils diff --git a/target/linux/mediatek/image/mt7622.mk b/target/linux/mediatek/image/mt7622.mk index ce95be1c0c..3b31a880b4 100644 --- a/target/linux/mediatek/image/mt7622.mk +++ b/target/linux/mediatek/image/mt7622.mk @@ -357,7 +357,7 @@ TARGET_DEVICES += totolink_a8000ru define Device/ubnt_unifi-6-lr-v1 DEVICE_VENDOR := Ubiquiti - DEVICE_MODEL := UniFi 6 LR + DEVICE_MODEL := UniFi U6 Long-Range DEVICE_VARIANT := v1 DEVICE_DTS_CONFIG := config@1 DEVICE_DTS := mt7622-ubnt-unifi-6-lr-v1 @@ -369,7 +369,7 @@ TARGET_DEVICES += ubnt_unifi-6-lr-v1 define Device/ubnt_unifi-6-lr-v1-ubootmod DEVICE_VENDOR := Ubiquiti - DEVICE_MODEL := UniFi 6 LR + DEVICE_MODEL := UniFi U6 Long-Range DEVICE_VARIANT := v1 U-Boot mod DEVICE_DTS := mt7622-ubnt-unifi-6-lr-v1-ubootmod DEVICE_DTS_DIR := ../dts @@ -388,7 +388,7 @@ TARGET_DEVICES += ubnt_unifi-6-lr-v1-ubootmod define Device/ubnt_unifi-6-lr-v2 DEVICE_VENDOR := Ubiquiti - DEVICE_MODEL := UniFi 6 LR + DEVICE_MODEL := UniFi U6 Long-Range DEVICE_VARIANT := v2 DEVICE_DTS_CONFIG := config@1 DEVICE_DTS := mt7622-ubnt-unifi-6-lr-v2 @@ -399,7 +399,7 @@ TARGET_DEVICES += ubnt_unifi-6-lr-v2 define Device/ubnt_unifi-6-lr-v2-ubootmod DEVICE_VENDOR := Ubiquiti - DEVICE_MODEL := UniFi 6 LR + DEVICE_MODEL := UniFi U6 Long-Range DEVICE_VARIANT := v2 U-Boot mod DEVICE_DTS := mt7622-ubnt-unifi-6-lr-v2-ubootmod DEVICE_DTS_DIR := ../dts @@ -417,7 +417,7 @@ TARGET_DEVICES += ubnt_unifi-6-lr-v2-ubootmod define Device/ubnt_unifi-6-lr-v3 DEVICE_VENDOR := Ubiquiti - DEVICE_MODEL := UniFi 6 LR + DEVICE_MODEL := UniFi U6 Long-Range DEVICE_VARIANT := v3 DEVICE_DTS_CONFIG := config@1 DEVICE_DTS := mt7622-ubnt-unifi-6-lr-v3 @@ -428,7 +428,7 @@ TARGET_DEVICES += ubnt_unifi-6-lr-v3 define Device/ubnt_unifi-6-lr-v3-ubootmod DEVICE_VENDOR := Ubiquiti - DEVICE_MODEL := UniFi 6 LR + DEVICE_MODEL := UniFi U6 Long-Range DEVICE_VARIANT := v3 U-Boot mod DEVICE_DTS := mt7622-ubnt-unifi-6-lr-v3-ubootmod DEVICE_DTS_DIR := ../dts diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index c1fbc40b7e..504c56e2b8 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -2454,7 +2454,7 @@ TARGET_DEVICES += ubnt_edgerouter-x-sfp define Device/ubnt_unifi-6-lite $(Device/dsa-migration) DEVICE_VENDOR := Ubiquiti - DEVICE_MODEL := UniFi 6 Lite + DEVICE_MODEL := UniFi U6 Lite DEVICE_DTS_CONFIG := config@1 DEVICE_DTS_LOADADDR := 0x87000000 DEVICE_PACKAGES += kmod-mt7603 kmod-mt7915-firmware -uboot-envtools -- 2.30.2