Include device version number in TP-Link image/target names

Include version numbers in supported TP-Link devices image/target names
to make clear for users what version it supports. TP-Link is crazy with
different versions of the same model, e.g. we have TL-MR3020 v1 and v3
(yes, there is no v2...), TL-WR802N v1, v2, v3 and v4, etc.

diff --git a/Makefile b/Makefile
index 4ff48b73821c39e183f08b6038f01f87559802cd..50c3bc3a0360969a8147c191270a41421c6ca5fa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -210,13 +210,13 @@ endef
 COMMON_AR933X_TARGETS = \
        gainstrong_oolite_v1_dev \
        gl-inet_6416 \
-       tp-link_tl-mr10u \
-       tp-link_tl-mr13u \
-       tp-link_tl-mr3020 \
-       tp-link_tl-mr3040 \
+       tp-link_tl-mr10u_v1 \
+       tp-link_tl-mr13u_v1 \
+       tp-link_tl-mr3020_v1 \
+       tp-link_tl-mr3040_v1v2 \
        tp-link_tl-mr3220_v2 \
-       tp-link_tl-wr703n \
-       tp-link_tl-wr710n \
+       tp-link_tl-wr703n_v1 \
+       tp-link_tl-wr710n_v1 \
        tp-link_tl-wr720n_v3_CN \
        tp-link_tl-wr740n_v4
 
@@ -230,10 +230,10 @@ COMMON_ETHS27_TARGETS = \
        tp-link_tl-wa801nd_v2 \
        tp-link_tl-wa850re_v2 \
        tp-link_tl-wa830re_v2 \
-       tp-link_tl-wdr3500 \
-       tp-link_tl-wr802n \
-       tp-link_tl-wr810n \
-       tp-link_tl-wr820n_CN \
+       tp-link_tl-wdr3500_v1 \
+       tp-link_tl-wr802n_v1 \
+       tp-link_tl-wr810n_v1 \
+       tp-link_tl-wr820n_v1_CN \
        tp-link_tl-wr841n_v10 \
        tp-link_tl-wr841n_v11 \
        tp-link_tl-wr841n_v8 \
@@ -274,8 +274,8 @@ yuncore_cpe830 \
 zbtlink_zbt-we1526:
        @$(call build,256,1,ETH_CONFIG=_s27)
 
-tp-link_tl-wdr3600 \
-tp-link_tl-wdr43x0:
+tp-link_tl-wdr3600_v1 \
+tp-link_tl-wdr43x0_v1:
        @$(call build,123,1,ETH_CONFIG=_s17)
 
 unwireddevices_unwired-one:

diff --git a/u-boot/Makefile b/u-boot/Makefile
index b899ba9dbbd0bf51f9b06465156cb58ba48406b9..2a026e60d9167a449a8f8d5465c64382951caa18 100644 (file)
--- a/u-boot/Makefile
+++ b/u-boot/Makefile
@@ -494,23 +494,23 @@ p2w_r602n: qca953x_common
        @$(call define_add,CFG_ATH_GMAC_NMACS,2)
        @$(MKCONFIG) -a ap143 mips mips ap143 ar7240 ar7240
 
-tp-link_tl-mr10u: ar933x_common lsdk_kernel
-       @$(call config_init,TP-Link TL-MR10U,tl-mr10u,4,11,,QCA_AR933X_SOC)
+tp-link_tl-mr10u_v1: ar933x_common lsdk_kernel
+       @$(call config_init,TP-Link TL-MR10U v1,tl-mr10u-v1,4,11,,QCA_AR933X_SOC)
        @$(call define_add,CONFIG_FOR_TPLINK_MR10U_V1,1)
        @$(MKCONFIG) -a ap121 mips mips ap121 ar7240 ar7240
 
