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/tiny-tp-link.mk | 61 +++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 21 deletions(-) (limited to 'target/linux/ath79/image/tiny-tp-link.mk') 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 -- cgit v1.2.3