From 8c3dbaf8b49233e275b2dce4e30dc0a2bf8c86c5 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Sun, 16 Jun 2019 21:34:46 +0200 Subject: ath79: split DEVICE_TITLE in multiple variables This allows the definition of DEVICE_VENDOR, DEVICE_MODEL and DEVICE_VARIANT. All three are merged together to look the same as the current DEVICE_TITLE. Also, if DEVICE_TITLE is set it's directly used as a *fallback* for devices which weren't upgraded yet. This is based on the work of @sudhanshu16. The motivation is to create JSON files based on provided metadata, needing clear differentiation between vendor, model and revision. Signed-off-by: Paul Spooren --- target/linux/ath79/image/common-tp-link.mk | 1 + target/linux/ath79/image/generic-tp-link.mk | 96 +++++++++----- target/linux/ath79/image/generic-ubnt.mk | 42 +++--- target/linux/ath79/image/generic.mk | 198 +++++++++++++++++++--------- target/linux/ath79/image/nand.mk | 3 +- target/linux/ath79/image/tiny-netgear.mk | 7 +- target/linux/ath79/image/tiny-tp-link.mk | 61 ++++++--- target/linux/ath79/image/tiny.mk | 6 +- 8 files changed, 274 insertions(+), 140 deletions(-) (limited to 'target/linux/ath79/image') diff --git a/target/linux/ath79/image/common-tp-link.mk b/target/linux/ath79/image/common-tp-link.mk index 6efff6322e..da4616482a 100644 --- a/target/linux/ath79/image/common-tp-link.mk +++ b/target/linux/ath79/image/common-tp-link.mk @@ -48,6 +48,7 @@ define Build/uImageArcher endef define Device/tplink + DEVICE_VENDOR := TP-Link TPLINK_HWREV := 0x1 TPLINK_HEADER_VERSION := 1 LOADER_TYPE := gz diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk index 0ae82293bd..ec250a5404 100644 --- a/target/linux/ath79/image/generic-tp-link.mk +++ b/target/linux/ath79/image/generic-tp-link.mk @@ -4,7 +4,8 @@ define Device/tplink_archer-a7-v5 $(Device/tplink-safeloader-uimage) ATH_SOC := qca9563 IMAGE_SIZE := 15104k - DEVICE_TITLE := TP-Link Archer A7 v5 + DEVICE_MODEL := Archer A7 + DEVICE_VARIANT := v5 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct TPLINK_BOARD_ID := ARCHER-A7-V5 BOARDNAME := ARCHER-A7-V5 @@ -16,7 +17,8 @@ define Device/tplink_archer-c2-v3 $(Device/tplink-safeloader-uimage) ATH_SOC := qca9563 IMAGE_SIZE := 7808k - DEVICE_TITLE := TP-Link Archer C2 v3 + DEVICE_MODEL := Archer C2 + DEVICE_VARIANT := v3 DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct TPLINK_BOARD_ID := ARCHER-C2-V3 endef @@ -26,7 +28,8 @@ define Device/tplink_archer-c25-v1 $(Device/tplink-safeloader-uimage) ATH_SOC := qca9561 IMAGE_SIZE := 7808k - DEVICE_TITLE := TP-Link Archer C25 v1 + DEVICE_MODEL := Archer C25 + DEVICE_VARIANT := v1 TPLINK_BOARD_ID := ARCHER-C25-V1 DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct SUPPORTED_DEVICES += archer-c25-v1 @@ -37,7 +40,8 @@ define Device/tplink_archer-c58-v1 $(Device/tplink-safeloader-uimage) ATH_SOC := qca9561 IMAGE_SIZE := 7936k - DEVICE_TITLE := TP-Link Archer C58 v1 + DEVICE_MODEL := Archer C58 + DEVICE_VARIANT := v1 TPLINK_BOARD_ID := ARCHER-C58-V1 DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct SUPPORTED_DEVICES += archer-c58-v1 @@ -48,7 +52,8 @@ define Device/tplink_archer-c59-v1 $(Device/tplink-safeloader-uimage) ATH_SOC := qca9561 IMAGE_SIZE := 14528k - DEVICE_TITLE := TP-Link Archer C59 v1 + DEVICE_MODEL := Archer C59 + DEVICE_VARIANT := v1 TPLINK_BOARD_ID := ARCHER-C59-V1 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca9888-ct SUPPORTED_DEVICES += archer-c59-v1 @@ -59,7 +64,8 @@ define Device/tplink_archer-c6-v2 $(Device/tplink-safeloader-uimage) ATH_SOC := qca9563 IMAGE_SIZE := 7808k - DEVICE_TITLE := TP-Link Archer C6 v2 + DEVICE_MODEL := Archer C6 + DEVICE_VARIANT := v2 TPLINK_BOARD_ID := ARCHER-C6-V2 DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct endef @@ -68,7 +74,8 @@ TARGET_DEVICES += tplink_archer-c6-v2 define Device/tplink_archer-c5-v1 $(Device/tplink-16mlzma) ATH_SOC := qca9558 - DEVICE_TITLE := TP-Link Archer C5 v1 + DEVICE_MODEL := Archer C5 + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct TPLINK_HWID := 0xc5000001 SUPPORTED_DEVICES += archer-c5 @@ -78,7 +85,8 @@ TARGET_DEVICES += tplink_archer-c5-v1 define Device/tplink_archer-c7-v1 $(Device/tplink-8mlzma) ATH_SOC := qca9558 - DEVICE_TITLE := TP-Link Archer C7 v1 + DEVICE_MODEL := Archer C7 + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct TPLINK_HWID := 0x75000001 SUPPORTED_DEVICES += archer-c7 @@ -88,7 +96,8 @@ TARGET_DEVICES += tplink_archer-c7-v1 define Device/tplink_archer-c7-v2 $(Device/tplink-16mlzma) ATH_SOC := qca9558 - DEVICE_TITLE := TP-Link Archer C7 v2 + DEVICE_MODEL := Archer C7 + DEVICE_VARIANT := v2 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct TPLINK_HWID := 0xc7000002 SUPPORTED_DEVICES += archer-c7 @@ -102,7 +111,8 @@ define Device/tplink_archer-c7-v4 $(Device/tplink-safeloader-uimage) ATH_SOC := qca9563 IMAGE_SIZE := 15104k - DEVICE_TITLE := TP-Link Archer C7 v4 + DEVICE_MODEL := Archer C7 + DEVICE_VARIANT := v4 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct TPLINK_BOARD_ID := ARCHER-C7-V4 BOARDNAME := ARCHER-C7-V4 @@ -114,7 +124,8 @@ define Device/tplink_archer-c7-v5 $(Device/tplink-safeloader-uimage) ATH_SOC := qca9563 IMAGE_SIZE := 15360k - DEVICE_TITLE := TP-Link Archer C7 v5 + DEVICE_MODEL := Archer C7 + DEVICE_VARIANT := v5 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct TPLINK_BOARD_ID := ARCHER-C7-V5 BOARDNAME := ARCHER-C7-V5 @@ -126,7 +137,8 @@ define Device/tplink_cpe210-v2 $(Device/tplink-safeloader) ATH_SOC := qca9533 IMAGE_SIZE := 7680k - DEVICE_TITLE := TP-Link CPE210 v2 + DEVICE_MODEL := CPE210 + DEVICE_VARIANT := v2 TPLINK_BOARD_ID := CPE210V2 DEVICE_PACKAGES := rssileds LOADER_TYPE := elf @@ -138,7 +150,8 @@ define Device/tplink_cpe210-v3 $(Device/tplink-safeloader) ATH_SOC := qca9533 IMAGE_SIZE := 7680k - DEVICE_TITLE := TP-Link CPE210 v3 + DEVICE_MODEL := CPE210 + DEVICE_VARIANT := v3 DEVICE_PACKAGES := rssileds TPLINK_BOARD_ID := CPE210V3 LOADER_TYPE := elf @@ -150,7 +163,8 @@ define Device/tplink_cpe610-v1 $(Device/tplink-safeloader) ATH_SOC := ar9344 IMAGE_SIZE := 7680k - DEVICE_TITLE := TP-Link CPE610 v1 + DEVICE_MODEL := CPE610 + DEVICE_VARIANT := v1 TPLINK_BOARD_ID := CPE610V1 LOADER_TYPE := elf KERNEL := kernel-bin | append-dtb | lzma | loader-kernel @@ -159,7 +173,8 @@ TARGET_DEVICES += tplink_cpe610-v1 define Device/tplink_archer-d50-v1 ATH_SOC := qca9531 - DEVICE_TITLE := TP-Link Archer D50 v1 + DEVICE_MODEL := Archer D50 + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct BOARDNAME := ARCHER-D50-V1 IMAGE_SIZE := 7808k @@ -182,7 +197,8 @@ define Device/tplink_re350k-v1 $(Device/tplink-safeloader) ATH_SOC := qca9558 IMAGE_SIZE := 13760k - DEVICE_TITLE := TP-Link RE350K v1 + DEVICE_MODEL := RE350K + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct TPLINK_BOARD_ID := RE350K-V1 TPLINK_HWID := 0x0 @@ -194,7 +210,8 @@ define Device/tplink_re450-v2 $(Device/tplink-safeloader) ATH_SOC := qca9563 IMAGE_SIZE := 6016k - DEVICE_TITLE := TP-Link RE450 v2 + DEVICE_MODEL := RE450 + DEVICE_VARIANT := v2 DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct TPLINK_HWID := 0x0 TPLINK_HWREV := 0 @@ -206,7 +223,8 @@ TARGET_DEVICES += tplink_re450-v2 define Device/tplink_tl-wdr3600-v1 $(Device/tplink-8mlzma) ATH_SOC := ar9344 - DEVICE_TITLE := TP-Link TL-WDR3600 v1 + DEVICE_MODEL := TL-WDR3600 + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport TPLINK_HWID := 0x36000001 SUPPORTED_DEVICES += tl-wdr4300 @@ -216,7 +234,8 @@ TARGET_DEVICES += tplink_tl-wdr3600-v1 define Device/tplink_tl-wdr4300-v1 $(Device/tplink-8mlzma) ATH_SOC := ar9344 - DEVICE_TITLE := TP-Link TL-WDR4300 v1 + DEVICE_MODEL := TL-WDR4300 + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport TPLINK_HWID := 0x43000001 SUPPORTED_DEVICES += tl-wdr4300 @@ -226,7 +245,8 @@ TARGET_DEVICES += tplink_tl-wdr4300-v1 define Device/tplink_tl-wdr4900-v2 $(Device/tplink-8mlzma) ATH_SOC := qca9558 - DEVICE_TITLE := TP-Link TL-WDR4900 v2 + DEVICE_MODEL := TL-WDR4900 + DEVICE_VARIANT := v2 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport TPLINK_HWID := 0x49000002 endef @@ -235,7 +255,8 @@ TARGET_DEVICES += tplink_tl-wdr4900-v2 define Device/tplink_tl-wr810n-v1 $(Device/tplink-8mlzma) ATH_SOC := qca9531 - DEVICE_TITLE := TP-Link TL-WR810N v1 + DEVICE_MODEL := TL-WR810N + DEVICE_VARIANT := v1 TPLINK_HWID := 0x8100001 DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport endef @@ -244,7 +265,8 @@ TARGET_DEVICES += tplink_tl-wr810n-v1 define Device/tplink_tl-wr810n-v2 $(Device/tplink-8mlzma) ATH_SOC := qca9533 - DEVICE_TITLE := TP-Link TL-WR810N v2 + DEVICE_MODEL := TL-WR810N + DEVICE_VARIANT := v2 TPLINK_HWID := 0x8100002 endef TARGET_DEVICES += tplink_tl-wr810n-v2 @@ -252,7 +274,8 @@ TARGET_DEVICES += tplink_tl-wr810n-v2 define Device/tplink_tl-wr710n-v1 $(Device/tplink-8mlzma) ATH_SOC := ar9331 - DEVICE_TITLE := TP-Link TL-WR710N v1 + DEVICE_MODEL := TL-WR710N + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-usb-core kmod-usb-chipidea2 kmod-usb-ledtrig-usbport TPLINK_HWID := 0x07100001 SUPPORTED_DEVICES += tl-wr710n @@ -262,7 +285,8 @@ TARGET_DEVICES += tplink_tl-wr710n-v1 define Device/tplink_tl-wr842n-v1 $(Device/tplink-8m) ATH_SOC := ar7241 - DEVICE_TITLE := TP-Link TL-WR842N/ND v1 + DEVICE_MODEL := TL-WR842N/ND + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport TPLINK_HWID := 0x8420001 endef @@ -271,7 +295,8 @@ TARGET_DEVICES += tplink_tl-wr842n-v1 define Device/tplink_tl-wr842n-v2 $(Device/tplink-8mlzma) ATH_SOC := ar9341 - DEVICE_TITLE := TP-Link TL-WR842N/ND v2 + DEVICE_MODEL := TL-WR842N/ND + DEVICE_VARIANT := v2 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport TPLINK_HWID := 0x8420002 SUPPORTED_DEVICES += tl-wr842n-v2 @@ -281,7 +306,8 @@ TARGET_DEVICES += tplink_tl-wr842n-v2 define Device/tplink_tl-wr842n-v3 $(Device/tplink-16mlzma) ATH_SOC := qca9533 - DEVICE_TITLE := TP-Link TL-WR842N v3 + DEVICE_MODEL := TL-WR842N + DEVICE_VARIANT := v3 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport TPLINK_HWID := 0x8420003 SUPPORTED_DEVICES += tl-wr842n-v3 @@ -291,7 +317,8 @@ TARGET_DEVICES += tplink_tl-wr842n-v3 define Device/tplink_tl-wr1043nd-v1 $(Device/tplink-8m) ATH_SOC := ar9132 - DEVICE_TITLE := TP-Link TL-WR1043N/ND v1 + DEVICE_MODEL := TL-WR1043N/ND + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport TPLINK_HWID := 0x10430001 SUPPORTED_DEVICES += tl-wr1043nd @@ -301,7 +328,8 @@ TARGET_DEVICES += tplink_tl-wr1043nd-v1 define Device/tplink_tl-wr1043nd-v2 $(Device/tplink-8mlzma) ATH_SOC := qca9558 - DEVICE_TITLE := TP-Link TL-WR1043N/ND v2 + DEVICE_MODEL := TL-WR1043N/ND + DEVICE_VARIANT := v2 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport TPLINK_HWID := 0x10430002 SUPPORTED_DEVICES += tl-wr1043nd-v2 @@ -311,7 +339,8 @@ TARGET_DEVICES += tplink_tl-wr1043nd-v2 define Device/tplink_tl-wr1043nd-v3 $(Device/tplink-8mlzma) ATH_SOC := qca9558 - DEVICE_TITLE := TP-Link TL-WR1043N/ND v3 + DEVICE_MODEL := TL-WR1043N/ND + DEVICE_VARIANT := v3 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport TPLINK_HWID := 0x10430003 SUPPORTED_DEVICES += tl-wr1043nd-v3 @@ -322,7 +351,8 @@ define Device/tplink_tl-wr1043nd-v4 $(Device/tplink-safeloader) ATH_SOC := qca9563 IMAGE_SIZE := 15552k - DEVICE_TITLE := TP-Link TL-WR1043N/ND v4 + DEVICE_MODEL := TL-WR1043N/ND + DEVICE_VARIANT := v4 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport TPLINK_HWID := 0x10430004 TPLINK_BOARD_ID := TLWR1043NDV4 @@ -334,7 +364,8 @@ define Device/tplink_tl-wr1043n-v5 $(Device/tplink-safeloader-uimage) ATH_SOC := qca9563 IMAGE_SIZE := 15104k - DEVICE_TITLE := TP-Link TL-WR1043N v5 + DEVICE_MODEL := TL-WR1043N + DEVICE_VARIANT := v5 TPLINK_BOARD_ID := TLWR1043NV5 SUPPORTED_DEVICES += tl-wr1043n-v5 endef @@ -343,7 +374,8 @@ TARGET_DEVICES += tplink_tl-wr1043n-v5 define Device/tplink_tl-wr2543-v1 $(Device/tplink-8mlzma) ATH_SOC := ar7242 - DEVICE_TITLE := TP-Link TL-WR2543N/ND v1 + DEVICE_MODEL := TL-WR2543N/ND + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport TPLINK_HWID := 0x25430001 IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade -v 3.13.99 | \ diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index b189d66770..abe45a14db 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -34,6 +34,7 @@ endef # UBNT_CHIP e.g. one of (ar7240, ar933x, ar934x) # UBNT_VERSION e.g. one of (6.0.0, 8.5.0) define Device/ubnt + DEVICE_VENDOR := Ubiquiti DEVICE_PACKAGES := kmod-usb-core kmod-usb2 IMAGE_SIZE := 7552k UBNT_BOARD := XM @@ -80,49 +81,52 @@ endef define Device/ubnt_airrouter $(Device/ubnt-xm) - DEVICE_TITLE := Ubiquiti AirRouter + DEVICE_MODEL := AirRouter SUPPORTED_DEVICES += airrouter endef TARGET_DEVICES += ubnt_airrouter define Device/ubnt_bullet-m $(Device/ubnt-xm) - DEVICE_TITLE := Ubiquiti Bullet-M + DEVICE_MODEL := Bullet-M SUPPORTED_DEVICES += bullet-m endef TARGET_DEVICES += ubnt_bullet-m define Device/ubnt_bullet-m-xw $(Device/ubnt-xw) - DEVICE_TITLE := Ubiquiti Bullet-M (XW) + DEVICE_MODEL := Bullet-M + DEVICE_VARIANT := XW SUPPORTED_DEVICES += bullet-m-xw endef TARGET_DEVICES += ubnt_bullet-m-xw define Device/ubnt_rocket-m $(Device/ubnt-xm) - DEVICE_TITLE := Ubiquiti Rocket-M + DEVICE_MODEL := Rocket-M SUPPORTED_DEVICES += rocket-m endef TARGET_DEVICES += ubnt_rocket-m define Device/ubnt_nanostation-m $(Device/ubnt-xm) - DEVICE_TITLE := Ubiquiti Nanostation M + DEVICE_MODEL := Nanostation M SUPPORTED_DEVICES += nano-m endef TARGET_DEVICES += ubnt_nanostation-m define Device/ubnt_nanostation-m-xw $(Device/ubnt-xw) - DEVICE_TITLE := Ubiquiti Nanostation M (XW) + DEVICE_MODEL := Nanostation M + DEVICE_VARIANT := XW SUPPORTED_DEVICES += nano-m-xw endef TARGET_DEVICES += ubnt_nanostation-m-xw define Device/ubnt_lap-120 $(Device/ubnt-wa) - DEVICE_TITLE := Ubiquiti LiteAP ac (LAP-120) + DEVICE_MODEL := LiteAP ac + DEVICE_VARIANT := LAP-120 DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct IMAGE_SIZE := 15744k IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage-split @@ -131,7 +135,7 @@ TARGET_DEVICES += ubnt_lap-120 define Device/ubnt_nanobeam-ac $(Device/ubnt-wa) - DEVICE_TITLE := Ubiquiti NanoBeam AC + DEVICE_MODEL := NanoBeam AC DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct IMAGE_SIZE := 15744k IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage-split @@ -140,7 +144,7 @@ TARGET_DEVICES += ubnt_nanobeam-ac define Device/ubnt_nanostation-ac $(Device/ubnt-wa) - DEVICE_TITLE := Ubiquiti Nanostation AC + DEVICE_MODEL := Nanostation AC DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct IMAGE_SIZE := 15744k IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage-split @@ -149,7 +153,7 @@ TARGET_DEVICES += ubnt_nanostation-ac define Device/ubnt_nanostation-ac-loco $(Device/ubnt-wa) - DEVICE_TITLE := Ubiquiti Nanostation AC loco + DEVICE_MODEL := Nanostation AC loco DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca988x-ct IMAGE_SIZE := 15744k IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | mkubntimage-split @@ -158,42 +162,42 @@ TARGET_DEVICES += ubnt_nanostation-ac-loco define Device/ubnt_unifi $(Device/ubnt-bz) - DEVICE_TITLE := Ubiquiti UniFi + DEVICE_MODEL := UniFi SUPPORTED_DEVICES += unifi endef TARGET_DEVICES += ubnt_unifi define Device/ubnt_unifiac + DEVICE_VENDOR := Ubiquiti ATH_SOC := qca9563 IMAGE_SIZE := 7744k DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct endef - define Device/ubnt_unifiac-lite $(Device/ubnt_unifiac) - DEVICE_TITLE := Ubiquiti UniFi AC-Lite + DEVICE_MODEL := UniFi AC-Lite SUPPORTED_DEVICES += ubnt-unifiac-lite endef TARGET_DEVICES += ubnt_unifiac-lite define Device/ubnt_unifiac-mesh $(Device/ubnt_unifiac) - DEVICE_TITLE := Ubiquiti UniFi AC-Mesh + DEVICE_MODEL := UniFi AC-Mesh SUPPORTED_DEVICES += ubnt-unifiac-mesh endef TARGET_DEVICES += ubnt_unifiac-mesh define Device/ubnt_unifiac-mesh-pro $(Device/ubnt_unifiac) - DEVICE_TITLE := Ubiquiti UniFi AC-Mesh Pro + DEVICE_MODEL := UniFi AC-Mesh Pro SUPPORTED_DEVICES += ubnt-unifiac-mesh-pro endef TARGET_DEVICES += ubnt_unifiac-mesh-pro define Device/ubnt_unifiac-pro $(Device/ubnt_unifiac) - DEVICE_TITLE := Ubiquiti UniFi AC-Pro + DEVICE_MODEL := UniFi AC-Pro DEVICE_PACKAGES += kmod-usb-core kmod-usb2 SUPPORTED_DEVICES += ubnt-unifiac-pro endef @@ -213,7 +217,7 @@ endef define Device/ubnt_routerstation $(Device/ubnt_routerstation_common) - DEVICE_TITLE := Ubiquiti RouterStation + DEVICE_MODEL := RouterStation UBNT_BOARD := RS UBNT_TYPE := RSx UBNT_CHIP := ar7100 @@ -223,7 +227,7 @@ TARGET_DEVICES += ubnt_routerstation define Device/ubnt_routerstation-pro $(Device/ubnt_routerstation_common) - DEVICE_TITLE := Ubiquiti RouterStation Pro + DEVICE_MODEL := RouterStation Pro UBNT_BOARD := RSPRO UBNT_TYPE := RSPRO UBNT_CHIP := ar7100pro @@ -234,7 +238,7 @@ define Device/ubnt_acb-isp $(Device/ubnt) ATH_SOC := qca9533 IMAGE_SIZE := 15744k - DEVICE_TITLE := Ubiquiti airCube ISP + DEVICE_MODEL := airCube ISP UBNT_BOARD := ACB-ISP UBNT_TYPE := ACB UBNT_CHIP := qca9533 diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index d5f67b88a6..899562ce69 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -77,7 +77,8 @@ endef define Device/8dev_carambola2 ATH_SOC := ar9331 - DEVICE_TITLE := 8devices Carambola2 + DEVICE_VENDOR := 8devices + DEVICE_MODEL := Carambola2 DEVICE_PACKAGES := kmod-usb2 kmod-usb-chipidea2 IMAGE_SIZE := 16000k SUPPORTED_DEVICES += carambola2 @@ -86,7 +87,8 @@ TARGET_DEVICES += 8dev_carambola2 define Device/aruba_ap-105 ATH_SOC := ar7161 - DEVICE_TITLE := Aruba AP-105 + DEVICE_VENDOR := Aruba + DEVICE_MODEL := AP-105 IMAGE_SIZE := 16000k DEVICE_PACKAGES := kmod-i2c-core kmod-i2c-gpio kmod-tpm-i2c-atmel endef @@ -94,7 +96,8 @@ TARGET_DEVICES += aruba_ap-105 define Device/avm_fritz300e ATH_SOC := ar7242 - DEVICE_TITLE := AVM FRITZ!WLAN Repeater 300E + DEVICE_VENDOR := AVM + DEVICE_MODEL := FRITZ!WLAN Repeater 300E KERNEL := kernel-bin | append-dtb | lzma | eva-image KERNEL_INITRAMFS := $$(KERNEL) IMAGE_SIZE := 15232k @@ -107,7 +110,8 @@ TARGET_DEVICES += avm_fritz300e define Device/avm_fritz4020 ATH_SOC := qca9561 - DEVICE_TITLE := AVM FRITZ!Box 4020 + DEVICE_VENDOR := AVM + DEVICE_MODEL := FRITZ!Box 4020 IMAGE_SIZE := 15232k KERNEL := kernel-bin | append-dtb | lzma | eva-image KERNEL_INITRAMFS := $$(KERNEL) @@ -121,7 +125,8 @@ TARGET_DEVICES += avm_fritz4020 define Device/buffalo_bhr-4grv ATH_SOC := ar7242 - DEVICE_TITLE := Buffalo BHR-4GRV + DEVICE_VENDOR := Buffalo + DEVICE_MODEL := BHR-4GRV DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport IMAGE_SIZE := 32256k IMAGES += factory.bin tftp.bin @@ -134,14 +139,16 @@ TARGET_DEVICES += buffalo_bhr-4grv define Device/buffalo_bhr-4grv2 ATH_SOC := qca9557 - DEVICE_TITLE := Buffalo BHR-4GRV2 + DEVICE_VENDOR := Buffalo + DEVICE_MODEL := BHR-4GRV2 IMAGE_SIZE := 16000k endef TARGET_DEVICES += buffalo_bhr-4grv2 define Device/buffalo_wzr-hp-ag300h ATH_SOC := ar7161 - DEVICE_TITLE := Buffalo WZR-HP-AG300H + DEVICE_VENDOR := Buffalo + DEVICE_MODEL := WZR-HP-AG300H IMAGE_SIZE := 32256k IMAGES += factory.bin tftp.bin IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) @@ -154,7 +161,9 @@ TARGET_DEVICES += buffalo_wzr-hp-ag300h define Device/buffalo_wzr-hp-g302h-a1a0 ATH_SOC := ar7242 - DEVICE_TITLE := Buffalo WZR-HP-G302H A1A0 + DEVICE_VENDOR := Buffalo + DEVICE_MODEL := WZR-HP-G302H + DEVICE_VARIANT := A1A0 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport IMAGE_SIZE := 32128k IMAGES += factory.bin tftp.bin @@ -167,7 +176,8 @@ TARGET_DEVICES += buffalo_wzr-hp-g302h-a1a0 define Device/buffalo_wzr-hp-g450h ATH_SOC := ar7242 - DEVICE_TITLE := Buffalo WZR-HP-G450H/WZR-450HP + DEVICE_VENDOR := Buffalo + DEVICE_MODEL := WZR-HP-G450H/WZR-450HP DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport IMAGE_SIZE := 32256k IMAGES += factory.bin tftp.bin @@ -180,7 +190,9 @@ TARGET_DEVICES += buffalo_wzr-hp-g450h define Device/comfast_cf-e110n-v2 ATH_SOC := qca9533 - DEVICE_TITLE := COMFAST CF-E110N v2 + DEVICE_VENDOR := COMFAST + DEVICE_MODEL := CF-E110N + DEVICE_VARIANT := v2 DEVICE_PACKAGES := rssileds kmod-leds-gpio -swconfig -uboot-envtools IMAGE_SIZE := 16192k endef @@ -188,7 +200,9 @@ TARGET_DEVICES += comfast_cf-e110n-v2 define Device/comfast_cf-e120a-v3 ATH_SOC := ar9344 - DEVICE_TITLE := COMFAST CF-E120A v3 + DEVICE_VENDOR := COMFAST + DEVICE_MODEL := CF-E120A + DEVICE_VARIANT := v3 DEVICE_PACKAGES := rssileds kmod-leds-gpio -uboot-envtools IMAGE_SIZE := 8000k endef @@ -196,7 +210,8 @@ TARGET_DEVICES += comfast_cf-e120a-v3 define Device/comfast_cf-e5 ATH_SOC := qca9531 - DEVICE_TITLE := COMFAST CF-E5/E7 + DEVICE_VENDOR := COMFAST + DEVICE_MODEL := CF-E5/E7 DEVICE_PACKAGES := rssileds kmod-leds-gpio kmod-usb-core kmod-usb2 kmod-usb-net \ kmod-usb-net-qmi-wwan -swconfig -uboot-envtools IMAGE_SIZE := 16192k @@ -205,7 +220,8 @@ TARGET_DEVICES += comfast_cf-e5 define Device/devolo_dvl1200e ATH_SOC := qca9558 - DEVICE_TITLE := devolo WiFi pro 1200e + DEVICE_VENDOR := devolo + DEVICE_MODEL := WiFi pro 1200e DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct IMAGE_SIZE := 15936k endef @@ -213,7 +229,8 @@ TARGET_DEVICES += devolo_dvl1200e define Device/devolo_dvl1200i ATH_SOC := qca9558 - DEVICE_TITLE := devolo WiFi pro 1200i + DEVICE_VENDOR := devolo + DEVICE_MODEL := WiFi pro 1200i DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct IMAGE_SIZE := 15936k endef @@ -221,7 +238,8 @@ TARGET_DEVICES += devolo_dvl1200i define Device/devolo_dvl1750c ATH_SOC := qca9558 - DEVICE_TITLE := devolo WiFi pro 1750c + DEVICE_VENDOR := devolo + DEVICE_MODEL := WiFi pro 1750c DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct IMAGE_SIZE := 15936k endef @@ -229,7 +247,8 @@ TARGET_DEVICES += devolo_dvl1750c define Device/devolo_dvl1750e ATH_SOC := qca9558 - DEVICE_TITLE := devolo WiFi pro 1750e + DEVICE_VENDOR := devolo + DEVICE_MODEL := WiFi pro 1750e DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct IMAGE_SIZE := 15936k endef @@ -237,7 +256,8 @@ TARGET_DEVICES += devolo_dvl1750e define Device/devolo_dvl1750i ATH_SOC := qca9558 - DEVICE_TITLE := devolo WiFi pro 1750i + DEVICE_VENDOR := devolo + DEVICE_MODEL := WiFi pro 1750i DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct IMAGE_SIZE := 15936k endef @@ -245,7 +265,9 @@ TARGET_DEVICES += devolo_dvl1750i define Device/dlink_dir-825-b1 ATH_SOC := ar7161 - DEVICE_TITLE := D-LINK DIR-825 B1 + DEVICE_VENDOR := D-Link + DEVICE_MODEL := DIR-825 + DEVICE_VARIANT := B1 IMAGE_SIZE := 6208k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport kmod-leds-reset kmod-owl-loader @@ -255,7 +277,9 @@ TARGET_DEVICES += dlink_dir-825-b1 define Device/dlink_dir-825-c1 ATH_SOC := ar9344 - DEVICE_TITLE := D-LINK DIR-825 C1 + DEVICE_VENDOR := D-Link + DEVICE_MODEL := DIR-825 + DEVICE_VARIANT := C1 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-leds-reset kmod-owl-loader SUPPORTED_DEVICES += dir-825-c1 IMAGE_SIZE := 15936k @@ -269,7 +293,9 @@ TARGET_DEVICES += dlink_dir-825-c1 define Device/dlink_dir-835-a1 ATH_SOC := ar9344 - DEVICE_TITLE := D-LINK DIR-835 A1 + DEVICE_VENDOR := D-Link + DEVICE_MODEL := DIR-835 + DEVICE_VARIANT := A1 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-leds-reset kmod-owl-loader SUPPORTED_DEVICES += dir-835-a1 IMAGE_SIZE := 15936k @@ -284,7 +310,9 @@ TARGET_DEVICES += dlink_dir-835-a1 define Device/dlink_dir-859-a1 $(Device/seama) ATH_SOC := qca9563 - DEVICE_TITLE := D-LINK DIR-859 A1 + DEVICE_VENDOR := D-Link + DEVICE_MODEL := DIR-859 + DEVICE_VARIANT := A1 IMAGE_SIZE := 15872k DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct SEAMA_SIGNATURE := wrgac37_dlink.2013gui_dir859 @@ -294,7 +322,8 @@ TARGET_DEVICES += dlink_dir-859-a1 define Device/elecom_wrc-1750ghbk2-i ATH_SOC := qca9563 - DEVICE_TITLE := ELECOM WRC-1750GHBK2-I/C + DEVICE_VENDOR := ELECOM + DEVICE_MODEL := WRC-1750GHBK2-I/C IMAGE_SIZE := 15808k KERNEL_INITRAMFS := $$(KERNEL) | pad-to 2 | \ add-elecom-factory-initramfs RN68 WRC-1750GHBK2 @@ -304,7 +333,8 @@ TARGET_DEVICES += elecom_wrc-1750ghbk2-i define Device/elecom_wrc-300ghbk2-i ATH_SOC := qca9563 - DEVICE_TITLE := ELECOM WRC-300GHBK2-I + DEVICE_VENDOR := ELECOM + DEVICE_MODEL := WRC-300GHBK2-I IMAGE_SIZE := 7616k KERNEL_INITRAMFS := $$(KERNEL) | pad-to 2 | \ add-elecom-factory-initramfs RN51 WRC-300GHBK2-I @@ -313,7 +343,8 @@ TARGET_DEVICES += elecom_wrc-300ghbk2-i define Device/embeddedwireless_dorin ATH_SOC := ar9331 - DEVICE_TITLE := Embedded Wireless Dorin + DEVICE_VENDOR := Embedded Wireless + DEVICE_MODEL := Dorin DEVICE_PACKAGES := kmod-usb-chipidea2 IMAGE_SIZE := 16000k endef @@ -321,7 +352,8 @@ TARGET_DEVICES += embeddedwireless_dorin define Device/engenius_ecb1750 ATH_SOC := qca9558 - DEVICE_TITLE := EnGenius ECB1750 + DEVICE_VENDOR := EnGenius + DEVICE_MODEL := ECB1750 DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct IMAGE_SIZE := 15680k IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \ @@ -333,7 +365,8 @@ TARGET_DEVICES += engenius_ecb1750 define Device/engenius_epg5000 ATH_SOC := qca9558 - DEVICE_TITLE := EnGenius EPG5000 + DEVICE_VENDOR := EnGenius + DEVICE_MODEL := EPG5000 DEVICE_PACKAGES := ath10k-firmware-qca988x-ct kmod-ath10k-ct kmod-usb2 IMAGE_SIZE := 14656k IMAGES += factory.dlf @@ -346,7 +379,8 @@ TARGET_DEVICES += engenius_epg5000 define Device/engenius_ews511ap ATH_SOC := qca9531 - DEVICE_TITLE := EnGenius EWS511AP + DEVICE_VENDOR := EnGenius + DEVICE_MODEL := EWS511AP DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct IMAGE_SIZE := 16000k endef @@ -354,7 +388,8 @@ TARGET_DEVICES += engenius_ews511ap define Device/etactica_eg200 ATH_SOC := ar9331 - DEVICE_TITLE := eTactica EG200 + DEVICE_VENDOR := eTactica + DEVICE_MODEL := EG200 DEVICE_PACKAGES := kmod-usb-chipidea2 kmod-ledtrig-oneshot \ kmod-usb-serial kmod-usb-serial-ftdi kmod-usb-storage kmod-fs-ext4 SUPPORTED_DEVICES += rme-eg200 @@ -363,7 +398,8 @@ TARGET_DEVICES += etactica_eg200 define Device/glinet_gl-ar150 ATH_SOC := ar9330 - DEVICE_TITLE := GL.iNet GL-AR150 + DEVICE_VENDOR := GL.iNet + DEVICE_MODEL := GL-AR150 DEVICE_PACKAGES := kmod-usb-chipidea2 IMAGE_SIZE := 16000k SUPPORTED_DEVICES += gl-ar150 @@ -379,19 +415,22 @@ endef define Device/glinet_gl-ar300m-lite $(Device/glinet_gl-ar300m-common-nor) - DEVICE_TITLE := GL.iNet GL-AR300M-Lite + DEVICE_VENDOR := GL.iNet + DEVICE_MODEL := GL-AR300M-Lite endef TARGET_DEVICES += glinet_gl-ar300m-lite define Device/glinet_gl-ar300m-nor $(Device/glinet_gl-ar300m-common-nor) - DEVICE_TITLE := GL.iNet GL-AR300M + DEVICE_VENDOR := GL.iNet + DEVICE_MODEL := GL-AR300M endef TARGET_DEVICES += glinet_gl-ar300m-nor define Device/glinet_gl-ar750s ATH_SOC := qca9563 - DEVICE_TITLE := GL.iNet GL-AR750S + DEVICE_VENDOR := GL.iNet + DEVICE_MODEL := GL-AR750S DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca9887-ct block-mount IMAGE_SIZE := 16000k SUPPORTED_DEVICES += gl-ar750s @@ -400,7 +439,8 @@ TARGET_DEVICES += glinet_gl-ar750s define Device/glinet_gl-x750 ATH_SOC := qca9531 - DEVICE_TITLE := GL.iNet GL-X750 + DEVICE_VENDOR := GL.iNet + DEVICE_MODEL := GL-X750 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca9887-ct IMAGE_SIZE := 16000k endef @@ -408,7 +448,8 @@ TARGET_DEVICES += glinet_gl-x750 define Device/iodata_etg3-r ATH_SOC := ar9342 - DEVICE_TITLE := I-O DATA ETG3-R + DEVICE_VENDOR := I-O DATA + DEVICE_MODEL := ETG3-R IMAGE_SIZE := 7680k DEVICE_PACKAGES := -iwinfo -kmod-ath9k -wpad-basic endef @@ -416,7 +457,8 @@ TARGET_DEVICES += iodata_etg3-r define Device/iodata_wn-ac1167dgr ATH_SOC := qca9557 - DEVICE_TITLE := I-O DATA WN-AC1167DGR + DEVICE_VENDOR := I-O DATA + DEVICE_MODEL := WN-AC1167DGR IMAGE_SIZE := 14656k IMAGES += factory.bin IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \ @@ -428,7 +470,8 @@ TARGET_DEVICES += iodata_wn-ac1167dgr define Device/iodata_wn-ac1600dgr ATH_SOC := qca9557 - DEVICE_TITLE := I-O DATA WN-AC1600DGR + DEVICE_VENDOR := I-O DATA + DEVICE_MODEL := WN-AC1600DGR IMAGE_SIZE := 14656k IMAGES += factory.bin IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \ @@ -440,7 +483,8 @@ TARGET_DEVICES += iodata_wn-ac1600dgr define Device/iodata_wn-ac1600dgr2 ATH_SOC := qca9557 - DEVICE_TITLE := I-O DATA WN-AC1600DGR2 + DEVICE_VENDOR := I-O DATA + DEVICE_MODEL := WN-AC1600DGR2 IMAGE_SIZE := 14656k IMAGES += factory.bin IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \ @@ -452,7 +496,8 @@ TARGET_DEVICES += iodata_wn-ac1600dgr2 define Device/iodata_wn-ag300dgr ATH_SOC := ar1022 - DEVICE_TITLE := I-O DATA WN-AG300DGR + DEVICE_VENDOR := I-O DATA + DEVICE_MODEL := WN-AG300DGR IMAGE_SIZE := 15424k IMAGES += factory.bin IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \ @@ -464,7 +509,8 @@ TARGET_DEVICES += iodata_wn-ag300dgr define Device/jjplus_ja76pf2 ATH_SOC := ar7161 - DEVICE_TITLE := jjPlus JA76PF2 + DEVICE_VENDOR := jjPlus + DEVICE_MODEL := JA76PF2 DEVICE_PACKAGES += -kmod-ath9k -swconfig -wpad-mini -uboot-envtools fconfig IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | combined-image | check-size $$$$(IMAGE_SIZE) # IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) | sysupgrade-tar rootfs=$$$$@ | append-metadata @@ -476,7 +522,9 @@ TARGET_DEVICES += jjplus_ja76pf2 define Device/librerouter_librerouter-v1 ATH_SOC := qca9558 - DEVICE_TITLE := LibreRouter v1 + DEVICE_VENDOR := Librerouter + DEVICE_MODEL := LibreRouter + DEVICE_VARIANT := v1 IMAGE_SIZE := 7936k DEVICE_PACKAGES := kmod-usb-core kmod-usb2 endef @@ -484,7 +532,8 @@ TARGET_DEVICES += librerouter_librerouter-v1 define Device/nec_wg1200cr ATH_SOC := qca9563 - DEVICE_TITLE := NEC Aterm WG1200CR + DEVICE_VENDOR := NEC + DEVICE_MODEL := Aterm WG1200CR IMAGE_SIZE := 7616k SEAMA_MTDBLOCK := 6 SEAMA_SIGNATURE := wrgac72_necpf.2016gui_wg1200cr @@ -502,7 +551,8 @@ TARGET_DEVICES += nec_wg1200cr define Device/nec_wg800hp ATH_SOC := qca9563 - DEVICE_TITLE := NEC Aterm WG800HP + DEVICE_VENDOR := NEC + DEVICE_MODEL := Aterm WG800HP IMAGE_SIZE := 7104k IMAGES += factory.bin IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \ @@ -515,7 +565,8 @@ TARGET_DEVICES += nec_wg800hp define Device/ocedo_koala ATH_SOC := qca9558 - DEVICE_TITLE := OCEDO Koala + DEVICE_VENDOR := Ocedo + DEVICE_MODEL := Koala DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct SUPPORTED_DEVICES += koala IMAGE_SIZE := 7424k @@ -525,7 +576,8 @@ TARGET_DEVICES += ocedo_koala define Device/ocedo_raccoon ATH_SOC := ar9344 - DEVICE_TITLE := OCEDO Raccoon + DEVICE_VENDOR := Ocedo + DEVICE_MODEL := Raccoon IMAGE_SIZE := 7424k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) endef @@ -533,7 +585,8 @@ TARGET_DEVICES += ocedo_raccoon define Device/ocedo_ursus ATH_SOC := qca9558 - DEVICE_TITLE := OCEDO Ursus + DEVICE_VENDOR := Ocedo + DEVICE_MODEL := Ursus DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct IMAGE_SIZE := 7424k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) @@ -542,7 +595,9 @@ TARGET_DEVICES += ocedo_ursus define Device/openmesh_om5p-ac-v2 ATH_SOC := qca9558 - DEVICE_TITLE := OpenMesh OM5P-AC v2 + DEVICE_VENDOR := OpenMesh + DEVICE_MODEL := OM5P-AC + DEVICE_VARIANT := v2 DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct om-watchdog IMAGE_SIZE := 7808k SUPPORTED_DEVICES += om5p-acv2 @@ -551,7 +606,8 @@ TARGET_DEVICES += openmesh_om5p-ac-v2 define Device/pcs_cap324 ATH_SOC := ar9344 - DEVICE_TITLE := PowerCloud Systems CAP324 + DEVICE_VENDOR := PowerCloud Systems + DEVICE_MODEL := CAP324 IMAGE_SIZE := 16000k SUPPORTED_DEVICES += cap324 endef @@ -559,7 +615,8 @@ TARGET_DEVICES += pcs_cap324 define Device/pcs_cr3000 ATH_SOC := ar9341 - DEVICE_TITLE := PowerCloud Systems CR3000 + DEVICE_VENDOR := PowerCloud Systems + DEVICE_MODEL := CR3000 IMAGE_SIZE := 7808k SUPPORTED_DEVICES += cr3000 endef @@ -567,7 +624,8 @@ TARGET_DEVICES += pcs_cr3000 define Device/pcs_cr5000 ATH_SOC := ar9344 - DEVICE_TITLE := PowerCloud Systems CR5000 + DEVICE_VENDOR := PowerCloud Systems + DEVICE_MODEL := CR5000 DEVICE_PACKAGES := kmod-usb2 kmod-usb-core IMAGE_SIZE := 7808k SUPPORTED_DEVICES += cr5000 @@ -594,19 +652,22 @@ endef define Device/netgear_ex6400 $(Device/netgear_ex7300_ex6400) - DEVICE_TITLE := NETGEAR EX6400 + DEVICE_VENDOR := NETGEAR + DEVICE_MODEL := EX6400 endef TARGET_DEVICES += netgear_ex6400 define Device/netgear_ex7300 $(Device/netgear_ex7300_ex6400) - DEVICE_TITLE := NETGEAR EX7300 + DEVICE_VENDOR := NETGEAR + DEVICE_MODEL := EX7300 endef TARGET_DEVICES += netgear_ex7300 define Device/netgear_wndr3700 $(Device/netgear_wndr3x00) - DEVICE_TITLE := NETGEAR WNDR3700 + DEVICE_VENDOR := NETGEAR + DEVICE_MODEL := WNDR3700 NETGEAR_KERNEL_MAGIC := 0x33373030 NETGEAR_BOARD_ID := WNDR3700 IMAGE_SIZE := 7680k @@ -618,7 +679,8 @@ TARGET_DEVICES += netgear_wndr3700 define Device/netgear_wndr3700v2 $(Device/netgear_wndr3x00) - DEVICE_TITLE := NETGEAR WNDR3700v2 + DEVICE_VENDOR := NETGEAR + DEVICE_MODEL := WNDR3700v2 NETGEAR_KERNEL_MAGIC := 0x33373031 NETGEAR_BOARD_ID := WNDR3700v2 NETGEAR_HW_ID := 29763654+16+64 @@ -630,7 +692,8 @@ TARGET_DEVICES += netgear_wndr3700v2 define Device/pisen_wmm003n $(Device/tplink-8mlzma) ATH_SOC := ar9331 - DEVICE_TITLE := Pisen WMM003N (Cloud Easy Power) + DEVICE_VENDOR := PISEN + DEVICE_MODEL := Cloud Easy Power (WMM003N) DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-chipidea2 TPLINK_HWID := 0x07030101 endef @@ -638,7 +701,8 @@ TARGET_DEVICES += pisen_wmm003n define Device/netgear_wndr3800 $(Device/netgear_wndr3x00) - DEVICE_TITLE := NETGEAR WNDR3800 + DEVICE_VENDOR := NETGEAR + DEVICE_MODEL := WNDR3800 NETGEAR_KERNEL_MAGIC := 0x33373031 NETGEAR_BOARD_ID := WNDR3800 NETGEAR_HW_ID := 29763654+16+128 @@ -649,7 +713,8 @@ TARGET_DEVICES += netgear_wndr3800 define Device/phicomm_k2t ATH_SOC := qca9563 - DEVICE_TITLE := Phicomm K2T + DEVICE_VENDOR := Phicomm + DEVICE_MODEL := K2T IMAGE_SIZE := 15744k IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) DEVICE_PACKAGES := kmod-leds-reset kmod-ath10k-ct ath10k-firmware-qca9888-ct @@ -658,7 +723,8 @@ TARGET_DEVICES += phicomm_k2t define Device/rosinson_wr818 ATH_SOC := qca9563 - DEVICE_TITLE := ROSINSON WR818 + DEVICE_VENDOR := Rosinson + DEVICE_MODEL := WR818 IMAGE_SIZE := 15872k DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport endef @@ -667,7 +733,8 @@ TARGET_DEVICES += rosinson_wr818 define Device/wd_mynet-n750 $(Device/seama) ATH_SOC := ar9344 - DEVICE_TITLE := Western Digital My Net N750 + DEVICE_VENDOR := Western Digital + DEVICE_MODEL := My Net N750 IMAGE_SIZE := 15872k DEVICE_PACKAGES := kmod-usb-core kmod-usb2 SEAMA_SIGNATURE := wrgnd13_wd_av @@ -677,7 +744,8 @@ TARGET_DEVICES += wd_mynet-n750 define Device/wd_mynet-wifi-rangeextender ATH_SOC := ar9344 - DEVICE_TITLE := Western Digital My Net Wi-Fi Range Extender + DEVICE_VENDOR := Western Digital + DEVICE_MODEL := My Net Wi-Fi Range Extender DEVICE_PACKAGES := rssileds nvram -swconfig IMAGE_SIZE := 7808k ADDPATTERN_ID := mynet-rext @@ -690,7 +758,8 @@ TARGET_DEVICES += wd_mynet-wifi-rangeextender define Device/winchannel_wb2000 ATH_SOC := ar9344 - DEVICE_TITLE := Winchannel WB2000 + DEVICE_VENDOR := Winchannel + DEVICE_MODEL := WB2000 IMAGE_SIZE := 15872k DEVICE_PACKAGES := kmod-i2c-core kmod-i2c-gpio kmod-rtc-ds1307 kmod-usb2 kmod-usb-ledtrig-usbport endef @@ -698,14 +767,16 @@ TARGET_DEVICES += winchannel_wb2000 define Device/xiaomi_mi-router-4q ATH_SOC := qca9561 - DEVICE_TITLE := Xiaomi Mi Router 4Q + DEVICE_VENDOR := Xiaomi + DEVICE_MODEL := Mi Router 4Q IMAGE_SIZE := 14336k endef TARGET_DEVICES += xiaomi_mi-router-4q define Device/yuncore_a770 ATH_SOC := qca9531 - DEVICE_TITLE := YunCore A770 + DEVICE_VENDOR := YunCore + DEVICE_MODEL := A770 DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct IMAGE_SIZE := 16000k endef @@ -713,7 +784,8 @@ TARGET_DEVICES += yuncore_a770 define Device/zbtlink_zbt-wd323 ATH_SOC := ar9344 - DEVICE_TITLE := ZBT WD323 + DEVICE_VENDOR := ZBT + DEVICE_MODEL := WD323 IMAGE_SIZE := 16000k DEVICE_PACKAGES := kmod-usb2 kmod-i2c-core kmod-i2c-gpio kmod-rtc-pcf8563 \ kmod-usb-serial kmod-usb-serial-cp210x uqmi diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk index eee419194b..f6eab3567f 100644 --- a/target/linux/ath79/image/nand.mk +++ b/target/linux/ath79/image/nand.mk @@ -1,6 +1,7 @@ define Device/glinet_gl-ar300m-nand ATH_SOC := qca9531 - DEVICE_TITLE := GL-AR300M (NAND) + DEVICE_MODEL := GL-AR300M + DEVICE_VARIANT := NAND DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage kmod-usb-ledtrig-usbport KERNEL_SIZE := 2048k BLOCKSIZE := 128k diff --git a/target/linux/ath79/image/tiny-netgear.mk b/target/linux/ath79/image/tiny-netgear.mk index 42d6cab8bd..f353bc70bf 100644 --- a/target/linux/ath79/image/tiny-netgear.mk +++ b/target/linux/ath79/image/tiny-netgear.mk @@ -11,7 +11,9 @@ endef define Device/netgear_wnr612-v2 $(Device/netgear_ar7240) - DEVICE_TITLE := Netgear WNR612v2 + DEVICE_VENDOR := NETGEAR + DEVICE_MODEL := WNR612 + DEVICE_VARIANT := v2 DEVICE_DTS := ar7240_netgear_wnr612-v2 NETGEAR_BOARD_ID := REALWNR612V2 SUPPORTED_DEVICES += wnr612-v2 @@ -20,7 +22,8 @@ TARGET_DEVICES += netgear_wnr612-v2 define Device/on_n150r $(Device/netgear_ar7240) - DEVICE_TITLE := ON Network N150R + DEVICE_VENDOR := On Networks + DEVICE_MODEL := N150R NETGEAR_BOARD_ID := N150R SUPPORTED_DEVICES += n150r endef diff --git a/target/linux/ath79/image/tiny-tp-link.mk b/target/linux/ath79/image/tiny-tp-link.mk index fb8ab75cb1..cc9065e92b 100644 --- a/target/linux/ath79/image/tiny-tp-link.mk +++ b/target/linux/ath79/image/tiny-tp-link.mk @@ -4,7 +4,7 @@ include ./common-tp-link.mk define Device/tplink_tl-mr10u $(Device/tplink-4mlzma) ATH_SOC := ar9331 - DEVICE_TITLE := TP-Link TL-MR10U + DEVICE_MODEL := TL-MR10U DEVICE_PACKAGES := kmod-usb-chipidea2 TPLINK_HWID := 0x00100101 SUPPORTED_DEVICES += tl-mr10u @@ -14,7 +14,8 @@ TARGET_DEVICES += tplink_tl-mr10u define Device/tplink_tl-mr3020-v1 $(Device/tplink-4mlzma) ATH_SOC := ar9331 - DEVICE_TITLE := TP-Link TL-MR3020 v1 + DEVICE_MODEL := TL-MR3020 + DEVICE_VARIANT := v1 DEVICE_PACKAGES := kmod-usb-core kmod-usb-chipidea2 kmod-usb-ledtrig-usbport TPLINK_HWID := 0x30200001 SUPPORTED_DEVICES += tl-mr3020 @@ -24,7 +25,8 @@ TARGET_DEVICES += tplink_tl-mr3020-v1 define Device/tplink_tl-mr3040-v2 $(Device/tplink-4mlzma) ATH_SOC := ar9331 - DEVICE_TITLE := TP-Link TL-MR3040 v2 + DEVICE_MODEL := TL-MR3040 + DEVICE_VARIANT := v2 DEVICE_PACKAGES := kmod-usb-core kmod-usb-chipidea2 kmod-usb-ledtrig-usbport TPLINK_HWID := 0x30400002 SUPPORTED_DEVICES += tl-mr3040-v2 @@ -34,7 +36,8 @@ TARGET_DEVICES += tplink_tl-mr3040-v2 define Device/tplink_tl-mr3220-v1 $(Device/tplink-4m) ATH_SOC := ar7241 - DEVICE_TITLE := TP-Link TL-MR3220 v1 + DEVICE_MODEL := TL-MR3220 + DEVICE_VARIANT := v1 TPLINK_HWID := 0x32200001 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport SUPPORTED_DEVICES += tl-mr3220-v1 @@ -44,7 +47,8 @@ TARGET_DEVICES += tplink_tl-mr3220-v1 define Device/tplink_tl-mr3420-v1 $(Device/tplink-4m) ATH_SOC := ar7241 - DEVICE_TITLE := TP-Link TL-MR3420 v1 + DEVICE_MODEL := TL-MR3420 + DEVICE_VARIANT := v1 TPLINK_HWID := 0x34200001 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport SUPPORTED_DEVICES += tl-mr3420-v1 @@ -54,7 +58,8 @@ TARGET_DEVICES += tplink_tl-mr3420-v1 define Device/tplink_tl-wa901nd-v2 $(Device/tplink-4m) ATH_SOC := ar9132 - DEVICE_TITLE := TP-Link TL-WA901ND v2 + DEVICE_MODEL := TL-WA901ND + DEVICE_VARIANT := v2 TPLINK_HWID := 0x09010002 endef TARGET_DEVICES += tplink_tl-wa901nd-v2 @@ -62,7 +67,7 @@ TARGET_DEVICES += tplink_tl-wa901nd-v2 define Device/tplink_tl-wr703n $(Device/tplink-4mlzma) ATH_SOC := ar9331 - DEVICE_TITLE := TP-Link TL-WR703N + DEVICE_MODEL := TL-WR703N DEVICE_PACKAGES := kmod-usb-chipidea2 TPLINK_HWID := 0x07030101 SUPPORTED_DEVICES += tl-wr703n @@ -72,7 +77,8 @@ TARGET_DEVICES += tplink_tl-wr703n define Device/tplink_tl-wr740n-v1 $(Device/tplink-4m) ATH_SOC := ar7240 - DEVICE_TITLE := TP-Link TL-WR740N v1/v2 + DEVICE_MODEL := TL-WR740N + DEVICE_VARIANT := v1/v2 TPLINK_HWID := 0x07400001 endef TARGET_DEVICES += tplink_tl-wr740n-v1 @@ -80,7 +86,8 @@ TARGET_DEVICES += tplink_tl-wr740n-v1 define Device/tplink_tl-wr740n-v3 $(Device/tplink-4m) ATH_SOC := ar7240 - DEVICE_TITLE := TP-Link TL-WR740N v3 + DEVICE_MODEL := TL-WR740N + DEVICE_VARIANT := v3 TPLINK_HWID := 0x07400003 endef TARGET_DEVICES += tplink_tl-wr740n-v3 @@ -88,7 +95,8 @@ TARGET_DEVICES += tplink_tl-wr740n-v3 define Device/tplink_tl-wr740n-v4 $(Device/tplink-4mlzma) ATH_SOC := ar9331 - DEVICE_TITLE := TP-Link TL-WR740N v4 + DEVICE_MODEL := TL-WR740N + DEVICE_VARIANT := v4 TPLINK_HWID := 0x07400004 SUPPORTED_DEVICES += tl-wr740n-v4 endef @@ -97,7 +105,8 @@ TARGET_DEVICES += tplink_tl-wr740n-v4 define Device/tplink_tl-wr741-v1 $(Device/tplink-4m) ATH_SOC := ar7240 - DEVICE_TITLE := TP-Link TL-WR741N/ND v1/v2 + DEVICE_MODEL := TL-WR741N/ND + DEVICE_VARIANT := v1/v2 TPLINK_HWID := 0x07410001 endef TARGET_DEVICES += tplink_tl-wr741-v1 @@ -105,7 +114,8 @@ TARGET_DEVICES += tplink_tl-wr741-v1 define Device/tplink_tl-wr741nd-v4 $(Device/tplink-4mlzma) ATH_SOC := ar9331 - DEVICE_TITLE := TP-Link TL-WR741N/ND v4 + DEVICE_MODEL := TL-WR741N/ND + DEVICE_VARIANT := v4 TPLINK_HWID := 0x07410004 SUPPORTED_DEVICES += tl-wr741n-v4 endef @@ -114,7 +124,8 @@ TARGET_DEVICES += tplink_tl-wr741nd-v4 define Device/tplink_tl-wr743nd-v1 $(Device/tplink-4m) ATH_SOC := ar7240 - DEVICE_TITLE := TP-Link TL-WR743ND v1 + DEVICE_MODEL := TL-WR743ND + DEVICE_VARIANT := v1 TPLINK_HWID := 0x07430001 endef TARGET_DEVICES += tplink_tl-wr743nd-v1 @@ -122,7 +133,8 @@ TARGET_DEVICES += tplink_tl-wr743nd-v1 define Device/tplink_tl-wr841-v5 $(Device/tplink-4m) ATH_SOC := ar7240 - DEVICE_TITLE := TP-Link TL-WR841N/ND v5/v6 + DEVICE_MODEL := TL-WR841N/ND + DEVICE_VARIANT := v5/v6 TPLINK_HWID := 0x08410005 endef TARGET_DEVICES += tplink_tl-wr841-v5 @@ -130,7 +142,8 @@ TARGET_DEVICES += tplink_tl-wr841-v5 define Device/tplink_tl-wr841-v7 $(Device/tplink-4m) ATH_SOC := ar7241 - DEVICE_TITLE := TP-Link TL-WR841N/ND v7 + DEVICE_MODEL := TL-WR841N/ND + DEVICE_VARIANT := v7 TPLINK_HWID := 0x08410007 SUPPORTED_DEVICES += tl-wr841-v7 endef @@ -139,7 +152,8 @@ TARGET_DEVICES += tplink_tl-wr841-v7 define Device/tplink_tl-wr841-v8 $(Device/tplink-4mlzma) ATH_SOC := ar9341 - DEVICE_TITLE := TP-Link TL-WR841N/ND v8 + DEVICE_MODEL := TL-WR841N/ND + DEVICE_VARIANT := v8 TPLINK_HWID := 0x08410008 SUPPORTED_DEVICES += tl-wr841n-v8 endef @@ -148,7 +162,8 @@ TARGET_DEVICES += tplink_tl-wr841-v8 define Device/tplink_tl-wr841-v9 $(Device/tplink-4mlzma) ATH_SOC := qca9533 - DEVICE_TITLE := TP-Link TL-WR841N/ND v9 + DEVICE_MODEL := TL-WR841N/ND + DEVICE_VARIANT := v9 TPLINK_HWID := 0x08410009 endef TARGET_DEVICES += tplink_tl-wr841-v9 @@ -156,7 +171,8 @@ TARGET_DEVICES += tplink_tl-wr841-v9 define Device/tplink_tl-wr841-v11 $(Device/tplink-4mlzma) ATH_SOC := qca9533 - DEVICE_TITLE := TP-Link TL-WR841N/ND v11 + DEVICE_MODEL := TL-WR841N/ND + DEVICE_VARIANT := v11 TPLINK_HWID := 0x08410011 IMAGES += factory-us.bin factory-eu.bin IMAGE/factory-us.bin := append-rootfs | mktplinkfw factory -C US @@ -167,7 +183,8 @@ TARGET_DEVICES += tplink_tl-wr841-v11 define Device/tplink_tl-wr941-v2 $(Device/tplink-4m) ATH_SOC := ar9132 - DEVICE_TITLE := TP-Link TL-WR941N/ND v2/v3 + DEVICE_MODEL := TL-WR941N/ND + DEVICE_VARIANT := v2/v3 TPLINK_HWID := 0x09410002 TPLINK_HWREV := 2 endef @@ -176,7 +193,8 @@ TARGET_DEVICES += tplink_tl-wr941-v2 define Device/tplink_tl-wr941-v4 $(Device/tplink-4m) ATH_SOC := ar7240 - DEVICE_TITLE := TP-Link TL-WR941N/ND v4 + DEVICE_MODEL := TL-WR941N/ND + DEVICE_VARIANT := v4 TPLINK_HWID := 0x09410004 endef TARGET_DEVICES += tplink_tl-wr941-v4 @@ -184,7 +202,8 @@ TARGET_DEVICES += tplink_tl-wr941-v4 define Device/tplink_tl-wr941n-v7-cn $(Device/tplink-4mlzma) ATH_SOC := qca9558 - DEVICE_TITLE := TP-Link TL-WR941N v7 (CN) + DEVICE_MODEL := TL-WR941N + DEVICE_VARIANT := v7 (CN) TPLINK_HWID := 0x09410007 endef TARGET_DEVICES += tplink_tl-wr941n-v7-cn diff --git a/target/linux/ath79/image/tiny.mk b/target/linux/ath79/image/tiny.mk index bf7a5e140b..fb93cb60f5 100644 --- a/target/linux/ath79/image/tiny.mk +++ b/target/linux/ath79/image/tiny.mk @@ -2,7 +2,8 @@ include ./common-buffalo.mk define Device/buffalo_whr-g301n ATH_SOC := ar7240 - DEVICE_TITLE := Buffalo WHR-G301N + DEVICE_VENDOR := Buffalo + DEVICE_MODEL := WHR-G301N IMAGE_SIZE := 3712k IMAGES += factory.bin tftp.bin IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) @@ -14,7 +15,8 @@ TARGET_DEVICES += buffalo_whr-g301n define Device/pqi_air-pen ATH_SOC := ar9330 - DEVICE_TITLE := PQI Air-Pen + DEVICE_VENDOR := PQI + DEVICE_MODEL := Air-Pen DEVICE_PACKAGES := kmod-usb-core kmod-usb2 IMAGE_SIZE := 7680k SUPPORTED_DEVICES += pqi-air-pen -- cgit v1.2.3