-tp-link_tl-mr13u: ar933x_common lsdk_kernel
-       @$(call config_init,TP-Link TL-MR13U,tl-mr13u,4,11,,QCA_AR933X_SOC)
+tp-link_tl-mr13u_v1: ar933x_common lsdk_kernel
+       @$(call config_init,TP-Link TL-MR13U v1,tl-mr13u-v1,4,11,,QCA_AR933X_SOC)
        @$(call define_add,CONFIG_FOR_TPLINK_MR13U_V1,1)
        @$(MKCONFIG) -a ap121 mips mips ap121 ar7240 ar7240
 
-tp-link_tl-mr3020: ar933x_common lsdk_kernel
-       @$(call config_init,TP-Link TL-MR3020,tl-mr3020,4,11,,QCA_AR933X_SOC)
+tp-link_tl-mr3020_v1: ar933x_common lsdk_kernel
+       @$(call config_init,TP-Link TL-MR3020 v1,tl-mr3020-v1,4,11,,QCA_AR933X_SOC)
        @$(call define_add,CONFIG_FOR_TPLINK_MR3020_V1,1)
        @$(MKCONFIG) -a ap121 mips mips ap121 ar7240 ar7240
 
-tp-link_tl-mr3040: ar933x_common lsdk_kernel
-       @$(call config_init,TP-Link TL-MR3040,tl-mr3040,4,11,,QCA_AR933X_SOC)
+tp-link_tl-mr3040_v1v2: ar933x_common lsdk_kernel
+       @$(call config_init,TP-Link TL-MR3040 v1/v2,tl-mr3040-v1v2,4,11,,QCA_AR933X_SOC)
        @$(call define_add,CONFIG_FOR_TPLINK_MR3040_V1V2,1)
        @$(MKCONFIG) -a ap121 mips mips ap121 ar7240 ar7240
 
@@ -564,16 +564,16 @@ tp-link_tl-wa850re_v2: qca953x_common lsdk_kernel
        @$(call define_add,CFG_ATH_GMAC_NMACS,2)
        @$(MKCONFIG) -a ap143 mips mips ap143 ar7240 ar7240
 
-tp-link_tl-wdr3500: ar934x_common lsdk_kernel
-       @$(call config_init,TP-Link TL-WDR3500,tl-wdr3500,8,16,1,QCA_AR9344_SOC)
+tp-link_tl-wdr3500_v1: ar934x_common lsdk_kernel
+       @$(call config_init,TP-Link TL-WDR3500 v1,tl-wdr3500-v1,8,16,1,QCA_AR9344_SOC)
        @$(call define_add,CONFIG_FOR_TPLINK_WDR3500_V1,1)
        @$(call define_add,CFG_ATHRS27_PHY,1)
        @$(call define_add,CFG_AG7240_NMACS,2)
        @$(call define_add,CONFIG_PCI,1)
        @$(MKCONFIG) -a db12x mips mips db12x ar7240 ar7240
 
-tp-link_tl-wdr3600: ar934x_common lsdk_kernel
-       @$(call config_init,TP-Link TL-WDR3600,tl-wdr3600,8,16,1,QCA_AR9344_SOC)
+tp-link_tl-wdr3600_v1: ar934x_common lsdk_kernel
+       @$(call config_init,TP-Link TL-WDR3600 v1,tl-wdr3600-v1,8,16,1,QCA_AR9344_SOC)
        @$(call define_add,CONFIG_FOR_TPLINK_WDR3600_V1,1)
        @$(call define_add,CFG_ATHRS17_PHY,1)
        @$(call define_add,CFG_AG7240_NMACS,1)
@@ -581,8 +581,8 @@ tp-link_tl-wdr3600: ar934x_common lsdk_kernel
        @$(call define_add,CFG_DUAL_PHY_SUPPORT,1)
        @$(MKCONFIG) -a db12x mips mips db12x ar7240 ar7240
 
-tp-link_tl-wdr43x0: ar934x_common lsdk_kernel
-       @$(call config_init,TP-Link TL-WDR43x0,tl-wdr43x0,8,16,1,QCA_AR9344_SOC)
+tp-link_tl-wdr43x0_v1: ar934x_common lsdk_kernel
+       @$(call config_init,TP-Link TL-WDR43x0 v1,tl-wdr43x0-v1,8,16,1,QCA_AR9344_SOC)
        @$(call define_add,CONFIG_FOR_TPLINK_WDR43X0_V1,1)
        @$(call define_add,CFG_ATHRS17_PHY,1)
        @$(call define_add,CFG_AG7240_NMACS,1)
