Split TP-Link TL-WDR3600 and TL-WDR43x0 profiles, build separate images for them

diff --git a/Makefile b/Makefile
index 722832a9b69dc3d1ddf2621f9d407b1f50c2ce0a..4a23ceb553078b7e78200c44d7b76dad5c01d074 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -228,7 +228,8 @@ d-link_dir-505:
 dragino_v2_ms14:
        @$(call build,192,1,DEVICE_VENDOR=dragino)
 
-tp-link_tl-wdr3600_tl-43x0:
+tp-link_tl-wdr3600 \
+tp-link_tl-wdr43x0:
        @$(call build,123,1,ETH_CONFIG=_s17)
 
 unwireddevices_unwired-one:

diff --git a/u-boot/Makefile b/u-boot/Makefile
index 92bcbe3c58d3aac44f2cc77133e76f3c4e625621..458c3112c5b5cb7920384809f97c1524bf1245ba 100644 (file)
--- a/u-boot/Makefile
+++ b/u-boot/Makefile
@@ -478,9 +478,18 @@ tp-link_tl-wdr3500: ar934x_common
        @$(call define_add,CONFIG_PCI,1)
        @$(MKCONFIG) -a db12x mips mips db12x ar7240 ar7240
 
-tp-link_tl-wdr3600_tl-43x0: ar934x_common
-       @$(call config_init,TP-Link TL-WDR3600/43x0,tl-wdr3600-43x0,8,16,1,QCA_AR9344_SOC)
-       @$(call define_add,CONFIG_FOR_TPLINK_WDR3600_WDR43X0_V1,1)
+tp-link_tl-wdr3600: ar934x_common
+       @$(call config_init,TP-Link TL-WDR3600,tl-wdr3600,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)
+       @$(call define_add,CONFIG_PCI,1)
+       @$(call define_add,CFG_DUAL_PHY_SUPPORT,1)
+       @$(MKCONFIG) -a db12x mips mips db12x ar7240 ar7240
+
+tp-link_tl-wdr43x0: ar934x_common
+       @$(call config_init,TP-Link TL-WDR3600,tl-wdr43x0,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)
        @$(call define_add,CONFIG_PCI,1)

diff --git a/u-boot/include/configs/db12x.h b/u-boot/include/configs/db12x.h
index c95cdfa0460cd4dc2aa9680030e76cacd875e386..59846e68edf0122e250a69bc22e088c1fa21c2a8 100644 (file)
--- a/u-boot/include/configs/db12x.h
+++ b/u-boot/include/configs/db12x.h
@@ -21,7 +21,8 @@
  * GPIO configuration
  * ==================
  */
-#if defined(CONFIG_FOR_TPLINK_WDR3600_WDR43X0_V1)
+#if defined(CONFIG_FOR_TPLINK_WDR3600_V1) ||\
+    defined(CONFIG_FOR_TPLINK_WDR43X0_V1)
 
        #define CONFIG_QCA_GPIO_MASK_LED_ACT_L  GPIO11 | GPIO12 | GPIO13 |\
                                                GPIO14 | GPIO15
@@ -77,8 +78,9 @@
  * Default bootargs
  * ================
  */
-#if defined(CONFIG_FOR_TPLINK_WDR3600_WDR43X0_V1) ||\
-    defined(CONFIG_FOR_TPLINK_WDR3500_V1)
+#if defined(CONFIG_FOR_TPLINK_WDR3500_V1) ||\
+    defined(CONFIG_FOR_TPLINK_WDR3600_V1) ||\
+    defined(CONFIG_FOR_TPLINK_WDR43X0_V1)
 
        #define CONFIG_BOOTARGS "console=ttyS0,115200 root=31:02 "\
                                "rootfstype=squashfs init=/sbin/init "\
@@ -146,11 +148,12 @@
  */
 #define CONFIG_QCA_PLL QCA_PLL_PRESET_550_400_200
 
-#if defined(CONFIG_FOR_TPLINK_WDR3600_WDR43X0_V1) ||\
-    defined(CONFIG_FOR_TPLINK_WDR3500_V1)         ||\
-    defined(CONFIG_FOR_TPLINK_MR3420_V2)          ||\
-    defined(CONFIG_FOR_TPLINK_WR841N_V8)          ||\
-    defined(CONFIG_FOR_TPLINK_WA830RE_V2_WA801ND_V2)
+#if defined(CONFIG_FOR_TPLINK_MR3420_V2)             ||\
+    defined(CONFIG_FOR_TPLINK_WA830RE_V2_WA801ND_V2) ||\
+    defined(CONFIG_FOR_TPLINK_WDR3600_V1)            ||\
+    defined(CONFIG_FOR_TPLINK_WDR43X0_V1)            ||\
+    defined(CONFIG_FOR_TPLINK_WDR3500_V1)            ||\
+    defined(CONFIG_FOR_TPLINK_WR841N_V8)
 
        #define CONFIG_QCA_PLL_IN_FLASH_BLOCK_OFFSET    0x10000
        #define CONFIG_QCA_PLL_IN_FLASH_BLOCK_SIZE      0x10000