Merge pull request #6 from chongshengB/master

merge from chongshengB
cslily · Aug 16, 2020 · d056992 · d056992
2 parents 2b05ede + 53a7bee
commit d056992
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/trunk/configs/boards/GHL/board.h b/trunk/configs/boards/GHL/board.h
@@ -12,15 +12,16 @@
 #define BOARD_GPIO_BTN_RESET	3
 #define BOARD_GPIO_BTN_WPS	7
 #undef  BOARD_GPIO_LED_ALL
-#undef  BOARD_GPIO_LED_WIFI   
-#undef  BOARD_GPIO_LED_SW2G    	
-#undef  BOARD_GPIO_LED_SW5G	
-#define  BOARD_GPIO_LED_POWER	15
+#undef  BOARD_GPIO_LED_WIFI
+#undef  BOARD_GPIO_LED_SW2G
+#undef  BOARD_GPIO_LED_SW5G
+#undef  BOARD_GPIO_LED_POWER
 #undef  BOARD_GPIO_LED_LAN
-#define BOARD_GPIO_LED_WAN	11
-#define BOARD_GPIO_LED_USB	10
+#define BOARD_GPIO_LED_WAN	16
+#define BOARD_GPIO_LED_USB	15
 #undef BOARD_GPIO_LED_ROUTER
-#undef  BOARD_GPIO_PWR_USB
+#define BOARD_GPIO_PWR_USB	11
+#define BOARD_GPIO_PWR_USB_ON	1
 #define BOARD_HAS_5G_11AC	1
 #define BOARD_NUM_ANT_5G_TX	2
 #define BOARD_NUM_ANT_5G_RX	2
@@ -30,6 +31,4 @@
 #define BOARD_HAS_EPHY_L1000	1
 #define BOARD_HAS_EPHY_W1000	1
 #define BOARD_NUM_UPHY_USB3	1
-#define BOARD_GPIO_PWR_USB	11
-#define BOARD_GPIO_PWR_USB_ON	1
 #define BOARD_USB_PORT_SWAP	0
diff --git a/trunk/configs/boards/GHL/kernel-3.4.x.config b/trunk/configs/boards/GHL/kernel-3.4.x.config
@@ -1940,7 +1940,7 @@ CONFIG_RT_THIRD_CARD=0
 # AP MODE MediaTek MT7620/MT7602E/MT7612E RBUS/PCIe Wireless driver
 #
 CONFIG_MT76X2_AP=m
-# CONFIG_MT76X2_AP_LED is not set
+CONFIG_MT76X2_AP_LED=y
 # CONFIG_MT76X2_AP_LED_SOFT is not set
 CONFIG_MT76X2_AP_LLTD=y
 CONFIG_MT76X2_AP_WDS=y
@@ -2000,7 +2000,7 @@ CONFIG_MT7603E_RTMP_FLASH_SUPPORT=y
 # CONFIG_MT7603E_ROAMING_ENHANCE_SUPPORT is not set
 # CONFIG_MT7603E_WIFI_FWD_UPDATED is not set
 # CONFIG_MT_BTCOEX_CONCURRENT is not set
-# CONFIG_MT7603E_LED_CONTROL_SUPPORT is not set
+CONFIG_MT7603E_LED_CONTROL_SUPPORT=y
 # CONFIG_MT7603E_SINGLE_SKU_V2 is not set
 # CONFIG_MT7603E_ATE_SUPPORT is not set
 CONFIG_MT7603E_RT2860V2_AP_V24_DATA_STRUCTURE=y

diff --git a/trunk/user/shared/defaults.c b/trunk/user/shared/defaults.c
@@ -449,7 +449,7 @@ struct nvram_pair router_defaults[] = {
 	{ "block_ios", "0" },
 	{ "block_douyin", "0" },
 	{ "anti_ad", "0" },
-	{ "anti_ad_link", "https://gitee.com/privacy-protection-tools/anti-ad/raw/master/anti-ad-for-dnsmasq.conf" },
+	{ "anti_ad_link", "https://anti-ad.net/anti-ad-for-dnsmasq.conf" },
 	{ "anti_ad_count", "0" },
 	/* Pdnsd */
 	{ "dns_enable", "0" },

diff --git a/trunk/user/unblockmusic/Makefile b/trunk/user/unblockmusic/Makefile
@@ -1,7 +1,7 @@
 THISDIR = $(shell pwd)
 export GO111MODULE=on
 export GOPROXY=https://goproxy.io
-UM_VERSION := 0.2.3
+UM_VERSION := 0.2.4
 UM_URL := https://github.com/cnsilvan/UnblockNeteaseMusic/archive/$(UM_VERSION).tar.gz
 
 all:download_um build_extract build

diff --git a/trunk/user/v2ray/Makefile b/trunk/user/v2ray/Makefile
@@ -2,7 +2,7 @@ THISDIR = $(shell pwd)
 v2ray_dir="v2ray.com/core/main"
 export GO111MODULE=on
 export GOPROXY=https://goproxy.io
-V2ray_VERSION := 4.26.0
+V2ray_VERSION := 4.27.0
 V2ray_URL := https://codeload.github.com/v2ray/v2ray-core/tar.gz/v$(V2ray_VERSION)
 V2RAY_SED_ARGS:=
 V2RAY_SED_ARGS += \