@@ -590,13 +590,13 @@ tp-link_tl-wdr43x0: ar934x_common lsdk_kernel
        @$(call define_add,CFG_DUAL_PHY_SUPPORT,1)
        @$(MKCONFIG) -a db12x mips mips db12x ar7240 ar7240
 
-tp-link_tl-wr703n: ar933x_common lsdk_kernel
-       @$(call config_init,TP-Link TL-WR703N,tl-wr703n,4,11,,QCA_AR933X_SOC)
+tp-link_tl-wr703n_v1: ar933x_common lsdk_kernel
+       @$(call config_init,TP-Link TL-WR703N v1,tl-wr703n-v1,4,11,,QCA_AR933X_SOC)
        @$(call define_add,CONFIG_FOR_TPLINK_WR703N_V1,1)
        @$(MKCONFIG) -a ap121 mips mips ap121 ar7240 ar7240
 
-tp-link_tl-wr710n: ar933x_common lsdk_kernel
-       @$(call config_init,TP-Link TL-WR710N,tl-wr710n,8,11,,QCA_AR933X_SOC)
+tp-link_tl-wr710n_v1: ar933x_common lsdk_kernel
+       @$(call config_init,TP-Link TL-WR710N v1,tl-wr710n-v1,8,11,,QCA_AR933X_SOC)
        @$(call define_add,CONFIG_FOR_TPLINK_WR710N_V1,1)
        @$(MKCONFIG) -a ap121 mips mips ap121 ar7240 ar7240
 
@@ -610,24 +610,24 @@ tp-link_tl-wr740n_v4: ar933x_common lsdk_kernel
        @$(call define_add,CONFIG_FOR_TPLINK_WR740N_V4,1)
        @$(MKCONFIG) -a ap121 mips mips ap121 ar7240 ar7240
 
-tp-link_tl-wr802n: qca953x_common lsdk_kernel
-       @$(call config_init,TP-Link TL-WR802N,tl-wr802n,4,12,1,QCA_QCA953X_SOC)
-       @$(call define_add,CONFIG_FOR_TPLINK_WR802N,1)
+tp-link_tl-wr802n_v1: qca953x_common lsdk_kernel
+       @$(call config_init,TP-Link TL-WR802N v1,tl-wr802n-v1,4,12,1,QCA_QCA953X_SOC)
+       @$(call define_add,CONFIG_FOR_TPLINK_WR802N_V1,1)
        @$(call define_add,CFG_ATHRS27_PHY,1)
        @$(call define_add,CFG_ATH_GMAC_NMACS,2)
        @$(MKCONFIG) -a ap143 mips mips ap143 ar7240 ar7240
 
-tp-link_tl-wr810n: qca953x_common lsdk_kernel
-       @$(call config_init,TP-Link TL-WR810N,tl-wr810n,8,12,1,QCA_QCA953X_SOC)
-       @$(call define_add,CONFIG_FOR_TPLINK_WR810N,1)
+tp-link_tl-wr810n_v1: qca953x_common lsdk_kernel
+       @$(call config_init,TP-Link TL-WR810N v1,tl-wr810n-v1,8,12,1,QCA_QCA953X_SOC)
+       @$(call define_add,CONFIG_FOR_TPLINK_WR810N_V1,1)
        @$(call define_add,CONFIG_USB,1)
        @$(call define_add,CFG_ATHRS27_PHY,1)
        @$(call define_add,CFG_ATH_GMAC_NMACS,2)
        @$(MKCONFIG) -a ap143 mips mips ap143 ar7240 ar7240
 
