Merge Official Source

2019-11-26 13:02:38 +08:00 · 2019-11-26 13:02:38 +08:00 · 0de47536ae
commit 0de47536ae
parent a193a756fa 5d2a900163
34 changed files with 378 additions and 97 deletions
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@ -165,7 +165,9 @@ define BuildKernel
 		$(if $(findstring Darwin,$(HOST_OS)),HOST_LOADLIBES="-L$(STAGING_DIR_HOST)/lib -lncurses") \
 		YACC=$(STAGING_DIR_HOST)/bin/bison \
 		$$@
-	$(LINUX_RECONF_DIFF) $(LINUX_DIR)/.config > $(LINUX_RECONFIG_TARGET)
+	$(LINUX_RECONF_DIFF) $(LINUX_DIR)/.config | \
+		grep -vE '(CONFIG_CC_(HAS_ASM_GOTO|IS_GCC|IS_CLANG)|GCC_VERSION)=' \
+		> $(LINUX_RECONFIG_TARGET)

  install: $(LINUX_DIR)/.image
 	+$(MAKE) -C image compile install TARGET_BUILD=
--- a/package/boot/uboot-envtools/files/ath79
+++ b/package/boot/uboot-envtools/files/ath79
@ -33,7 +33,9 @@ netgear,wnr612-v2|\
 ocedo,koala|\
 ocedo,raccoon|\
 openmesh,om5p-ac-v2|\
-yuncore,a770)
+yuncore,a770|\
+yuncore,a782|\
+yuncore,xd4200)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x10000" "0x10000"
 	;;
 buffalo,wzr-hp-ag300h)
--- a/package/libs/libubox/Makefile
+++ b/package/libs/libubox/Makefile
@ -5,9 +5,9 @@ PKG_RELEASE=1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git
-PKG_MIRROR_HASH:=58f6f6b21a00b69d466bcbce31e8adbef364d139715731430194746be5211840
-PKG_SOURCE_DATE:=2019-10-29
-PKG_SOURCE_VERSION:=301303911dded723b7eda4d6a4a933b22d2c1b60
+PKG_MIRROR_HASH:=e7ef39ffe693d6f106aa320268d90a68aebd0a0aa1baa0051d70b3bb1f8a64fc
+PKG_SOURCE_DATE:=2019-11-24
+PKG_SOURCE_VERSION:=07413cce72e19520af55dfcbc765484f5ab41dd9
 CMAKE_INSTALL:=1

 PKG_LICENSE:=ISC
--- a/target/linux/apm821xx/config-4.19
+++ b/target/linux/apm821xx/config-4.19
@ -51,7 +51,6 @@ CONFIG_BUILD_SALT=""
 # CONFIG_CANYONLANDS is not set
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
-CONFIG_CC_IS_GCC=y
 CONFIG_CLANG_VERSION=0
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_CMDLINE="rootfstype=squashfs noinitrd"
@ -109,7 +108,6 @@ CONFIG_EXTRA_TARGETS="uImage"
 CONFIG_FIXED_PHY=y
 CONFIG_FREEZER=y
 # CONFIG_FSL_LBC is not set
-CONFIG_GCC_VERSION=70300
 CONFIG_GENERIC_ATOMIC64=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
