projects / oweals / u-boot_mod.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4fbf43b)
Support only WHQX E600G/AC v2 version
authorPiotr Dymacz <pepe2k@gmail.com>
Thu, 8 Feb 2018 22:20:58 +0000 (23:20 +0100)
committerPiotr Dymacz <pepe2k@gmail.com>
Thu, 22 Feb 2018 14:13:39 +0000 (15:13 +0100)
Vendor decided to use different mtd layout (ART in front of firmware) in
production version of the boards and label them as "v2".

Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
Makefile patch | blob | history
README.md patch | blob | history
u-boot/Makefile patch | blob | history
u-boot/include/configs/ap143.h patch | blob | history

diff --git a/Makefile b/Makefile
index aadf8e35f3ed18e9d23da797f146dc7c6122a3f7..c8fd387ae2e472a3f90a444956453fd3287bbbfb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -281,8 +281,8 @@ p2w_cpe505n \
 p2w_r602n \
 yuncore_ap90q \
 yuncore_cpe830 \
-whqx_e600g \
-whqx_e600gac \
+whqx_e600g_v2 \
+whqx_e600gac_v2 \
 zbtlink_zbt-we1526:
        @$(call build,256,1,ETH_CONFIG=_s27)
 
diff --git a/README.md b/README.md
index ebc24d6a01f2647a01a7281e33ba56e6debfd39d..094bac568dc52a2a0d6f545ed3c55ffc2ba2b3fa 100644 (file)
--- a/README.md
+++ b/README.md
@@ -125,7 +125,7 @@ Currently supported devices:
   - TP-Link TL-WR842N/D v3
   - TP-Link TL-WR902AC v1
   - Wallys DR531
-  - WHQX E600G/AC
+  - WHQX E600G/AC v2
   - YunCore AP90Q
   - YunCore CPE830
   - Zbtlink ZBT-WE1526
@@ -189,7 +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 |
+| WHQX E600G/AC v2 | 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 09fcc47b14068e67fe6f3d273b350ccbcca02970..1e998e094482fefda162825a1e2c142b935edcdd 100644 (file)
--- a/u-boot/Makefile
+++ b/u-boot/Makefile
@@ -764,18 +764,18 @@ 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)
+whqx_e600g_v2: qca953x_common
+       @$(call config_init,WHQX E600G v2,e600g-v2,16,17,1,QCA_QCA9531_SOC)
+       @$(call define_add,CONFIG_FOR_WHQX_E600G_V2,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)
+whqx_e600gac_v2: qca953x_common
+       @$(call config_init,WHQX E600GAC v2,e600gac-v2,16,17,1,QCA_QCA9531_SOC)
+       @$(call define_add,CONFIG_FOR_WHQX_E600GAC_V2,1)
        @$(call define_add,CONFIG_USB,1)
        @$(call define_add,CFG_ATHRS27_PHY,1)
        @$(call define_add,CFG_ATH_GMAC_NMACS,2)
diff --git a/u-boot/include/configs/ap143.h b/u-boot/include/configs/ap143.h
index 6c785e53563af4318d590324493a5bdaae620e39..6058d4ac11113d068b433de8177065f69d784c4a 100644 (file)
--- a/u-boot/include/configs/ap143.h
+++ b/u-boot/include/configs/ap143.h
@@ -147,11 +147,11 @@
        #define CONFIG_QCA_GPIO_MASK_LED_ACT_L  GPIO11 | GPIO12 | GPIO13 |\
                                                GPIO14 | GPIO15 | GPIO16
 
-#elif defined(CONFIG_FOR_WHQX_E600G)
+#elif defined(CONFIG_FOR_WHQX_E600G_V2)
 
        #define CONFIG_QCA_GPIO_MASK_LED_ACT_L  GPIO4 | GPIO13 | GPIO15 | GPIO16
 
-#elif defined(CONFIG_FOR_WHQX_E600GAC)
+#elif defined(CONFIG_FOR_WHQX_E600GAC_V2)
 
        #define CONFIG_QCA_GPIO_MASK_LED_ACT_L  GPIO4  | GPIO11 | GPIO12 |\
                                                GPIO13 | GPIO14 | GPIO15 |\
@@ -262,12 +262,12 @@
                                "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)
+#elif defined(CONFIG_FOR_WHQX_E600G_V2) ||\
+      defined(CONFIG_FOR_WHQX_E600GAC_V2)
 