-tp-link_tl-wr820n_CN: qca953x_common lsdk_kernel
-       @$(call config_init,TP-Link TL-WR820N CN,tl-wr820n,4,12,1,QCA_QCA953X_SOC)
-       @$(call define_add,CONFIG_FOR_TPLINK_WR820N_CN,1)
+tp-link_tl-wr820n_v1_CN: qca953x_common lsdk_kernel
+       @$(call config_init,TP-Link TL-WR820N v1 CN,tl-wr820n-v1,4,12,1,QCA_QCA953X_SOC)
+       @$(call define_add,CONFIG_FOR_TPLINK_WR820N_V1_CN,1)
        @$(call define_add,CONFIG_USB,1)
        @$(call define_add,CFG_ATHRS27_PHY,1)
        @$(call define_add,CFG_ATH_GMAC_NMACS,2)

diff --git a/u-boot/include/configs/ap143.h b/u-boot/include/configs/ap143.h
index 4b130a3fe0f489c0045c017d85a5dbc54ebafbb5..ce054572bec3301244b8be43e70a7f848c3bf441 100644 (file)
--- a/u-boot/include/configs/ap143.h
+++ b/u-boot/include/configs/ap143.h
@@ -85,7 +85,7 @@
        #define CONFIG_QCA_GPIO_MASK_OUT_INIT_H GPIO15 |\
                                                CONFIG_QCA_GPIO_MASK_LED_ACT_L
 
-#elif defined(CONFIG_FOR_TPLINK_WR810N)
+#elif defined(CONFIG_FOR_TPLINK_WR810N_V1)
 
        #define CONFIG_QCA_GPIO_MASK_LED_ACT_L  GPIO13
        #define CONFIG_QCA_GPIO_MASK_OUT        GPIO11 |\
@@ -94,8 +94,8 @@
        #define CONFIG_QCA_GPIO_MASK_OUT_INIT_H GPIO11 |\
                                                CONFIG_QCA_GPIO_MASK_LED_ACT_L
 
-#elif defined(CONFIG_FOR_TPLINK_WR820N_CN) ||\
-      defined(CONFIG_FOR_TPLINK_WR802N)
+#elif defined(CONFIG_FOR_TPLINK_WR820N_V1_CN) ||\
+      defined(CONFIG_FOR_TPLINK_WR802N_V1)
 
        #define CONFIG_QCA_GPIO_MASK_LED_ACT_L  GPIO13
        #define CONFIG_QCA_GPIO_MASK_OUT        CONFIG_QCA_GPIO_MASK_LED_ACT_L
@@ -217,13 +217,13 @@
                                "mtdparts=spi0.0:256k(u-boot),64k(u-boot-env),14528k(rootfs),1472k(kernel),64k(art),16000k(firmware)"
 
 #elif defined(CONFIG_FOR_TPLINK_MR6400_V1V2) ||\
-      defined(CONFIG_FOR_TPLINK_WR810N)
+      defined(CONFIG_FOR_TPLINK_WR810N_V1)
 
        #define CONFIG_BOOTARGS "console=ttyS0,115200 root=31:02 "\
                                "rootfstype=squashfs init=/sbin/init "\
                                "mtdparts=ath-nor0:128k(u-boot),1024k(kernel),6912k(rootfs),64k(config),64k(art)"
 
-#elif defined(CONFIG_FOR_TPLINK_WR820N_CN)
+#elif defined(CONFIG_FOR_TPLINK_WR820N_V1_CN)
 
        #define CONFIG_BOOTARGS "console=ttyS0,115200 root=31:02 "\
                                "rootfstype=squashfs init=/sbin/init "\
@@ -234,7 +234,7 @@
       defined(CONFIG_FOR_TPLINK_WR841N_V10) ||\
       defined(CONFIG_FOR_TPLINK_WR841N_V11) ||\
       defined(CONFIG_FOR_TPLINK_WR841N_V9)  ||\
-      defined(CONFIG_FOR_TPLINK_WR802N)
+      defined(CONFIG_FOR_TPLINK_WR802N_V1)
 
        #define CONFIG_BOOTARGS "console=ttyS0,115200 root=31:02 "\
                                "rootfstype=squashfs init=/sbin/init "\
