From 4fbf43bf76f26125d4b09c3fade88108ba526acc Mon Sep 17 00:00:00 2001 From: Piotr Dymacz Date: Sun, 4 Feb 2018 19:21:42 +0100 Subject: [PATCH] Add support for WHQX E600G/AC (QCA9531 based) --- Makefile | 2 ++ README.md | 2 ++ u-boot/Makefile | 18 ++++++++++++++ u-boot/include/configs/ap143.h | 43 ++++++++++++++++++++++++++++++---- 4 files changed, 61 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index fdeb44a..aadf8e3 100644 --- a/Makefile +++ b/Makefile @@ -281,6 +281,8 @@ p2w_cpe505n \ p2w_r602n \ yuncore_ap90q \ yuncore_cpe830 \ +whqx_e600g \ +whqx_e600gac \ zbtlink_zbt-we1526: @$(call build,256,1,ETH_CONFIG=_s27) diff --git a/README.md b/README.md index 3cfed26..ebc24d6 100644 --- a/README.md +++ b/README.md @@ -125,6 +125,7 @@ Currently supported devices: - TP-Link TL-WR842N/D v3 - TP-Link TL-WR902AC v1 - Wallys DR531 + - WHQX E600G/AC - YunCore AP90Q - YunCore CPE830 - Zbtlink ZBT-WE1526 @@ -188,6 +189,7 @@ More information about supported devices: | TP-Link TL-WR902AC v1 | QCA9531 | 8 MiB | 64 MiB DDR2 | 128 KiB, LZMA | RO | | Village Telco Mesh Potato 2 | AR9331 | 16 MiB | 64 MiB DDR1 | 192 KiB | R/W | | Wallys DR531 | QCA9531 | 8 MiB | 64 MiB DDR2 | 192 KiB | R/W | +| WHQX E600G/AC | QCA9531 | 8/16 MiB | 64/128 MiB DDR2 | 256 KiB | R/W | | YunCore AP90Q | QCA9531 | 16 MiB | 128 MiB DDR2 | 256 KiB | R/W | | YunCore CPE830 | QCA9531 | 16 MiB | 64 MiB DDR2 | 256 KiB | R/W | | YunCore CPE870 | AR9341 | 8 MiB | 64 MiB DDR2 | 64 KiB, LZMA | R/W | diff --git a/u-boot/Makefile b/u-boot/Makefile index a11808b..09fcc47 100644 --- a/u-boot/Makefile +++ b/u-boot/Makefile @@ -764,6 +764,24 @@ wallys_dr531: qca953x_common @$(call define_add,CONFIG_PCI,1) @$(MKCONFIG) -a ap143 mips mips ap143 ar7240 ar7240 +whqx_e600g: qca953x_common + @$(call config_init,WHQX E600G,e600g,16,17,1,QCA_QCA9531_SOC) + @$(call define_add,CONFIG_FOR_WHQX_E600G,1) + @$(call define_add,CONFIG_USB,1) + @$(call define_add,CFG_ATHRS27_PHY,1) + @$(call define_add,CFG_ATH_GMAC_NMACS,2) + @$(call define_add,CONFIG_PCI,1) + @$(MKCONFIG) -a ap143 mips mips ap143 ar7240 ar7240 + +whqx_e600gac: qca953x_common + @$(call config_init,WHQX E600GAC,e600gac,16,17,1,QCA_QCA9531_SOC) + @$(call define_add,CONFIG_FOR_WHQX_E600GAC,1) + @$(call define_add,CONFIG_USB,1) + @$(call define_add,CFG_ATHRS27_PHY,1) + @$(call define_add,CFG_ATH_GMAC_NMACS,2) + @$(call define_add,CONFIG_PCI,1) + @$(MKCONFIG) -a ap143 mips mips ap143 ar7240 ar7240 + yuncore_ap90q: qca953x_common @$(call config_init,YunCore AP90Q,ap90q,16,17,1,QCA_QCA9531_SOC) @$(call define_add,CONFIG_FOR_YUNCORE_AP90Q,1) diff --git a/u-boot/include/configs/ap143.h b/u-boot/include/configs/ap143.h index 0eb7bb2..6c785e5 100644 --- a/u-boot/include/configs/ap143.h +++ b/u-boot/include/configs/ap143.h @@ -147,6 +147,17 @@ #define CONFIG_QCA_GPIO_MASK_LED_ACT_L GPIO11 | GPIO12 | GPIO13 |\ GPIO14 | GPIO15 | GPIO16 +#elif defined(CONFIG_FOR_WHQX_E600G) + + #define CONFIG_QCA_GPIO_MASK_LED_ACT_L GPIO4 | GPIO13 | GPIO15 | GPIO16 + +#elif defined(CONFIG_FOR_WHQX_E600GAC) + + #define CONFIG_QCA_GPIO_MASK_LED_ACT_L GPIO4 | GPIO11 | GPIO12 |\ + GPIO13 | GPIO14 | GPIO15 |\ + GPIO16 + #define CONFIG_QCA_GPIO_MASK_IN GPIO1 + #elif defined(CONFIG_FOR_YUNCORE_AP90Q) #define CONFIG_QCA_GPIO_MASK_LED_ACT_L GPIO4 | GPIO12 | GPIO16 @@ -251,6 +262,13 @@ "rootfstype=jffs2 init=/sbin/init "\ "mtdparts=ath-nor0:256k(u-boot),64k(u-boot-env),6336k(rootfs),1408k(uImage),64k(mib0),64k(ART)" +#elif defined(CONFIG_FOR_WHQX_E600G) ||\ + defined(CONFIG_FOR_WHQX_E600GAC) + +#define CONFIG_BOOTARGS "console=ttyS0,115200 root=31:02 "\ + "rootfstype=jffs2 init=/sbin/init "\ + "mtdparts=ath-nor0:256k(u-boot),64k(u-boot-env),14528k(rootfs),1408k(uImage),64k(mib0),64k(ART)" + #endif /* @@ -292,7 +310,9 @@ #define CFG_LOAD_ADDR 0x9F050000 -#elif defined(CONFIG_FOR_GLINET_GL_AR750) +#elif defined(CONFIG_FOR_GLINET_GL_AR750) ||\ + defined(CONFIG_FOR_WHQX_E600G) ||\ + defined(CONFIG_FOR_WHQX_E600GAC) #define CFG_LOAD_ADDR 0x9F060000 @@ -332,7 +352,9 @@ #define CFG_ENV_SECT_SIZE 0x10000 #elif defined(CONFIG_FOR_GLINET_GL_AR300M_LITE) ||\ - defined(CONFIG_FOR_GLINET_GL_AR750) + defined(CONFIG_FOR_GLINET_GL_AR750) ||\ + defined(CONFIG_FOR_WHQX_E600G) ||\ + defined(CONFIG_FOR_WHQX_E600GAC) #define CFG_ENV_ADDR 0x9F040000 #define CFG_ENV_SIZE 0x10000 @@ -456,6 +478,13 @@ #define OFFSET_MAC_DATA_BLOCK_LENGTH 0x010000 #define OFFSET_MAC_ADDRESS 0x00F810 +#elif defined(CONFIG_FOR_WHQX_E600G) ||\ + defined(CONFIG_FOR_WHQX_E600GAC) + + #define OFFSET_MAC_DATA_BLOCK 0x50000 + #define OFFSET_MAC_DATA_BLOCK_LENGTH 0x10000 + #define OFFSET_MAC_ADDRESS 0x00400 + #endif /* @@ -538,7 +567,9 @@ #define WEBFAILSAFE_UPLOAD_LIMITED_AREA_IN_BYTES (384 * 1024) -#elif defined(CONFIG_FOR_TPLINK_WA850RE_V2) +#elif defined(CONFIG_FOR_TPLINK_WA850RE_V2) ||\ + defined(CONFIG_FOR_WHQX_E600G) ||\ + defined(CONFIG_FOR_WHQX_E600GAC) #define WEBFAILSAFE_UPLOAD_LIMITED_AREA_IN_BYTES (448 * 1024) @@ -599,7 +630,9 @@ #define CONFIG_QCA_PLL_IN_FLASH_BLOCK_OFFSET 0xFF0000 #define CONFIG_QCA_PLL_IN_FLASH_BLOCK_SIZE 0x010000 -#elif defined(CONFIG_FOR_GLINET_GL_AR750) +#elif defined(CONFIG_FOR_GLINET_GL_AR750) ||\ + defined(CONFIG_FOR_WHQX_E600G) ||\ + defined(CONFIG_FOR_WHQX_E600GAC) #define CONFIG_QCA_PLL_IN_FLASH_BLOCK_OFFSET 0x50000 #define CONFIG_QCA_PLL_IN_FLASH_BLOCK_SIZE 0x10000 @@ -635,6 +668,8 @@ !defined(CONFIG_FOR_P2W_CPE505N) &&\ !defined(CONFIG_FOR_P2W_R602N) &&\ !defined(CONFIG_FOR_WALLYS_DR531) &&\ + !defined(CONFIG_FOR_WHQX_E600G) &&\ + !defined(CONFIG_FOR_WHQX_E600GAC) &&\ !defined(CONFIG_FOR_YUNCORE_AP90Q) &&\ !defined(CONFIG_FOR_YUNCORE_CPE830) &&\ !defined(CONFIG_FOR_ZBTLINK_ZBT_WE1526) -- 2.25.1