ipq806x: split up DEVICE_TITLE

DEVICE_TITLE is split up into DEVICE_VENDOR, DEVICE_MODEL and DEVICE_VARIANT

Signed-off-by: Moritz Warning <moritzwarning@web.de>

1 files changed, 36 insertions, 15 deletions

diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile
index e1eb090de3..81f14b4756 100644
--- a/target/linux/ipq806x/image/Makefile
+++ b/target/linux/ipq806x/image/Makefile
@@ -82,7 +82,8 @@ endef
 define Device/buffalo_wxr-2533dhp
 	$(call Device/LegacyImage)
 	DEVICE_DTS := qcom-ipq8064-wxr-2533dhp
-	DEVICE_TITLE := Buffalo WXR-2533DHP
+	DEVICE_VENDOR := Buffalo
+	DEVICE_MODEL := WXR-2533DHP
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
 	IMAGE_SIZE := 65536k
@@ -97,16 +98,19 @@ TARGET_DEVICES += buffalo_wxr-2533dhp
 define Device/compex_wpq864
 	$(call Device/FitImage)
 	$(call Device/UbiFit)
+	DEVICE_VENDOR := Compex
+	DEVICE_MODEL := WPQ864
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
 	DEVICE_DTS := qcom-ipq8064-wpq864
-	DEVICE_TITLE := Compex WPQ864
 	DEVICE_PACKAGES := kmod-gpio-beeper
 endef
 TARGET_DEVICES += compex_wpq864
 
 define Device/linksys_ea8500
 	$(call Device/LegacyImage)
+	DEVICE_VENDOR := Linksys
+	DEVICE_MODEL := EA8500
 	DEVICE_DTS := qcom-ipq8064-ea8500
 	PAGESIZE := 2048
 	BLOCKSIZE := 128k
@@ -117,17 +121,17 @@ define Device/linksys_ea8500
 	UBINIZE_OPTS := -E 5
 	IMAGES := factory.bin sysupgrade.bin
 	IMAGE/factory.bin := append-kernel | pad-to $$$${KERNEL_SIZE} | append-ubi
-	DEVICE_TITLE := Linksys EA8500
 	DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct
 endef
 TARGET_DEVICES += linksys_ea8500
 
 define Device/nec_wg2600hp
 	$(call Device/LegacyImage)
+	DEVICE_VENDOR := NEC
+	DEVICE_MODEL := Aterm WG2600HP
 	DEVICE_DTS := qcom-ipq8064-wg2600hp
 	BLOCKSIZE := 64k
 	BOARD_NAME := wg2600hp
-	DEVICE_TITLE := NEC Aterm WG2600HP
 	IMAGES := sysupgrade.bin
 	IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata
 	DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct
@@ -136,6 +140,8 @@ TARGET_DEVICES += nec_wg2600hp
 
 define Device/netgear_d7800
 	$(call Device/DniImage)
+	DEVICE_VENDOR := NETGEAR
+	DEVICE_MODEL := Nighthawk X4 D7800
 	DEVICE_DTS := qcom-ipq8064-d7800
 	KERNEL_SIZE := 4096k
 	NETGEAR_BOARD_ID := D7800
@@ -144,13 +150,15 @@ define Device/netgear_d7800
 	PAGESIZE := 2048
 	BOARD_NAME := d7800
 	SUPPORTED_DEVICES += d7800
-	DEVICE_TITLE := Netgear Nighthawk X4 D7800
 	DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct
 endef
 TARGET_DEVICES += netgear_d7800
 
 define Device/netgear_r7500
 	$(call Device/DniImage)
+	DEVICE_VENDOR := NETGEAR
+	DEVICE_MODEL := Nighthawk X4 R7500
+	DEVICE_VARIANT := v1
 	DEVICE_DTS := qcom-ipq8064-r7500
 	KERNEL_SIZE := 4096k
 	NETGEAR_BOARD_ID := R7500
@@ -159,13 +167,15 @@ define Device/netgear_r7500
 	PAGESIZE := 2048
 	BOARD_NAME := r7500
 	SUPPORTED_DEVICES += r7500
-	DEVICE_TITLE := Netgear Nighthawk X4 R7500
 	DEVICE_PACKAGES := ath10k-firmware-qca988x-ct
 endef
 TARGET_DEVICES += netgear_r7500
 
 define Device/netgear_r7500v2
 	$(call Device/DniImage)
+	DEVICE_VENDOR := NETGEAR
+	DEVICE_MODEL := Nighthawk X4 R7500
+	DEVICE_VARIANT := v2
 	DEVICE_DTS := qcom-ipq8064-r7500v2
 	KERNEL_SIZE := 4096k
 	NETGEAR_BOARD_ID := R7500v2
@@ -174,13 +184,14 @@ define Device/netgear_r7500v2
 	PAGESIZE := 2048
 	BOARD_NAME := r7500v2
 	SUPPORTED_DEVICES += r7500v2
-	DEVICE_TITLE := Netgear Nighthawk X4 R7500v2
 	DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct ath10k-firmware-qca988x-ct
 endef
 TARGET_DEVICES += netgear_r7500v2
 
 define Device/netgear_r7800
 	$(call Device/DniImage)
+	DEVICE_VENDOR := NETGEAR
+	DEVICE_MODEL := Nighthawk X4S R7800
 	DEVICE_DTS := qcom-ipq8065-r7800
 	KERNEL_SIZE := 4096k
 	NETGEAR_BOARD_ID := R7800
