From 04033752e6d542022058510917f7c66b2faefc5b Mon Sep 17 00:00:00 2001 From: Piotr Dymacz Date: Fri, 16 Sep 2016 01:16:24 +0200 Subject: [PATCH] Add support for Comfast CF-E314N (QCA9531 based) --- Makefile | 1 + README.md | 6 +++-- READMEPL.md | 6 +++-- u-boot/Makefile | 7 ++++++ u-boot/include/configs/ap143.h | 40 +++++++++++++++++++++++++--------- 5 files changed, 46 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index a2812a7..3db4ffa 100644 --- a/Makefile +++ b/Makefile @@ -217,6 +217,7 @@ $(COMMON_ETHS27_TARGETS): 8devices_carambola2: @$(call build,256,1) +comfast_cf-e314n \ comfast_cf-e320n_v2 \ comfast_cf-e520n_cf-e530n: @$(call build,64,1,ETH_CONFIG=_s27) diff --git a/README.md b/README.md index a3cfdf3..fb2db4c 100644 --- a/README.md +++ b/README.md @@ -94,8 +94,9 @@ Currently supported devices: - TP-Link TL-WR802N - Wallys DR531 - Zbtlink ZBT-WE1526 - - Comfast CF-E520N/CF-E530N + - Comfast CF-E314N - Comfast CF-E320N v2 + - Comfast CF-E520N/CF-E530N I tested this modification on most of these devices, with OpenWrt and OFW firmware. If you are not sure about the version of your device, please contact with me **before** you try to make an upgrade. Changing bootloader to a wrong version will probably damage your router and you will need special hardware to fix it, so please, **be very careful**. @@ -131,8 +132,9 @@ More information about supported devices: | [TP-Link TL-WR802N](https://wikidevi.com/wiki/TP-LINK_TL-WR802N_v1.0) | QCA9533 | 4 MiB | 32 MiB DDR1 | 64 KiB, LZMA | RO | | Wallys DR531 | QCA9531 | 8 MiB | 64 MiB DDR2 | 192 KiB | R/W | | Zbtlink ZBT-WE1526 | QCA9531 | 16 MiB | 128 MiB DDR2 | 256 KiB | R/W | -| Comfast CF-E520N/CF-E530N | QCA9531 | 8 MiB | 32 MiB DDR2 | 64 KiB, LZMA | RO | +| Comfast CF-E314N | QCA9531 | 16 MiB | 64 MiB DDR2 | 64 KiB, LZMA | RO | | Comfast CF-E320N v2 | QCA9531 | 16 MiB | 64 MiB DDR2 | 64 KiB, LZMA | RO | +| Comfast CF-E520N/CF-E530N | QCA9531 | 8 MiB | 32 MiB DDR2 | 64 KiB, LZMA | RO | *(LZMA) - U-Boot binary image is compressed with LZMA.* *(R/W) - environment exists in separate FLASH block which allows you to save it and keep after power down.* diff --git a/READMEPL.md b/READMEPL.md index 2b8c20c..d562080 100644 --- a/READMEPL.md +++ b/READMEPL.md @@ -91,8 +91,9 @@ Lista obecnie wspieranych urządzeń: - TP-Link TL-WR802N - Wallys DR531 - Zbtlink ZBT-WE1526 - - Comfast CF-E520N/CF-E530N + - Comfast CF-E314N - Comfast CF-E320N v2 + - Comfast CF-E520N/CF-E530N Przetestowałem swoją modyfikację na większości z wymienionych powyżej urządzeń, z obrazami OpenWrt i oficjalnym firmware producenta. Jeżeli nie jesteś pewien wersji sprzętowej swojego urządzenia, proszę skontaktuj się ze mną **zanim** dokonasz wymiany obrazu bootloadera. Zmiana na niewłaściwą wersję najprawdopodobniej doprowadzi do uszkodzenia Twojego urządzenia i jedyną możliwością jego ponownego uruchomienia będzie przeprogramowanie kości FLASH w zewnętrznym programatorze. @@ -128,8 +129,9 @@ Dodatkowe informacje o wspieranych urządzeniach: | [TP-Link TL-WR802N](https://wikidevi.com/wiki/TP-LINK_TL-WR802N_v1.0) | QCA9533 | 4 MiB | 32 MiB DDR1 | 64 KiB, LZMA | RO | | Wallys DR531 | QCA9531 | 8 MiB | 64 MiB DDR2 | 192 KiB | R/W | | Zbtlink ZBT-WE1526 | QCA9531 | 16 MiB | 128 MiB DDR2 | 256 KiB | R/W | -| Comfast CF-E520N/CF-E530N | QCA9531 | 8 MiB | 32 MiB DDR2 | 64 KiB, LZMA | RO | +| Comfast CF-E314N | QCA9531 | 16 MiB | 64 MiB DDR2 | 64 KiB, LZMA | RO | | Comfast CF-E320N v2 | QCA9531 | 16 MiB | 64 MiB DDR2 | 64 KiB, LZMA | RO | +| Comfast CF-E520N/CF-E530N | QCA9531 | 8 MiB | 32 MiB DDR2 | 64 KiB, LZMA | RO | *(LZMA) - obraz binarny U-Boot został dodatkowo skompresowany przy pomocy LZMA.* *(R/W) - zmienne środowiskowe przechowywane są w osobnym bloku FLASH, co pozwala na ich zachowanie po odłączeniu zasilaniu.* diff --git a/u-boot/Makefile b/u-boot/Makefile index 1aa7a72..8c8f9ea 100644 --- a/u-boot/Makefile +++ b/u-boot/Makefile @@ -387,6 +387,13 @@ qca953x_common: unconfig config_common @$(call define_add,CONFIG_FOR_8DEVICES_CARAMBOLA2,1) @$(MKCONFIG) -a ap121 mips mips ap121 ar7240 ar7240 +comfast_cf-e314n: qca953x_common + @$(call config_init,Comfast CF-E314N,cf-e314n,16,17,1,QCA_QCA953X_SOC) + @$(call define_add,CONFIG_FOR_COMFAST_CF_E314N,1) + @$(call define_add,CFG_ATHRS27_PHY,1) + @$(call define_add,CFG_ATH_GMAC_NMACS,2) + @$(MKCONFIG) -a ap143 mips mips ap143 ar7240 ar7240 + comfast_cf-e320n_v2: qca953x_common @$(call config_init,Comfast CF-E320N v2,cf-e320n-v2,16,17,1,QCA_QCA953X_SOC) @$(call define_add,CONFIG_FOR_COMFAST_CF_E320N_V2,1) diff --git a/u-boot/include/configs/ap143.h b/u-boot/include/configs/ap143.h index d829fa5..4e8dc8a 100644 --- a/u-boot/include/configs/ap143.h +++ b/u-boot/include/configs/ap143.h @@ -21,7 +21,18 @@ * GPIO configuration * ================== */ -#if defined(CONFIG_FOR_COMFAST_CF_E320N_V2) +#if defined(CONFIG_FOR_COMFAST_CF_E314N) + + #define CONFIG_QCA_GPIO_MASK_LED_ACT_H GPIO4 | GPIO11 | GPIO14 |\ + GPIO15 | GPIO16 + #define CONFIG_QCA_GPIO_MASK_LED_ACT_L GPIO0 | GPIO2 | GPIO3 + #define CONFIG_QCA_GPIO_MASK_OUT CONFIG_QCA_GPIO_MASK_LED_ACT_H |\ + CONFIG_QCA_GPIO_MASK_LED_ACT_L + #define CONFIG_QCA_GPIO_MASK_IN GPIO17 + #define CONFIG_QCA_GPIO_MASK_OUT_INIT_H CONFIG_QCA_GPIO_MASK_LED_ACT_L + #define CONFIG_QCA_GPIO_MASK_OUT_INIT_L CONFIG_QCA_GPIO_MASK_LED_ACT_H + +#elif defined(CONFIG_FOR_COMFAST_CF_E320N_V2) #define CONFIG_QCA_GPIO_MASK_LED_ACT_H GPIO0 | GPIO2 | GPIO3 #define CONFIG_QCA_GPIO_MASK_OUT CONFIG_QCA_GPIO_MASK_LED_ACT_H @@ -76,7 +87,8 @@ * Default bootargs * ================ */ -#if defined(CONFIG_FOR_COMFAST_CF_E320N_V2) +#if defined(CONFIG_FOR_COMFAST_CF_E314N) ||\ + defined(CONFIG_FOR_COMFAST_CF_E320N_V2) #define CONFIG_BOOTARGS "console=ttyS0,115200 root=31:03 "\ "rootfstype=jffs2 init=/sbin/init "\ @@ -120,7 +132,8 @@ * Load address and boot command * ============================= */ -#if defined(CONFIG_FOR_COMFAST_CF_E320N_V2) ||\ +#if defined(CONFIG_FOR_COMFAST_CF_E314N) ||\ + defined(CONFIG_FOR_COMFAST_CF_E320N_V2) ||\ defined(CONFIG_FOR_COMFAST_CF_E520N_CF_E530N) ||\ defined(CONFIG_FOR_TPLINK_WR820N_CN) ||\ defined(CONFIG_FOR_TPLINK_WR802N) ||\ @@ -139,7 +152,8 @@ * Environment configuration * ========================= */ -#if defined(CONFIG_FOR_COMFAST_CF_E320N_V2) ||\ +#if defined(CONFIG_FOR_COMFAST_CF_E314N) ||\ + defined(CONFIG_FOR_COMFAST_CF_E320N_V2) ||\ defined(CONFIG_FOR_COMFAST_CF_E520N_CF_E530N) #define CFG_ENV_ADDR 0x9F018000 #define CFG_ENV_SIZE 0x7C00 @@ -174,7 +188,8 @@ * MAC address/es, model and WPS pin offsets in FLASH * ================================================== */ -#if defined(CONFIG_FOR_COMFAST_CF_E320N_V2) ||\ +#if defined(CONFIG_FOR_COMFAST_CF_E314N) ||\ + defined(CONFIG_FOR_COMFAST_CF_E320N_V2) ||\ defined(CONFIG_FOR_COMFAST_CF_E520N_CF_E530N) #define OFFSET_MAC_DATA_BLOCK 0x10000 #define OFFSET_MAC_DATA_BLOCK_LENGTH 0x10000 @@ -207,7 +222,8 @@ * Comfast CF-E520N and E320Nv2 are limited to 64 KB only, * disable some commands */ -#if defined(CONFIG_FOR_COMFAST_CF_E320N_V2) ||\ +#if defined(CONFIG_FOR_COMFAST_CF_E314N) ||\ + defined(CONFIG_FOR_COMFAST_CF_E320N_V2) ||\ defined(CONFIG_FOR_COMFAST_CF_E520N_CF_E530N) #undef CONFIG_CMD_DHCP #undef CONFIG_CMD_LOADB @@ -226,7 +242,8 @@ #endif /* Firmware size limit */ -#if defined(CONFIG_FOR_COMFAST_CF_E320N_V2) ||\ +#if defined(CONFIG_FOR_COMFAST_CF_E314N) ||\ + defined(CONFIG_FOR_COMFAST_CF_E320N_V2) ||\ defined(CONFIG_FOR_COMFAST_CF_E520N_CF_E530N) ||\ defined(CONFIG_FOR_TPLINK_WR820N_CN) ||\ defined(CONFIG_FOR_TPLINK_WR802N) ||\ @@ -246,14 +263,16 @@ defined(CONFIG_FOR_TPLINK_WR802N) ||\ defined(CONFIG_FOR_TPLINK_WR841N_V9) #define CONFIG_QCA_PLL QCA_PLL_PRESET_550_400_200 -#elif defined(CONFIG_FOR_COMFAST_CF_E320N_V2) ||\ +#elif defined(CONFIG_FOR_COMFAST_CF_E314N) ||\ + defined(CONFIG_FOR_COMFAST_CF_E320N_V2) ||\ defined(CONFIG_FOR_COMFAST_CF_E520N_CF_E530N) ||\ defined(CONFIG_FOR_WALLYS_DR531) ||\ defined(CONFIG_FOR_ZBTLINK_ZBT_WE1526) #define CONFIG_QCA_PLL QCA_PLL_PRESET_650_400_200 #endif -#if defined(CONFIG_FOR_COMFAST_CF_E320N_V2) ||\ +#if defined(CONFIG_FOR_COMFAST_CF_E314N) ||\ + defined(CONFIG_FOR_COMFAST_CF_E320N_V2) ||\ defined(CONFIG_FOR_COMFAST_CF_E520N_CF_E530N) ||\ defined(CONFIG_FOR_TPLINK_WR820N_CN) ||\ defined(CONFIG_FOR_TPLINK_WR802N) ||\ @@ -279,7 +298,8 @@ * For upgrade scripts in environment * ================================== */ -#if !defined(CONFIG_FOR_COMFAST_CF_E320N_V2) &&\ +#if !defined(CONFIG_FOR_COMFAST_CF_E314N) &&\ + !defined(CONFIG_FOR_COMFAST_CF_E320N_V2) &&\ !defined(CONFIG_FOR_COMFAST_CF_E520N_CF_E530N) &&\ !defined(CONFIG_FOR_WALLYS_DR531) &&\ !defined(CONFIG_FOR_ZBTLINK_ZBT_WE1526) -- 2.25.1