Merge "[Feature][R307][task-view-604][fota] R307,add manual fota upgrade functionality"
diff --git a/lynq/CPE_COMMON/boot/common/src/uboot/board/zte/zx297520v3/zx297520v3_mifi_mini.c b/lynq/CPE_COMMON/boot/common/src/uboot/board/zte/zx297520v3/zx297520v3_mifi_mini.c
index 75cccd8..fde67ef 100755
--- a/lynq/CPE_COMMON/boot/common/src/uboot/board/zte/zx297520v3/zx297520v3_mifi_mini.c
+++ b/lynq/CPE_COMMON/boot/common/src/uboot/board/zte/zx297520v3/zx297520v3_mifi_mini.c
@@ -502,7 +502,7 @@
 	int ret = 0;
 	unsigned int poweron_type = reg32(POWERON_TYPE_ADDR);	 //ÁÙʱʹÓÃ
 
-	g_ddr_size_flag = CHIP_DDR_IS_32M;
+	//g_ddr_size_flag = CHIP_DDR_IS_32M;
 
 	switch (poweron_type) {
 
diff --git a/lynq/CPE_TELKOMSEL/boot/common/src/uboot/board/zte/zx297520v3/zx297520v3_mifi_mini.c b/lynq/CPE_TELKOMSEL/boot/common/src/uboot/board/zte/zx297520v3/zx297520v3_mifi_mini.c
index 75cccd8..fde67ef 100755
--- a/lynq/CPE_TELKOMSEL/boot/common/src/uboot/board/zte/zx297520v3/zx297520v3_mifi_mini.c
+++ b/lynq/CPE_TELKOMSEL/boot/common/src/uboot/board/zte/zx297520v3/zx297520v3_mifi_mini.c
@@ -502,7 +502,7 @@
 	int ret = 0;
 	unsigned int poweron_type = reg32(POWERON_TYPE_ADDR);	 //ÁÙʱʹÓÃ
 
-	g_ddr_size_flag = CHIP_DDR_IS_32M;
+	//g_ddr_size_flag = CHIP_DDR_IS_32M;
 
 	switch (poweron_type) {
 
diff --git a/lynq/R306/boot/common/src/uboot/board/zte/zx297520v3/zx297520v3_mifi_mini.c b/lynq/R306/boot/common/src/uboot/board/zte/zx297520v3/zx297520v3_mifi_mini.c
index 75cccd8..fde67ef 100755
--- a/lynq/R306/boot/common/src/uboot/board/zte/zx297520v3/zx297520v3_mifi_mini.c
+++ b/lynq/R306/boot/common/src/uboot/board/zte/zx297520v3/zx297520v3_mifi_mini.c
@@ -502,7 +502,7 @@
 	int ret = 0;
 	unsigned int poweron_type = reg32(POWERON_TYPE_ADDR);	 //ÁÙʱʹÓÃ
 
-	g_ddr_size_flag = CHIP_DDR_IS_32M;
+	//g_ddr_size_flag = CHIP_DDR_IS_32M;
 
 	switch (poweron_type) {
 
diff --git a/lynq/R307/ap/app/zte_webui/js/ext/set_aic8800.js b/lynq/R307/ap/app/zte_webui/js/ext/set_aic8800.js
index 8a7904d..4ffe1da 100755
--- a/lynq/R307/ap/app/zte_webui/js/ext/set_aic8800.js
+++ b/lynq/R307/ap/app/zte_webui/js/ext/set_aic8800.js
@@ -3,7 +3,7 @@
         WEBUI_TITLE: 'Mobiletek 4G CPE',

         PRODUCT_TYPE: 'CPE', // ²úÆ·ÀàÐÍUFI¡¢CPE

         HAS_BLACK_AND_WHITE_FILTER: true, //ÊÇ·ñÖ§³ÖºÚ°×Ãûµ¥

-        AP_STATION_SUPPORT: false,

+        AP_STATION_SUPPORT: true,

         MAX_STATION_NUMBER: 8,

         STATION_BLOCK_SUPPORT: true, // ÒÑÁ¬½ÓÉ豸ÊÇ·ñÖ§³ÖBlock¹¦ÄÜ

         HAS_MULTI_SSID: true, //¶àssid¹¦ÄÜ