From d815e1f67c9f5cf8f36212ea475c9c9020f60a6d Mon Sep 17 00:00:00 2001 From: Henrik Riomar Date: Tue, 31 May 2022 19:49:49 +0200 Subject: [PATCH] mediatek: new target ubnt_unifi-6-lr-v1-ubootmod based on current ubnt_unifi-6-lr-ubootmod Signed-off-by: Daniel Golle [added SUPPORTED_DEVICES for compatibility with existing setups] Signed-off-by: Henrik Riomar (cherry picked from commit 5c8d3893a78fd81454930de30d90efaef99f8734) --- ...ootmod.dts => mt7622-ubnt-unifi-6-lr-v1-ubootmod.dts} | 2 +- target/linux/mediatek/image/mt7622.mk | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) rename target/linux/mediatek/dts/{mt7622-ubnt-unifi-6-lr-ubootmod.dts => mt7622-ubnt-unifi-6-lr-v1-ubootmod.dts} (96%) diff --git a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-ubootmod.dts b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1-ubootmod.dts similarity index 96% rename from target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-ubootmod.dts rename to target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1-ubootmod.dts index 8a9d0a1887c..a22bc701807 100644 --- a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-ubootmod.dts +++ b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1-ubootmod.dts @@ -3,7 +3,7 @@ #include "mt7622-ubnt-unifi-6-lr-v1.dtsi" / { - model = "Ubiquiti UniFi 6 LR (U-Boot mod)"; + model = "Ubiquiti UniFi 6 LR v1 (U-Boot mod)"; compatible = "ubnt,unifi-6-lr-ubootmod", "mediatek,mt7622"; }; diff --git a/target/linux/mediatek/image/mt7622.mk b/target/linux/mediatek/image/mt7622.mk index ea5ebdd4103..d6ffa4d3add 100644 --- a/target/linux/mediatek/image/mt7622.mk +++ b/target/linux/mediatek/image/mt7622.mk @@ -234,11 +234,11 @@ define Device/ubnt_unifi-6-lr-v1 endef TARGET_DEVICES += ubnt_unifi-6-lr-v1 -define Device/ubnt_unifi-6-lr-ubootmod +define Device/ubnt_unifi-6-lr-v1-ubootmod DEVICE_VENDOR := Ubiquiti DEVICE_MODEL := UniFi 6 LR - DEVICE_VARIANT := U-Boot mod - DEVICE_DTS := mt7622-ubnt-unifi-6-lr-ubootmod + DEVICE_VARIANT := v1 U-Boot mod + DEVICE_DTS := mt7622-ubnt-unifi-6-lr-v1-ubootmod DEVICE_DTS_DIR := ../dts DEVICE_PACKAGES := kmod-mt7915e kmod-leds-ubnt-ledbar KERNEL := kernel-bin | lzma @@ -249,8 +249,9 @@ define Device/ubnt_unifi-6-lr-ubootmod ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := bl2 nor-2ddr ARTIFACT/bl31-uboot.fip := bl31-uboot ubnt_unifi-6-lr + SUPPORTED_DEVICES += ubnt,unifi-6-lr-ubootmod endef -TARGET_DEVICES += ubnt_unifi-6-lr-ubootmod +TARGET_DEVICES += ubnt_unifi-6-lr-v1-ubootmod define Device/xiaomi_redmi-router-ax6s DEVICE_VENDOR := Xiaomi