--- a/target/linux/ath79/dts/qca9563_yuncore_a782.dts
+++ b/target/linux/ath79/dts/qca9563_yuncore_a782.dts
@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include "qca9563_yuncore_xd4200.dtsi"
+
+/ {
+	compatible = "yuncore,a782", "qca,qca9563";
+	model = "YunCore A782";
+
+	aliases {
+		led-boot = &led_system;
+		led-failsafe = &led_system;
+		led-running = &led_system;
+		led-upgrade = &led_system;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led_system: system {
+			label = "a782:red:system";
+			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
+			default-state = "keep";
+		};
+
+		wlan2g {
+			label = "a782:green:wlan2g";
+			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "phy1tpt";
+		};
+	};
+};
--- a/target/linux/ath79/dts/qca9563_yuncore_xd4200.dts
+++ b/target/linux/ath79/dts/qca9563_yuncore_xd4200.dts
@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include "qca9563_yuncore_xd4200.dtsi"
+
+/ {
+	compatible = "yuncore,xd4200", "qca,qca9563";
+	model = "YunCore XD4200";
+
+	aliases {
+		led-boot = &led_system;
+		led-failsafe = &led_system;
+		led-running = &led_system;
+		led-upgrade = &led_system;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led_system: system {
+			label = "xd4200:blue:system";
+			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
+			default-state = "keep";
+		};
+
+		wlan2g {
+			label = "xd4200:blue:wlan2g";
+			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "phy1tpt";
+		};
+	};
+};
--- a/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi
+++ b/target/linux/ath79/dts/qca9563_yuncore_xd4200.dtsi
@ -0,0 +1,122 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+#include "qca956x.dtsi"
+
+/ {
+	aliases {
+		label-mac-device = &eth0;
+	};
+
+	chosen {
+		bootargs = "console=ttyS0,115200n8";
+	};
+
+	keys {
+		compatible = "gpio-keys";
+
+		reset {
+			linux,code = <KEY_RESTART>;
+			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
+			debounce-interval = <60>;
+		};
+	};
+};
+
+&eth0 {
+	status = "okay";
+
+	pll-data = <0x03000101 0x00000101 0x00001919>;
+
+	mtd-mac-address = <&art 0x0>;
+	phy-mode = "sgmii";
+	phy-handle = <&phy0>;
+};
+
+&gpio {
+	status = "okay";
+};
+
+&mdio0 {
+	status = "okay";
+
+	phy-mask = <0>;
+
+	phy0: ethernet-phy@0 {
+		reg = <0>;
+		phy-mode = "sgmii";
+
+		qca,ar8327-initvals = <
+			0x04 0x00080080 /* PORT0 PAD MODE CTRL */
+			0x10 0x81000080 /* POWER_ON_STRIP */
+			0x50 0xcf37cf37 /* LED_CTRL0 */
+			0x54 0xcf37cf37 /* LED_CTRL1 */
+			0x58 0xcf37cf37 /* LED_CTRL2 */
+			0x5c 0x0000c300 /* LED_CTRL3 */
+			0x7c 0x0000007e /* PORT0_STATUS */
+		>;
+	};
+};
+
+&pcie {
+	status = "okay";
+
+	wifi@0,0 {
+		compatible = "pci168c,0056";
+		reg = <0x0000 0 0 0 0>;
+	};
+};
+
+&spi {
+	status = "okay";
+
+	num-cs = <1>;
+
+	flash@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <25000000>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "u-boot";
+				reg = <0x000000 0x040000>;
+				read-only;
+			};
+
+			partition@40000 {
+				label = "u-boot-env";
+				reg = <0x040000 0x010000>;
+			};
+
+			partition@50000 {
+				compatible = "denx,uimage";
+				label = "firmware";
+				reg = <0x050000 0xfa0000>;
+			};
+
+			art: partition@ff0000 {
+				label = "art";
+				reg = <0xff0000 0x010000>;
+				read-only;
+			};
+		};
+	};
+};
+
+&uart {
+	status = "okay";
+};
+
+&wmac {
+	status = "okay";
+
+	mtd-cal-data = <&art 0x1000>;
+};
--- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
@ -156,15 +156,17 @@ ath79_setup_interfaces()
 	wd,mynet-n750)
 		ucidef_add_switch "switch0" \
 			"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
-	;;
+		;;
 	librerouter,librerouter-v1)
 		ucidef_add_switch "switch0" \
 			"0@eth0" "5:wan" "6@eth1" "4:lan"
-	;;
+		;;
 	nec,wg1200cr|\
 	ubnt,nanostation-ac|\
 	ubnt,unifiac-mesh-pro|\
-	ubnt,unifiac-pro)
+	ubnt,unifiac-pro|\
+	yuncore,a782|\
+	yuncore,xd4200)
 		ucidef_add_switch "switch0" \
 			"0@eth0" "2:lan" "3:wan"
 		;;
--- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@ -154,6 +154,12 @@ case "$FIRMWARE" in
 		ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
 			/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
 		;;