@@ -267,9 +267,9 @@
     defined(CONFIG_FOR_TPLINK_MR3420_V3)    ||\
     defined(CONFIG_FOR_TPLINK_MR6400_V1V2)  ||\
     defined(CONFIG_FOR_TPLINK_WA850RE_V2)   ||\
-    defined(CONFIG_FOR_TPLINK_WR802N)       ||\
-    defined(CONFIG_FOR_TPLINK_WR810N)       ||\
-    defined(CONFIG_FOR_TPLINK_WR820N_CN)    ||\
+    defined(CONFIG_FOR_TPLINK_WR802N_V1)    ||\
+    defined(CONFIG_FOR_TPLINK_WR810N_V1)    ||\
+    defined(CONFIG_FOR_TPLINK_WR820N_V1_CN) ||\
     defined(CONFIG_FOR_TPLINK_WR841N_V10)   ||\
     defined(CONFIG_FOR_TPLINK_WR841N_V11)   ||\
     defined(CONFIG_FOR_TPLINK_WR841N_V9)    ||\
@@ -315,16 +315,16 @@
        #define CFG_ENV_ADDR            0x9F040000
        #define CFG_ENV_SIZE            0xFC00
        #define CFG_ENV_SECT_SIZE       0x10000
-#elif defined(CONFIG_FOR_TPLINK_MR3420_V3)   ||\
-      defined(CONFIG_FOR_TPLINK_MR6400_V1V2) ||\
-      defined(CONFIG_FOR_TPLINK_WA850RE_V2)  ||\
-      defined(CONFIG_FOR_TPLINK_WR802N)      ||\
-      defined(CONFIG_FOR_TPLINK_WR810N)      ||\
-      defined(CONFIG_FOR_TPLINK_WR820N_CN)   ||\
-      defined(CONFIG_FOR_TPLINK_WR841N_V10)  ||\
-      defined(CONFIG_FOR_TPLINK_WR841N_V11)  ||\
-      defined(CONFIG_FOR_TPLINK_WR841N_V9)   ||\
-      defined(CONFIG_FOR_TPLINK_WR842N_V3)   ||\
+#elif defined(CONFIG_FOR_TPLINK_MR3420_V3)    ||\
+      defined(CONFIG_FOR_TPLINK_MR6400_V1V2)  ||\
+      defined(CONFIG_FOR_TPLINK_WA850RE_V2)   ||\
+      defined(CONFIG_FOR_TPLINK_WR802N_V1)    ||\
+      defined(CONFIG_FOR_TPLINK_WR810N_V1)    ||\
+      defined(CONFIG_FOR_TPLINK_WR820N_V1_CN) ||\
+      defined(CONFIG_FOR_TPLINK_WR841N_V10)   ||\
+      defined(CONFIG_FOR_TPLINK_WR841N_V11)   ||\
+      defined(CONFIG_FOR_TPLINK_WR841N_V9)    ||\
+      defined(CONFIG_FOR_TPLINK_WR842N_V3)    ||\
       defined(CONFIG_FOR_TPLINK_WR902AC_V1)
        #define CFG_ENV_ADDR            0x9F01EC00
        #define CFG_ENV_SIZE            0x1000
@@ -368,14 +368,14 @@
        #define OFFSET_MAC_DATA_BLOCK           0x3c0000
        #define OFFSET_MAC_DATA_BLOCK_LENGTH    0x010000
        #define OFFSET_MAC_ADDRESS              0x000008
