From: Piotr Dymacz <pepe2k@gmail.com>
Date: Fri, 23 Sep 2016 16:40:20 +0000 (+0200)
Subject: Split TP-Link TL-WA801NDv2 and TL-WA830REv2 profiles, build separate images for them
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6280ec8cbcd7d1bc0e64bc2a8b768898944ede59;p=oweals%2Fu-boot_mod.git

Split TP-Link TL-WA801NDv2 and TL-WA830REv2 profiles, build separate images for them
---

diff --git a/Makefile b/Makefile
index 4a23ceb..679f65b 100644
--- a/Makefile
+++ b/Makefile
@@ -204,7 +204,8 @@ $(COMMON_AR933X_TARGETS):
 
 COMMON_ETHS27_TARGETS = \
 	tp-link_tl-mr3420_v2 \
-	tp-link_tl-wa830re_v2_tl-wa801nd_v2 \
+	tp-link_tl-wa801nd_v2 \
+	tp-link_tl-wa830re_v2 \
 	tp-link_tl-wdr3500 \
 	tp-link_tl-wr802n \
 	tp-link_tl-wr820n_CN \
diff --git a/u-boot/Makefile b/u-boot/Makefile
index 458c311..cbc9f0d 100644
--- a/u-boot/Makefile
+++ b/u-boot/Makefile
@@ -463,9 +463,16 @@ tp-link_tl-mr3420_v2: ar934x_common
 	@$(call define_add,CFG_AG7240_NMACS,2)
 	@$(MKCONFIG) -a db12x mips mips db12x ar7240 ar7240
 
-tp-link_tl-wa830re_v2_tl-wa801nd_v2: ar934x_common
-	@$(call config_init,TP-Link TL-WA830RE/TL-WA801ND v2,tl-wa830re-801nd-v2,4,17,1,QCA_AR9341_SOC)
-	@$(call define_add,CONFIG_FOR_TPLINK_WA830RE_V2_WA801ND_V2,1)
+tp-link_tl-wa801nd_v2: ar934x_common
+	@$(call config_init,TP-Link TL-WA801ND v2,tl-wa801nd-v2,4,17,1,QCA_AR9341_SOC)
+	@$(call define_add,CONFIG_FOR_TPLINK_WA801ND_V2,1)
+	@$(call define_add,CFG_ATHRS27_PHY,1)
+	@$(call define_add,CFG_AG7240_NMACS,2)
+	@$(MKCONFIG) -a db12x mips mips db12x ar7240 ar7240
+
+tp-link_tl-wa830re_v2: ar934x_common
+	@$(call config_init,TP-Link TL-WA830RE v2,tl-wa830re-v2,4,17,1,QCA_AR9341_SOC)
+	@$(call define_add,CONFIG_FOR_TPLINK_WA830RE_V2,1)
 	@$(call define_add,CFG_ATHRS27_PHY,1)
 	@$(call define_add,CFG_AG7240_NMACS,2)
 	@$(MKCONFIG) -a db12x mips mips db12x ar7240 ar7240
diff --git a/u-boot/include/configs/db12x.h b/u-boot/include/configs/db12x.h
index 59846e6..f65f443 100644
--- a/u-boot/include/configs/db12x.h
+++ b/u-boot/include/configs/db12x.h
@@ -63,7 +63,8 @@
 	#define CONFIG_QCA_GPIO_MASK_IN		GPIO16 | GPIO17
 	#define CONFIG_QCA_GPIO_MASK_OUT_INIT_H	CONFIG_QCA_GPIO_MASK_LED_ACT_L
 
-#elif defined(CONFIG_FOR_TPLINK_WA830RE_V2_WA801ND_V2)
+#elif defined(CONFIG_FOR_TPLINK_WA801ND_V2) ||\
+      defined(CONFIG_FOR_TPLINK_WA830RE_V2)
 
 	#define CONFIG_QCA_GPIO_MASK_LED_ACT_L	GPIO13 | GPIO14 | GPIO15 |\
 						GPIO18
@@ -148,11 +149,12 @@
  */
 #define CONFIG_QCA_PLL	QCA_PLL_PRESET_550_400_200
 
-#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)            ||\
+#if defined(CONFIG_FOR_TPLINK_MR3420_V2)  ||\
+    defined(CONFIG_FOR_TPLINK_WA801ND_V2) ||\
+    defined(CONFIG_FOR_TPLINK_WA830RE_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