+	yuncore,a782|\
+	yuncore,xd4200)
+		caldata_extract "art" 0x5000 0x2f20
+		ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
+			/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
+		;;
 	esac
 	;;
 *)
--- a/target/linux/ath79/image/common-yuncore.mk
+++ b/target/linux/ath79/image/common-yuncore.mk
@ -0,0 +1,12 @@
+define Build/yuncore-tftp-header-16m
+	( \
+		echo -n -e \
+			"YUNCOREsetenv bootcmd \"bootm 0x9f050000 || bootm 0x9fe80000\"" \
+			"&& saveenv" \
+			"&& erase 0x9f050000 +0xfa0000" \
+			"&& cp.b 0x800600c0 0x9f050000 0xfa0000" |\
+		dd bs=192 count=1 conv=sync; \
+		dd if=$@; \
+	) > $@.new
+	mv $@.new $@
+endef
--- a/target/linux/ath79/image/generic-tp-link.mk
+++ b/target/linux/ath79/image/generic-tp-link.mk
@ -123,7 +123,7 @@ define Device/tplink_archer-c7-v1
  ATH_SOC := qca9558
  DEVICE_MODEL := Archer C7
  DEVICE_VARIANT := v1
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
  TPLINK_HWID := 0x75000001
  SUPPORTED_DEVICES += archer-c7
 endef
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@ -1,6 +1,7 @@
 include ./common-buffalo.mk
 include ./common-netgear.mk
 include ./common-tp-link.mk
+include ./common-yuncore.mk

 DEVICE_VARS += ADDPATTERN_ID ADDPATTERN_VERSION
 DEVICE_VARS += SEAMA_SIGNATURE SEAMA_MTDBLOCK
@ -1034,9 +1035,33 @@ define Device/yuncore_a770
  DEVICE_MODEL := A770
  DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9887-ct
  IMAGE_SIZE := 16000k
+  IMAGES += tftp.bin
+  IMAGE/tftp.bin := $$(IMAGE/sysupgrade.bin) | yuncore-tftp-header-16m
 endef
 TARGET_DEVICES += yuncore_a770

+define Device/yuncore_a782
+  ATH_SOC := qca9563
+  DEVICE_VENDOR := YunCore
+  DEVICE_MODEL := A782
+  DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct
+  IMAGE_SIZE := 16000k
+  IMAGES += tftp.bin
+  IMAGE/tftp.bin := $$(IMAGE/sysupgrade.bin) | yuncore-tftp-header-16m
+endef
+TARGET_DEVICES += yuncore_a782
+
+define Device/yuncore_xd4200
+  ATH_SOC := qca9563
+  DEVICE_VENDOR := YunCore
+  DEVICE_MODEL := XD4200
+  DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct
+  IMAGE_SIZE := 16000k
+  IMAGES += tftp.bin
+  IMAGE/tftp.bin := $$(IMAGE/sysupgrade.bin) | yuncore-tftp-header-16m
+endef
+TARGET_DEVICES += yuncore_xd4200
+
 define Device/zbtlink_zbt-wd323
  ATH_SOC := ar9344
  DEVICE_VENDOR := ZBT
--- a/target/linux/brcm2708/bcm2708/config-4.19
+++ b/target/linux/brcm2708/bcm2708/config-4.19
@ -72,7 +72,6 @@ CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_BRCM_CHAR_DRIVERS=y
 CONFIG_BUILD_BIN2C=y
 # CONFIG_CACHE_L2X0 is not set
-CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_CLONE_BACKWARDS=y
--- a/target/linux/brcm2708/bcm2709/config-4.19
+++ b/target/linux/brcm2708/bcm2709/config-4.19
@ -89,7 +89,6 @@ CONFIG_BRCM_CHAR_DRIVERS=y
 CONFIG_BROADCOM_PHY=y
 CONFIG_BUILD_BIN2C=y
 # CONFIG_CACHE_L2X0 is not set
-CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_CLONE_BACKWARDS=y
--- a/target/linux/brcm2708/bcm2710/config-4.19
+++ b/target/linux/brcm2708/bcm2710/config-4.19
@ -142,7 +142,6 @@ CONFIG_BUILD_BIN2C=y
 CONFIG_CAVIUM_ERRATUM_22375=y
 CONFIG_CAVIUM_ERRATUM_23154=y
 CONFIG_CAVIUM_ERRATUM_27456=y
-CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_CLONE_BACKWARDS=y
--- a/target/linux/brcm2708/bcm2711/config-4.19
+++ b/target/linux/brcm2708/bcm2711/config-4.19
@ -146,7 +146,6 @@ CONFIG_BUILD_BIN2C=y
 CONFIG_CAVIUM_ERRATUM_22375=y
 CONFIG_CAVIUM_ERRATUM_23154=y
 CONFIG_CAVIUM_ERRATUM_27456=y
-CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_CLONE_BACKWARDS=y
--- a/target/linux/generic/config-4.19
+++ b/target/linux/generic/config-4.19
@ -752,7 +752,6 @@ CONFIG_CARDBUS=y
 # CONFIG_CCS811 is not set
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
-CONFIG_CC_IS_GCC=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_CDROM_PKTCDVD is not set
@ -1605,7 +1604,6 @@ CONFIG_GACT_PROB=y
 # CONFIG_GAMEPORT is not set
 # CONFIG_GATEWORKS_GW16083 is not set
 # CONFIG_GCC_PLUGINS is not set
-CONFIG_GCC_VERSION=80300
 # CONFIG_GCOV is not set
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
--- a/target/linux/mediatek/mt7622/config-4.19
+++ b/target/linux/mediatek/mt7622/config-4.19
@ -131,7 +131,6 @@ CONFIG_BT_LE=y
 CONFIG_BT_MTKUART=y
 CONFIG_BT_QCA=y
 CONFIG_BUILD_BIN2C=y
-CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_CLOCK_THERMAL=y
--- a/target/linux/mediatek/mt7629/config-4.19
+++ b/target/linux/mediatek/mt7629/config-4.19
@ -52,7 +52,6 @@ CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_CACHE_L2X0=y
-CONFIG_CC_HAS_ASM_GOTO=y
 # CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CHR_DEV_SCH=y
--- a/target/linux/mvebu/config-4.19
+++ b/target/linux/mvebu/config-4.19
@ -73,7 +73,6 @@ CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_BOUNCE=y
 # CONFIG_CACHE_FEROCEON_L2 is not set
 CONFIG_CACHE_L2X0=y
-CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
 CONFIG_CLKSRC_MMIO=y
--- a/target/linux/mxs/config-4.19
+++ b/target/linux/mxs/config-4.19
@ -44,7 +44,6 @@ CONFIG_ARM_PATCH_PHYS_VIRT=y
 CONFIG_ARM_THUMB=y
 CONFIG_ATAGS=y
 CONFIG_AUTO_ZRELADDR=y
-CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_CLONE_BACKWARDS=y
@ -100,7 +99,6 @@ CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_FRAME_POINTER=y
 CONFIG_FS_IOMAP=y
 CONFIG_FS_MBCACHE=y
-CONFIG_GCC_VERSION=80300
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_GENERIC_ATOMIC64=y
 CONFIG_GENERIC_BUG=y
--- a/target/linux/ramips/dts/mt7621_netgear_r6220.dts
+++ b/target/linux/ramips/dts/mt7621_netgear_r6220.dts
@ -1,40 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0
 /dts-v1/;

-#include "mt7621_netgear_sercomm.dtsi"
+#include "mt7621_netgear_sercomm_ayx.dtsi"

 / {
 	compatible = "netgear,r6220", "mediatek,mt7621-soc";
 	model = "Netgear R6220";
-
-	keys {
-		compatible = "gpio-keys";
-
-		wps {
-			label = "wps";
-			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_WPS_BUTTON>;
-		};
-
-		wifi {
-			label = "wifi";
-			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RFKILL>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RESTART>;
-		};
-	};
-};
-
-&leds {
-	wps {
-		gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
-		label = "r6220:green:wps";
-	};
 };

 &led_power {
@ -53,6 +24,10 @@
 	label = "r6220:green:wifi";
 };