-#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)"
+       #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
 
@@ -311,10 +311,10 @@
        #define CFG_LOAD_ADDR   0x9F050000
 
 #elif defined(CONFIG_FOR_GLINET_GL_AR750) ||\
-      defined(CONFIG_FOR_WHQX_E600G)      ||\
-      defined(CONFIG_FOR_WHQX_E600GAC)
+      defined(CONFIG_FOR_WHQX_E600G_V2)   ||\
+      defined(CONFIG_FOR_WHQX_E600GAC_V2)
 
-       #define CFG_LOAD_ADDR   0x9F060000
+       #define CFG_LOAD_ADDR   0x9F070000
 
 #endif
 
@@ -353,8 +353,8 @@
 
 #elif defined(CONFIG_FOR_GLINET_GL_AR300M_LITE) ||\
       defined(CONFIG_FOR_GLINET_GL_AR750)       ||\
-      defined(CONFIG_FOR_WHQX_E600G)            ||\
-      defined(CONFIG_FOR_WHQX_E600GAC)
+      defined(CONFIG_FOR_WHQX_E600G_V2)         ||\
+      defined(CONFIG_FOR_WHQX_E600GAC_V2)
 
        #define CFG_ENV_ADDR            0x9F040000
        #define CFG_ENV_SIZE            0x10000
@@ -478,8 +478,8 @@
        #define OFFSET_MAC_DATA_BLOCK_LENGTH    0x010000
        #define OFFSET_MAC_ADDRESS              0x00F810
 
-#elif defined(CONFIG_FOR_WHQX_E600G) ||\
-      defined(CONFIG_FOR_WHQX_E600GAC)
+#elif defined(CONFIG_FOR_WHQX_E600G_V2) ||\
+      defined(CONFIG_FOR_WHQX_E600GAC_V2)
 
        #define OFFSET_MAC_DATA_BLOCK           0x50000
        #define OFFSET_MAC_DATA_BLOCK_LENGTH    0x10000
@@ -531,6 +531,11 @@
 
        #define WEBFAILSAFE_UPLOAD_ART_ADDRESS  (CFG_FLASH_BASE + 0x50000)
 
+#elif defined(CONFIG_FOR_WHQX_E600G_V2) ||\
+      defined(CONFIG_FOR_WHQX_E600GAC_V2)
+
+       #define WEBFAILSAFE_UPLOAD_ART_ADDRESS  (CFG_FLASH_BASE + 0x60000)
+
 #endif
 
 /* Firmware size limit */
@@ -568,8 +573,8 @@
        #define WEBFAILSAFE_UPLOAD_LIMITED_AREA_IN_BYTES        (384 * 1024)
 
 #elif defined(CONFIG_FOR_TPLINK_WA850RE_V2) ||\
-      defined(CONFIG_FOR_WHQX_E600G)        ||\
-      defined(CONFIG_FOR_WHQX_E600GAC)
+      defined(CONFIG_FOR_WHQX_E600G_V2)     ||\
+      defined(CONFIG_FOR_WHQX_E600GAC_V2)
 
        #define WEBFAILSAFE_UPLOAD_LIMITED_AREA_IN_BYTES        (448 * 1024)
 
@@ -631,8 +636,8 @@
        #define CONFIG_QCA_PLL_IN_FLASH_BLOCK_SIZE      0x010000
 
 #elif defined(CONFIG_FOR_GLINET_GL_AR750) ||\
-      defined(CONFIG_FOR_WHQX_E600G)      ||\
-      defined(CONFIG_FOR_WHQX_E600GAC)
+      defined(CONFIG_FOR_WHQX_E600G_V2)   ||\
+      defined(CONFIG_FOR_WHQX_E600GAC_V2)
 
        #define CONFIG_QCA_PLL_IN_FLASH_BLOCK_OFFSET    0x50000
        #define CONFIG_QCA_PLL_IN_FLASH_BLOCK_SIZE      0x10000
@@ -668,8 +673,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_WHQX_E600G_V2)         &&\
+    !defined(CONFIG_FOR_WHQX_E600GAC_V2)       &&\
     !defined(CONFIG_FOR_YUNCORE_AP90Q)         &&\
     !defined(CONFIG_FOR_YUNCORE_CPE830)        &&\
     !defined(CONFIG_FOR_ZBTLINK_ZBT_WE1526)
Unnamed repository; edit this file 'description' to name the repository.