-#elif defined(CONFIG_FOR_TPLINK_MR3420_V3)   ||\
-      defined(CONFIG_FOR_TPLINK_MR6400_V1V2) ||\
-      defined(CONFIG_FOR_TPLINK_WR802N)      ||\
-      defined(CONFIG_FOR_TPLINK_WR810N)      ||\
-      defined(CONFIG_FOR_TPLINK_WR820N_CN)   ||\
-      defined(CONFIG_FOR_TPLINK_WR841N_V10)  ||\
-      defined(CONFIG_FOR_TPLINK_WR841N_V11)  ||\
-      defined(CONFIG_FOR_TPLINK_WR841N_V9)   ||\
+#elif defined(CONFIG_FOR_TPLINK_MR3420_V3)    ||\
+      defined(CONFIG_FOR_TPLINK_MR6400_V1V2)  ||\
+      defined(CONFIG_FOR_TPLINK_WR802N_V1)    ||\
+      defined(CONFIG_FOR_TPLINK_WR810N_V1)    ||\
+      defined(CONFIG_FOR_TPLINK_WR820N_V1_CN) ||\
+      defined(CONFIG_FOR_TPLINK_WR841N_V10)   ||\
+      defined(CONFIG_FOR_TPLINK_WR841N_V11)   ||\
+      defined(CONFIG_FOR_TPLINK_WR841N_V9)    ||\
       defined(CONFIG_FOR_TPLINK_WR842N_V3)
        #define OFFSET_MAC_DATA_BLOCK           0x010000
        #define OFFSET_MAC_DATA_BLOCK_LENGTH    0x010000
@@ -433,9 +433,9 @@
     defined(CONFIG_FOR_COMFAST_CF_E530N)    ||\
     defined(CONFIG_FOR_TPLINK_MR3420_V3)    ||\
     defined(CONFIG_FOR_TPLINK_MR6400_V1V2)  ||\
-    defined(CONFIG_FOR_TPLINK_WR802N)       ||\
-    defined(CONFIG_FOR_TPLINK_WR810N)       ||\
-    defined(CONFIG_FOR_TPLINK_WR820N_CN)    ||\
+    defined(CONFIG_FOR_TPLINK_WR802N_V1)    ||\
+    defined(CONFIG_FOR_TPLINK_WR810N_V1)    ||\
+    defined(CONFIG_FOR_TPLINK_WR820N_V1_CN) ||\
     defined(CONFIG_FOR_TPLINK_WR841N_V10)   ||\
     defined(CONFIG_FOR_TPLINK_WR841N_V11)   ||\
     defined(CONFIG_FOR_TPLINK_WR841N_V9)    ||\
@@ -459,9 +459,9 @@
  * PLL/Clocks configuration
  * ========================
  */
-#if defined(CONFIG_FOR_TPLINK_WA850RE_V2) ||\
-    defined(CONFIG_FOR_TPLINK_WR802N)     ||\
-    defined(CONFIG_FOR_TPLINK_WR820N_CN)  ||\
+#if defined(CONFIG_FOR_TPLINK_WA850RE_V2)   ||\
+    defined(CONFIG_FOR_TPLINK_WR802N_V1)    ||\
+    defined(CONFIG_FOR_TPLINK_WR820N_V1_CN) ||\
     defined(CONFIG_FOR_TPLINK_WR841N_V9)
        #define CONFIG_QCA_PLL  QCA_PLL_PRESET_550_400_200
 #else
@@ -475,9 +475,9 @@
     defined(CONFIG_FOR_TPLINK_MR3420_V3)    ||\
     defined(CONFIG_FOR_TPLINK_MR6400_V1V2)  ||\
     defined(CONFIG_FOR_TPLINK_WA850RE_V2)   ||\
-    defined(CONFIG_FOR_TPLINK_WR802N)       ||\
-    defined(CONFIG_FOR_TPLINK_WR810N)       ||\
-    defined(CONFIG_FOR_TPLINK_WR820N_CN)    ||\
+    defined(CONFIG_FOR_TPLINK_WR802N_V1)    ||\
+    defined(CONFIG_FOR_TPLINK_WR810N_V1)    ||\
+    defined(CONFIG_FOR_TPLINK_WR820N_V1_CN) ||\
     defined(CONFIG_FOR_TPLINK_WR841N_V10)   ||\
     defined(CONFIG_FOR_TPLINK_WR841N_V11)   ||\
     defined(CONFIG_FOR_TPLINK_WR841N_V9)    ||\