@@ -189,7 +200,6 @@ define Device/netgear_r7800
 	PAGESIZE := 2048
 	BOARD_NAME := r7800
 	SUPPORTED_DEVICES += r7800
-	DEVICE_TITLE := Netgear Nighthawk X4S R7800
 	DEVICE_PACKAGES := ath10k-firmware-qca9984-ct
 endef
 TARGET_DEVICES += netgear_r7800
@@ -197,13 +207,15 @@ TARGET_DEVICES += netgear_r7800
 define Device/qcom_ipq8064-ap148
 	$(call Device/FitImage)
 	$(call Device/UbiFit)
+	DEVICE_VENDOR := Qualcomm
+	DEVICE_MODEL := AP148
+	DEVICE_VARIANT := standard
 	DEVICE_DTS := qcom-ipq8064-ap148
 	KERNEL_INSTALL := 1
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
 	BOARD_NAME := ap148
 	SUPPORTED_DEVICES += ap148
-	DEVICE_TITLE := Qualcomm AP148
 	DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct
 endef
 TARGET_DEVICES += qcom_ipq8064-ap148
@@ -211,12 +223,14 @@ TARGET_DEVICES += qcom_ipq8064-ap148
 define Device/qcom_ipq8064-ap148-legacy
 	$(call Device/LegacyImage)
 	$(call Device/UbiFit)
+	DEVICE_VENDOR := Qualcomm
+	DEVICE_MODEL := AP148
+	DEVICE_VARIANT := legacy
 	DEVICE_DTS := qcom-ipq8064-ap148
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
 	BOARD_NAME := ap148
 	SUPPORTED_DEVICES := qcom,ipq8064-ap148 ap148
-	DEVICE_TITLE := Qualcomm AP148 (legacy)
 	DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct
 endef
 TARGET_DEVICES += qcom_ipq8064-ap148-legacy
@@ -224,40 +238,47 @@ TARGET_DEVICES += qcom_ipq8064-ap148-legacy
 define Device/qcom_ipq8064-ap161
 	$(call Device/FitImage)
 	$(call Device/UbiFit)
+	DEVICE_VENDOR := Qualcomm
+	DEVICE_MODEL := AP161
 	DEVICE_DTS := qcom-ipq8064-ap161
 	KERNEL_INSTALL := 1
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
 	BOARD_NAME := ap161
-	DEVICE_TITLE := Qualcomm AP161
 	DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct
 endef
 TARGET_DEVICES += qcom_ipq8064-ap161
 
 define Device/qcom_ipq8064-db149
 	$(call Device/FitImage)
+	DEVICE_VENDOR := Qualcomm
+	DEVICE_MODEL := DB149
 	DEVICE_DTS := qcom-ipq8064-db149
 	KERNEL_INSTALL := 1
 	BOARD_NAME := db149
-	DEVICE_TITLE := Qualcomm DB149
 	DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct
 endef
 TARGET_DEVICES += qcom_ipq8064-db149
 
 define Device/tplink_c2600
 	$(call Device/TpSafeImage)
+	DEVICE_VENDOR := TP-Link
+	DEVICE_MODEL := Archer C2600
+	DEVICE_VARIANT := v1
 	DEVICE_DTS := qcom-ipq8064-c2600
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
 	BOARD_NAME := c2600
 	SUPPORTED_DEVICES += c2600
 	TPLINK_BOARD_ID := C2600
-	DEVICE_TITLE := TP-Link Archer C2600
 	DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct
 endef
 TARGET_DEVICES += tplink_c2600
 
 define Device/tplink_vr2600v
+	DEVICE_VENDOR := TP-Link
+	DEVICE_MODEL := Archer VR2600v
+	DEVICE_VARIANT := v1
 	KERNEL_SUFFIX := -uImage
 	KERNEL = kernel-bin | append-dtb | uImage none
 	KERNEL_NAME := zImage
@@ -267,7 +288,6 @@ define Device/tplink_vr2600v
 	PAGESIZE := 2048
 	BOARD_NAME := vr2600v
 	SUPPORTED_DEVICES += vr2600v
-	DEVICE_TITLE := TP-Link Archer VR2600v
 	DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct
 	IMAGES := sysupgrade.bin
 	IMAGE/sysupgrade.bin := pad-extra 512 | append-kernel | pad-to $$$${KERNEL_SIZE} | append-rootfs | pad-rootfs | append-metadata
@@ -275,6 +295,8 @@ endef
 TARGET_DEVICES += tplink_vr2600v
 
 define Device/zyxel_nbg6817
+	DEVICE_VENDOR := ZyXEL
+	DEVICE_MODEL := NBG6817
 	DEVICE_DTS := qcom-ipq8065-nbg6817
 	KERNEL_SIZE := 4096k
 	BLOCKSIZE := 64k
@@ -283,7 +305,6 @@ define Device/zyxel_nbg6817
 	RAS_ROOTFS_SIZE := 20934k
 	RAS_VERSION := "V1.99(OWRT.9999)C0"
 	SUPPORTED_DEVICES += nbg6817
-	DEVICE_TITLE := ZyXEL NBG6817
 	DEVICE_PACKAGES := ath10k-firmware-qca9984-ct e2fsprogs kmod-fs-ext4 losetup
 	$(call Device/ZyXELImage)
 endef