From: Piotr Dymacz Date: Fri, 9 Sep 2016 13:05:23 +0000 (+0200) Subject: Comfast CF-E520N and CF-530N are identical, only difference is front panel X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0766c4a16f1fc65e5aaaa27a2d3df1957f086882;p=oweals%2Fu-boot_mod.git Comfast CF-E520N and CF-530N are identical, only difference is front panel --- diff --git a/Makefile b/Makefile index fc2759c..74e4689 100644 --- a/Makefile +++ b/Makefile @@ -218,7 +218,7 @@ $(COMMON_ETHS27_TARGETS): @$(call build,256,1) comfast_cf-e320n_v2 \ -comfast_cf-e520n: +comfast_cf-e520n_cf-e530n: @$(call build,64,1,ETH_CONFIG=_s27) d-link_dir-505: diff --git a/README.md b/README.md index 3f4d098..a3cfdf3 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ Currently supported devices: - TP-Link TL-WR802N - Wallys DR531 - Zbtlink ZBT-WE1526 - - Comfast CF-E520N + - Comfast CF-E520N/CF-E530N - Comfast CF-E320N v2 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,7 +131,7 @@ 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 | QCA9531 | 8 MiB | 32 MiB DDR2 | 64 KiB, LZMA | RO | +| Comfast CF-E520N/CF-E530N | QCA9531 | 8 MiB | 32 MiB DDR2 | 64 KiB, LZMA | RO | | Comfast CF-E320N v2 | QCA9531 | 16 MiB | 64 MiB DDR2 | 64 KiB, LZMA | RO | *(LZMA) - U-Boot binary image is compressed with LZMA.* diff --git a/READMEPL.md b/READMEPL.md index c8d1d4f..2b8c20c 100644 --- a/READMEPL.md +++ b/READMEPL.md @@ -91,7 +91,7 @@ Lista obecnie wspieranych urządzeń: - TP-Link TL-WR802N - Wallys DR531 - Zbtlink ZBT-WE1526 - - Comfast CF-E520N + - Comfast CF-E520N/CF-E530N - Comfast CF-E320N v2 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,7 +128,7 @@ 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 | QCA9531 | 8 MiB | 32 MiB DDR2 | 64 KiB, LZMA | RO | +| Comfast CF-E520N/CF-E530N | QCA9531 | 8 MiB | 32 MiB DDR2 | 64 KiB, LZMA | RO | | Comfast CF-E320N v2 | QCA9531 | 16 MiB | 64 MiB DDR2 | 64 KiB, LZMA | RO | *(LZMA) - obraz binarny U-Boot został dodatkowo skompresowany przy pomocy LZMA.* diff --git a/u-boot/Makefile b/u-boot/Makefile index 4425509..1aa7a72 100644 --- a/u-boot/Makefile +++ b/u-boot/Makefile @@ -394,9 +394,9 @@ comfast_cf-e320n_v2: qca953x_common @$(call define_add,CFG_ATH_GMAC_NMACS,2) @$(MKCONFIG) -a ap143 mips mips ap143 ar7240 ar7240 -comfast_cf-e520n: qca953x_common - @$(call config_init,Comfast CF-E520N,cf-e520n,8,17,1,QCA_QCA953X_SOC) - @$(call define_add,CONFIG_FOR_COMFAST_CF_E520N,1) +comfast_cf-e520n_cf-e530n: qca953x_common + @$(call config_init,Comfast CF-E520N/CF-E530N,cf-e520n_cf-e530n,8,17,1,QCA_QCA953X_SOC) + @$(call define_add,CONFIG_FOR_COMFAST_CF_E520N_CF_E530N,1) @$(call define_add,CFG_ATHRS27_PHY,1) @$(call define_add,CFG_ATH_GMAC_NMACS,2) @$(MKCONFIG) -a ap143 mips mips ap143 ar7240 ar7240 diff --git a/u-boot/include/configs/ap143.h b/u-boot/include/configs/ap143.h index 926c8f4..d829fa5 100644 --- a/u-boot/include/configs/ap143.h +++ b/u-boot/include/configs/ap143.h @@ -28,7 +28,7 @@ #define CONFIG_QCA_GPIO_MASK_IN GPIO17 #define CONFIG_QCA_GPIO_MASK_OUT_INIT_L CONFIG_QCA_GPIO_MASK_LED_ACT_H -#elif defined(CONFIG_FOR_COMFAST_CF_E520N) +#elif defined(CONFIG_FOR_COMFAST_CF_E520N_CF_E530N) #define CONFIG_QCA_GPIO_MASK_LED_ACT_L GPIO11 #define CONFIG_QCA_GPIO_MASK_OUT CONFIG_QCA_GPIO_MASK_LED_ACT_L @@ -82,7 +82,7 @@ "rootfstype=jffs2 init=/sbin/init "\ "mtdparts=ath-nor0:64k(u-boot),64k(art),1536k(uImage),14656k(rootfs),64k(mib0)" -#elif defined(CONFIG_FOR_COMFAST_CF_E520N) +#elif defined(CONFIG_FOR_COMFAST_CF_E520N_CF_E530N) #define CONFIG_BOOTARGS "console=ttyS0,115200 root=31:03 "\ "rootfstype=jffs2 init=/sbin/init "\ @@ -120,10 +120,10 @@ * Load address and boot command * ============================= */ -#if defined(CONFIG_FOR_COMFAST_CF_E320N_V2) ||\ - defined(CONFIG_FOR_COMFAST_CF_E520N) ||\ - defined(CONFIG_FOR_TPLINK_WR820N_CN) ||\ - defined(CONFIG_FOR_TPLINK_WR802N) ||\ +#if 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) ||\ defined(CONFIG_FOR_TPLINK_WR841N_V9) #define CFG_LOAD_ADDR 0x9F020000 #elif defined(CONFIG_FOR_WALLYS_DR531) @@ -140,7 +140,7 @@ * ========================= */ #if defined(CONFIG_FOR_COMFAST_CF_E320N_V2) ||\ - defined(CONFIG_FOR_COMFAST_CF_E520N) + defined(CONFIG_FOR_COMFAST_CF_E520N_CF_E530N) #define CFG_ENV_ADDR 0x9F018000 #define CFG_ENV_SIZE 0x7C00 #define CFG_ENV_SECT_SIZE 0x10000 @@ -175,7 +175,7 @@ * ================================================== */ #if defined(CONFIG_FOR_COMFAST_CF_E320N_V2) ||\ - defined(CONFIG_FOR_COMFAST_CF_E520N) + defined(CONFIG_FOR_COMFAST_CF_E520N_CF_E530N) #define OFFSET_MAC_DATA_BLOCK 0x10000 #define OFFSET_MAC_DATA_BLOCK_LENGTH 0x10000 #define OFFSET_MAC_ADDRESS 0x00000 @@ -208,7 +208,7 @@ * disable some commands */ #if defined(CONFIG_FOR_COMFAST_CF_E320N_V2) ||\ - defined(CONFIG_FOR_COMFAST_CF_E520N) + defined(CONFIG_FOR_COMFAST_CF_E520N_CF_E530N) #undef CONFIG_CMD_DHCP #undef CONFIG_CMD_LOADB #undef CONFIG_CMD_SNTP @@ -226,10 +226,10 @@ #endif /* Firmware size limit */ -#if defined(CONFIG_FOR_COMFAST_CF_E320N_V2) ||\ - defined(CONFIG_FOR_COMFAST_CF_E520N) ||\ - defined(CONFIG_FOR_TPLINK_WR820N_CN) ||\ - defined(CONFIG_FOR_TPLINK_WR802N) ||\ +#if 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) ||\ defined(CONFIG_FOR_TPLINK_WR841N_V9) #define WEBFAILSAFE_UPLOAD_LIMITED_AREA_IN_BYTES (192 * 1024) #elif defined(CONFIG_FOR_WALLYS_DR531) ||\ @@ -246,17 +246,17 @@ 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) ||\ - defined(CONFIG_FOR_COMFAST_CF_E520N) ||\ - defined(CONFIG_FOR_WALLYS_DR531) ||\ +#elif 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) ||\ - defined(CONFIG_FOR_COMFAST_CF_E520N) ||\ - defined(CONFIG_FOR_TPLINK_WR820N_CN) ||\ - defined(CONFIG_FOR_TPLINK_WR802N) ||\ +#if 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) ||\ defined(CONFIG_FOR_TPLINK_WR841N_V9) #define CONFIG_QCA_PLL_IN_FLASH_BLOCK_OFFSET 0x10000 @@ -279,9 +279,9 @@ * For upgrade scripts in environment * ================================== */ -#if !defined(CONFIG_FOR_COMFAST_CF_E320N_V2) &&\ - !defined(CONFIG_FOR_COMFAST_CF_E520N) &&\ - !defined(CONFIG_FOR_WALLYS_DR531) &&\ +#if !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_UPG_UBOOT_SIZE_BACKUP_HEX 0x20000 #endif