+&led_wps {
+	label = "r6220:green:wps";
+};
+
 &nand {
 	status = "okay";

--- a/target/linux/ramips/dts/mt7621_netgear_r6850.dts
+++ b/target/linux/ramips/dts/mt7621_netgear_r6850.dts
@ -3,9 +3,6 @@

 #include "mt7621_netgear_sercomm_chj.dtsi"

-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
 / {
 	compatible = "netgear,r6850", "mediatek,mt7621-soc";
 	model = "Netgear R6850";
--- a/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi
+++ b/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi
@ -21,7 +21,29 @@
 		bootargs = "console=ttyS0,57600";
 	};

-	leds: leds {
+	keys {
+		compatible = "gpio-keys";
+
+		wps {
+			label = "wps";
+			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
+		};
+
+		wifi {
+			label = "wifi";
+			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RFKILL>;
+		};
+
+		reset {
+			label = "reset";
+			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
+		};
+	};
+
+	leds {
 		compatible = "gpio-leds";

 		led_power: power {
@ -42,6 +64,10 @@
 			gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
 			linux,default-trigger = "phy0tpt";
 		};
+
+		led_wps: wps {
+			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
+		};
 	};

 	reg_usb_vbus: regulator {
--- a/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi
+++ b/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi
@ -1,9 +1,49 @@
 // SPDX-License-Identifier: GPL-2.0
 /dts-v1/;

-#include "mt7621_netgear_sercomm.dtsi"
+#include "mt7621.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>

 / {
+	compatible = "mediatek,mt7621-soc";
+
+	aliases {
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
+		label-mac-device = &ethernet;
+	};
+
+	chosen {
+		bootargs = "console=ttyS0,57600";
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led_power: power {
+			gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
+		};
+
+		led_usb: usb {
+			gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
+			linux,default-trigger = "usbport";
+		};
+
+		led_internet: internet {
+			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+		};
+
+		led_wifi: wifi {
+			gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "phy0tpt";
+		};
+	};
+
 	keys {
 		compatible = "gpio-keys";

@ -19,6 +59,54 @@
 			linux,code = <KEY_RESTART>;
 		};
 	};
+
+	reg_usb_vbus: regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "usb_vbus";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		gpio = <&gpio0 10 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+	};
+};
+
+&xhci {
+	vbus-supply = <&reg_usb_vbus>;
+};
+
+&pcie {
+	status = "okay";
+};
+
+&pcie0 {
+	wifi@0,0 {
+		compatible = "mediatek,mt76";
+		reg = <0x0 0 0 0 0>;
+		mediatek,mtd-eeprom = <&factory 0x8000>;
+		ieee80211-freq-limit = <5000000 6000000>;
+	};
+};
+
+&pcie1 {
+	wifi@0,0 {
+		compatible = "mediatek,mt76";
+		reg = <0x0 0 0 0 0>;
+		mediatek,mtd-eeprom = <&factory 0x0>;
+		ieee80211-freq-limit = <2400000 2500000>;
+	};
+};
+
+&ethernet {
+	mtd-mac-address = <&factory 0x4>;
+};
+
+&pinctrl {
+	state_default: pinctrl0 {
+		gpio {
+			ralink,group = "uart3", "uart2", "jtag", "wdt";
+			ralink,function = "gpio";
+		};
+	};
 };

 &nand {
--- a/target/linux/ramips/dts/mt7621_netgear_wndr3700-v5.dts
+++ b/target/linux/ramips/dts/mt7621_netgear_wndr3700-v5.dts
@ -1,40 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0
 /dts-v1/;

-#include "mt7621_netgear_sercomm.dtsi"
+#include "mt7621_netgear_sercomm_ayx.dtsi"

 / {
 	compatible = "netgear,wndr3700-v5", "mediatek,mt7621-soc";
 	model = "Netgear WNDR3700 v5";
-
-	keys {
-		compatible = "gpio-keys";
-
-		wps {
-			label = "wps";
-			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_WPS_BUTTON>;
-		};
-
-		wifi {
-			label = "wifi";
-			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RFKILL>;
-		};
-
-		reset {
-			label = "reset";
-			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RESTART>;
-		};
-	};
-};
-
-&leds {
-	wps {
-		gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
-		label = "wndr3700-v5:green:wps";
-	};
 };

 &led_power {
@ -53,6 +24,10 @@
 	label = "wndr3700-v5:green:wifi";
 };

+&led_wps {
+	label = "wndr3700-v5:green:wps";
+};
+
 &spi0 {
 	status = "okay";

--- a/target/linux/sunxi/config-4.19
+++ b/target/linux/sunxi/config-4.19
@ -79,7 +79,6 @@ CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_BOUNCE=y
 CONFIG_CACHE_L2X0=y
 CONFIG_CAN=y
-CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_CLONE_BACKWARDS=y
--- a/target/linux/zynq/config-4.19
+++ b/target/linux/zynq/config-4.19
@ -80,7 +80,6 @@ CONFIG_BUILD_BIN2C=y
 CONFIG_CACHE_L2X0=y
 CONFIG_CADENCE_TTC_TIMER=y
 CONFIG_CADENCE_WATCHDOG=y
-CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
 CONFIG_CLKSRC_MMIO=y
--- a/tools/ccache/Makefile
+++ b/tools/ccache/Makefile
@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/target.mk

 PKG_NAME:=ccache
-PKG_VERSION:=3.7.4
+PKG_VERSION:=3.7.6

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/ccache/ccache/releases/download/v$(PKG_VERSION)
-PKG_HASH:=04c0af414b8cf89e541daed59735547fbfd323b1aaa983da0216f6b6731e6836
+PKG_HASH:=73e2633ac9bca387b5a39c72a8f85634670c4091dab639228c433898163c86c0

 include $(INCLUDE_DIR)/host-build.mk

--- a/tools/ccache/patches/100-honour-copts.patch
+++ b/tools/ccache/patches/100-honour-copts.patch
@ -1,6 +1,6 @@
 --- a/src/ccache.c
 +++ b/src/ccache.c
-@@ -2197,6 +2197,7 @@ calculate_object_hash(struct args *args,
+@@ -2224,6 +2224,7 @@ calculate_object_hash(struct args *args,
 			"CPLUS_INCLUDE_PATH",
 			"OBJC_INCLUDE_PATH",
 			"OBJCPLUS_INCLUDE_PATH", // clang
--- a/tools/expat/Makefile
+++ b/tools/expat/Makefile
@ -13,7 +13,7 @@ PKG_VERSION:=2.2.9

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_HASH:=f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237
-PKG_SOURCE_URL:=@SF/expat
+PKG_SOURCE_URL:=https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$(PKG_VERSION))

 HOST_BUILD_PARALLEL:=1

--- a/tools/quilt/Makefile
+++ b/tools/quilt/Makefile
@ -7,11 +7,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=quilt
-PKG_VERSION:=0.65
+PKG_VERSION:=0.66

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SAVANNAH/quilt
-PKG_HASH:=f6cbc788e5cbbb381a3c6eab5b9efce67c776a8662a7795c7432fd27aa096819
+PKG_HASH:=314b319a6feb13bf9d0f9ffa7ce6683b06919e734a41275087ea457cc9dc6e07

 include $(INCLUDE_DIR)/host-build.mk

--- a/tools/quilt/patches/000-relocatable.patch
+++ b/tools/quilt/patches/000-relocatable.patch
@ -101,7 +101,7 @@
 MKTEMP :=	@MKTEMP@
 MSGMERGE :=	@MSGMERGE@
 MSGFMT :=	@MSGFMT@
-@@ -48,8 +48,8 @@ USE_NLS :=	@USE_NLS@
+@@ -49,8 +49,8 @@ USE_NLS :=	@USE_NLS@
 STAT_HARDLINK := @STAT_HARDLINK@
 PATCH_WRAPPER := @PATCH_WRAPPER@
 
--- a/tools/quilt/patches/001-fix_compile.patch
+++ b/tools/quilt/patches/001-fix_compile.patch
@ -1,6 +1,6 @@
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -272,13 +272,10 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu
+@@ -275,13 +275,10 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu
 	@$(if $(filter $@,$(NON_EXEC_IN)),,chmod +x $@)
 
 configure : configure.ac aclocal.m4