Merge remote-tracking branch 'upstream/master'

update version to R7.4.2
2025-04-18 17:33:31 +00:00 · 2017-10-10 16:49:29 +08:00 · 2017-10-10 16:49:29 +08:00 · 3fd585c9d5
commit 3fd585c9d5
parent 9dcde4fc39 2c436ddb77
20 changed files with 246 additions and 129 deletions
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@ -3,12 +3,12 @@
 LINUX_RELEASE?=1

 LINUX_VERSION-3.18 = .71
-LINUX_VERSION-4.4 = .89
-LINUX_VERSION-4.9 = .52
+LINUX_VERSION-4.4 = .91
+LINUX_VERSION-4.9 = .54

 LINUX_KERNEL_HASH-3.18.71 = 5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240
-LINUX_KERNEL_HASH-4.4.89 = a81d1b1306e4fddee5d6f7219090a616073b02f4069e44522a9c0454b17f2b67
-LINUX_KERNEL_HASH-4.9.52 = ffdd034f1bf32fa41d1a66a347388c0dc4c3cff6f578a1e29d88b20fbae1048a
+LINUX_KERNEL_HASH-4.4.91 = cb9d2b8c1afe58414de5bc7d65429cc9f5f37c80fc229d0e83c55c5c3c254ffb
+LINUX_KERNEL_HASH-4.9.54 = 651005db6efbce4fcd607415ebd697dd8d2f5a2abc2c632b11ece03a1a210fc5

 ifdef KERNEL_PATCHVER
  LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
--- a/package/lean/default-settings/Makefile
+++ b/package/lean/default-settings/Makefile
@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=default-settings
 PKG_VERSION:=1.0
-PKG_RELEASE:=21
+PKG_RELEASE:=22
 PKG_LICENSE:=GPLv3
 PKG_LICENSE_FILES:=LICENSE

--- a/package/lean/default-settings/files/zzz-default-settings
+++ b/package/lean/default-settings/files/zzz-default-settings
@ -47,9 +47,9 @@ sed -i '/set wireless.radio${devidx}.disabled/d' /lib/wifi/mac80211.sh
 wifi up

 sed -i '/DISTRIB_REVISION/d' /etc/openwrt_release
-echo "DISTRIB_REVISION='R7.4.1 By Lean'" >> /etc/openwrt_release
+echo "DISTRIB_REVISION='R7.4.2 By Lean'" >> /etc/openwrt_release
 sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release
-echo "DISTRIB_DESCRIPTION='LEDE 17.01.2'" >> /etc/openwrt_release
+echo "DISTRIB_DESCRIPTION='LEDE 17.01.3'" >> /etc/openwrt_release

 exit 0

--- a/package/lean/libcryptopp/Makefile
+++ b/package/lean/libcryptopp/Makefile
@ -0,0 +1,66 @@
+#
+# Copyright (C) 2009-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libcryptopp
+PKG_VERSION:=5.6.4
+PKG_RELEASE:=1
+
+PKG_SOURCE:=cryptopp$(subst .,,$(PKG_VERSION)).zip
+PKG_SOURCE_URL:=http://www.cryptopp.com/
+PKG_MD5SUM:=4ee7e5cdd4a45a14756c169eaf2a77fc
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
+
+CMAKE_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/libcryptopp
+  SECTION:=libs
+  CATEGORY:=Libraries
+  DEPENDS:=+libpthread +libstdcpp
+  TITLE:=Crypto++ is library for creating C++ programs which use cryptographic algorithms
+  URL:=http://packages.debian.org/sid/libcrypto++-dev
+endef
+
+define Package/package/libcryptopp
+  Crypto++ is library for creating C++ programs which use cryptographic algorithms.
+  The library uses a Pipes & Filters architecture with heavy use of templates and
+  abstract base classes.
+endef
+
+#CONFIGURE_ARGS += \
+#	--enable-static \
+#	--enable-shared
+
+#TARGET_LDFLAGS += \
+#	-lpthread
+CMAKE_OPTIONS += -DCMAKE_CXX_FLAGS="$(FPIC)"
+CMAKE_OPTIONS += -DBUILD_STATIC=ON
+CMAKE_OPTIONS += -DBUILD_SHARED=ON
+
+UNPACK_CMD=cd $(PKG_BUILD_DIR) && unzip "$(DL_DIR)/$(PKG_SOURCE)"
+define Build/Prepare
+	$(Build/Prepare/Default)
+	cd $(PKG_BUILD_DIR) && rm -f GNUmakefile GNUmakefile-cross 
+endef
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/cryptopp
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/cryptopp/* $(1)/usr/include/cryptopp/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcryptopp.{a,so*} $(1)/usr/lib/
+endef
+
+define Package/libcryptopp/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcryptopp.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libcryptopp))
--- a/package/lean/luci-app-adbyby-plus/Makefile
+++ b/package/lean/luci-app-adbyby-plus/Makefile
@ -10,7 +10,7 @@ LUCI_DEPENDS:=+adbyby +wget +ipset +coreutils +coreutils-nohup +dnsmasq-full
 LUCI_PKGARCH:=all
 PKG_NAME:=luci-app-adbyby-plus
 PKG_VERSION:=2.0
-PKG_RELEASE:=20
+PKG_RELEASE:=21

 include $(TOPDIR)/feeds/luci/luci.mk

--- a/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adupdate.sh
+++ b/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adupdate.sh
@ -10,8 +10,8 @@ if [ $update_source -eq 1 ]; then
  wget -t 1 -T 10 -O /tmp/user.action http://update.adbyby.com/rule3/user.action
 fi

-[ ! -s "/tmp/lazy.txt" ] && wget --no-check-certificate -O /tmp/lazy.txt https://raw.githubusercontent.com/adbyby/xwhyc-rules/master/lazy.txt
-[ ! -s "/tmp/video.txt" ] && wget --no-check-certificate -O /tmp/video.txt https://raw.githubusercontent.com/adbyby/xwhyc-rules/master/video.txt
+[ ! -s "/tmp/lazy.txt" ] && wget-ssl --no-check-certificate -O /tmp/lazy.txt https://raw.githubusercontent.com/adbyby/xwhyc-rules/master/lazy.txt
+[ ! -s "/tmp/video.txt" ] && wget-ssl --no-check-certificate -O /tmp/video.txt https://raw.githubusercontent.com/adbyby/xwhyc-rules/master/video.txt

 [ -s "/tmp/lazy.txt" ] && ( ! cmp -s /tmp/lazy.txt /usr/share/adbyby/data/lazy.txt ) && mv /tmp/lazy.txt /usr/share/adbyby/data/lazy.txt	
 [ -s "/tmp/video.txt" ] && ( ! cmp -s /tmp/video.txt /usr/share/adbyby/data/video.txt ) && mv /tmp/video.txt /usr/share/adbyby/data/video.txt	
--- a/package/lean/wxbase/Makefile
+++ b/package/lean/wxbase/Makefile
@ -0,0 +1,136 @@
+#
+# Copyright (C) 2007-2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=wxbase
+PKG_VERSION:=2.8.12
+PKG_RELEASE:=1
+
+PKG_SOURCE:=wxGTK-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=@SF/wxwindows
+PKG_MD5SUM:=08f81ab60647308058f6ce99712b14f8
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/wxGTK-$(PKG_VERSION)
+
+PKG_INSTALL:=1
+
+PKG_CHECK_FORMAT_SECURITY:=0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libwxbase
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Cross-platform C++ framework
+  URL:=http://www.wxwidgets.org/
+  DEPENDS:=+libexpat +libstdcpp +zlib +libpthread
+endef
+
+define Package/libwxbase/description
+ wxBase contains most of the non-GUI classes from the wxWindows cross-
+ -platform C++ framework. There are 2 categories: generally useful portable
+ code (date/time handling, command line parsing, regular expression support)
+ and wrappers for the OS objects (files, directories, sockets, threads,
+ etc.) allowing you to write portable programs easily.
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+# XXX: aMule *needs* the following configure options to be enabled:
+#	--enable-intl
+#	--enable-largefile
+#	--disable-no_rtti
+#	--with-regex
+#	--enable-unicode
+CONFIGURE_ARGS+= \
+	--enable-shared \
+	--disable-rpath \
+	--with-gnu-ld \
+	--disable-gui \
+	--disable-monolithic \
+	--enable-plugins \
+	--disable-universal \
+	--disable-nanox \
+	--disable-gtk2 \
+	--disable-gpe \
+	--disable-optimise \
+	--disable-debug \
+	--disable-stl \
+	--disable-omf \
+	--disable-debug_flag \
+	--disable-debug_info \
+	--disable-debug_gdb \
+	--disable-debug_cntxt \
+	--disable-mem_tracing \
+	--disable-profile \
+	--disable-no_rtti \
+	--disable-no_exceptions \
+	--disable-compat22 \
+	--disable-compat24 \
+	--enable-intl \
+	--disable-backtrace \
+	--enable-exceptions \
+	--disable-sound \
+	--enable-largefile \
+	\
+	--without-gtk \
+	--without-motif \
+	--without-mac \
+	--without-cocoa \
+	--without-wine \
+	--without-msw \
+	--without-pm \
+	--without-mgl \
+	--without-microwin \
+	--without-x11 \
+	--without-libpng \
+	--without-libjpeg \
+	--without-libtiff \
+	--without-libxpm \
+	--without-libmspack \
+	--without-sdl \
+	--without-gnomeprint \
+	--without-opengl \
+	--without-dmalloc \
+	--with-regex="sys" \
+	--with-zlib="sys" \
+	--without-odbc \
+	--with-expat="sys" \
+	--without-gtk-prefix \
+	--without-x \
+	--without-libiconv-prefix \
+	--without-sdl-prefix \
+	--without-cppunit-prefix \
+	--disable-precomp-headers 
+
+UNICODE=yes
+
+ifeq ($(UNICODE),yes)
+  CONFIGURE_ARGS+= --enable-unicode
+  LIB_PFX:=u
+else
+  CONFIGURE_ARGS+= --disable-unicode
+  LIB_PFX:=
+endif
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include $(1)/usr/lib
+	$(CP) -L $(PKG_BUILD_DIR)/wx-config $(1)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/wx-2.8 $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base$(LIB_PFX){,_net,_xml}-*.so* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/wx $(1)/usr/lib/
+	$(SED) 's,-I$$$${includedir}/wx-2.8,-I$(STAGING_DIR)/usr/include/wx-2.8,g' $(1)/usr/bin/wx-config
+	$(SED) 's,-I$$$${libdir}/wx/include,-I$(STAGING_DIR)/usr/lib/wx/include,g' $(1)/usr/bin/wx-config
+endef
+
+define Package/libwxbase/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwx_base$(LIB_PFX){,_net,_xml}-*.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libwxbase))
--- a/package/lean/wxbase/patches/wxGTK-2.8.12-abicheck.patch
+++ b/package/lean/wxbase/patches/wxGTK-2.8.12-abicheck.patch
@ -0,0 +1,15 @@
+diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp
+--- wxGTK-2.8.12/src/common/appbase.cpp.abicheck	2015-03-12 17:15:18.000000000 +0100
+++ wxGTK-2.8.12/src/common/appbase.cpp	2015-03-12 17:15:57.000000000 +0100
+@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con
+         msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
+                    lib.c_str(), progName.c_str(), prog.c_str());
+ 
+-        wxLogFatalError(msg.c_str());
+-
+-        // normally wxLogFatalError doesn't return
+-        return false;
+        wxLogWarning(msg.c_str());
+     }
+ #undef wxCMP
+ 
--- a/target/linux/ar71xx/patches-4.4/930-chipidea-pullup.patch
+++ b/target/linux/ar71xx/patches-4.4/930-chipidea-pullup.patch
@ -58,7 +58,7 @@
 		return;
 +	}
 
- 	if (hw_read_otgsc(ci, OTGSC_BSV))
+ 	if (hw_read_otgsc(ci, OTGSC_BSV) && !ci->vbus_active)
 		usb_gadget_vbus_connect(&ci->gadget);
 --- a/include/linux/usb/chipidea.h
 +++ b/include/linux/usb/chipidea.h
--- a/target/linux/bcm53xx/patches-4.9/033-0018-ARM-dts-BCM5301X-Specify-serial-console-params-in-dt.patch
+++ b/target/linux/bcm53xx/patches-4.9/033-0018-ARM-dts-BCM5301X-Specify-serial-console-params-in-dt.patch
@ -157,5 +157,5 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
 -	};
 -
 	memory {
- 		reg = <0x00000000 0x10000000>;
+ 		reg = <0x80000000 0x10000000>;
 	};
--- a/target/linux/brcm2708/patches-4.9/950-0084-Support-for-Blokas-Labs-pisound-board.patch
+++ b/target/linux/brcm2708/patches-4.9/950-0084-Support-for-Blokas-Labs-pisound-board.patch
@ -19,8 +19,8 @@ Print a logline when the kernel module is removed.

 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt
 +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
-@@ -40,6 +40,7 @@ auvidea Auvidea GmbH
- avago	Avago Technologies
+@@ -41,6 +41,7 @@ avago	Avago Technologies
+ avia	avia semiconductor
 avic	Shanghai AVIC Optoelectronics Co., Ltd.
 axis	Axis Communications AB
 +blokaslabs	Vilniaus Blokas UAB
--- a/target/linux/generic/hack-4.9/721-phy_packets.patch
+++ b/target/linux/generic/hack-4.9/721-phy_packets.patch
@ -101,7 +101,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 	help
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -2939,10 +2939,20 @@ static int xmit_one(struct sk_buff *skb,
+@@ -2942,10 +2942,20 @@ static int xmit_one(struct sk_buff *skb,
 	if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all))
 		dev_queue_xmit_nit(skb, dev);
 
--- a/target/linux/generic/pending-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
+++ b/target/linux/generic/pending-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
@ -17,7 +17,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>

 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -4256,6 +4256,9 @@ static enum gro_result dev_gro_receive(s
+@@ -4259,6 +4259,9 @@ static enum gro_result dev_gro_receive(s
 	enum gro_result ret;
 	int grow;
 
@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 	if (!(skb->dev->features & NETIF_F_GRO))
 		goto normal;
 
-@@ -5422,6 +5425,48 @@ static void __netdev_adjacent_dev_unlink
+@@ -5425,6 +5428,48 @@ static void __netdev_adjacent_dev_unlink
 					   &upper_dev->adj_list.lower);
 }
 
@ -76,7 +76,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 static int __netdev_upper_dev_link(struct net_device *dev,
 				   struct net_device *upper_dev, bool master,
 				   void *private)
-@@ -5493,6 +5538,7 @@ static int __netdev_upper_dev_link(struc
+@@ -5496,6 +5541,7 @@ static int __netdev_upper_dev_link(struc
 			goto rollback_lower_mesh;
 	}
 
@ -84,7 +84,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 	call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
 				      &changeupper_info.info);
 	return 0;
-@@ -5619,6 +5665,7 @@ void netdev_upper_dev_unlink(struct net_
+@@ -5622,6 +5668,7 @@ void netdev_upper_dev_unlink(struct net_
 	list_for_each_entry(i, &upper_dev->all_adj_list.upper, list)
 		__netdev_adjacent_dev_unlink(dev, i->dev, i->ref_nr);
 
@ -92,7 +92,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 	call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
 				      &changeupper_info.info);
 }
-@@ -6159,6 +6206,7 @@ int dev_set_mac_address(struct net_devic
+@@ -6162,6 +6209,7 @@ int dev_set_mac_address(struct net_devic
 	if (err)
 		return err;
 	dev->addr_assign_type = NET_ADDR_SET;
--- a/target/linux/generic/pending-4.4/721-phy_packets.patch
+++ b/target/linux/generic/pending-4.4/721-phy_packets.patch
@ -86,7 +86,7 @@
 	help
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -2743,10 +2743,20 @@ static int xmit_one(struct sk_buff *skb,
+@@ -2746,10 +2746,20 @@ static int xmit_one(struct sk_buff *skb,
 	if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all))
 		dev_queue_xmit_nit(skb, dev);
 
--- a/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
+++ b/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
@ -34,7 +34,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 	__u16			tc_index;	/* traffic control index */
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -4520,6 +4520,9 @@ static enum gro_result dev_gro_receive(s
+@@ -4523,6 +4523,9 @@ static enum gro_result dev_gro_receive(s
 	enum gro_result ret;
 	int grow;
 
@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 	if (!(skb->dev->features & NETIF_F_GRO))
 		goto normal;
 
-@@ -5808,6 +5811,48 @@ static void __netdev_adjacent_dev_unlink
+@@ -5811,6 +5814,48 @@ static void __netdev_adjacent_dev_unlink
 					   &upper_dev->adj_list.lower);
 }
 
@ -93,7 +93,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 static int __netdev_upper_dev_link(struct net_device *dev,
 				   struct net_device *upper_dev, bool master,
 				   void *upper_priv, void *upper_info)
-@@ -6006,6 +6051,8 @@ void netdev_upper_dev_unlink(struct net_
+@@ -6009,6 +6054,8 @@ void netdev_upper_dev_unlink(struct net_
 	list_for_each_entry(i, &upper_dev->all_adj_list.upper, list)
 		__netdev_adjacent_dev_unlink(dev, i->dev, i->ref_nr);
 
@ -102,7 +102,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 	call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
 				      &changeupper_info.info);
 }
-@@ -6606,6 +6653,7 @@ int dev_set_mac_address(struct net_devic
+@@ -6609,6 +6656,7 @@ int dev_set_mac_address(struct net_devic
 	if (err)
 		return err;
 	dev->addr_assign_type = NET_ADDR_SET;
--- a/target/linux/mediatek/patches-4.9/0048-net-core-add-RPS-balancer.patch
+++ b/target/linux/mediatek/patches-4.9/0048-net-core-add-RPS-balancer.patch
@ -10,7 +10,7 @@ Signed-off-by: John Crispin <john@phrozen.org>

 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -3547,6 +3547,58 @@ set_rps_cpu(struct net_device *dev, stru
+@@ -3550,6 +3550,58 @@ set_rps_cpu(struct net_device *dev, stru
 	return rflow;
 }
 
@ -69,7 +69,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 /*
  * get_rps_cpu is called from netif_receive_skb and returns the target
  * CPU from the RPS map of the receiving queue for a given skb.
-@@ -3636,7 +3688,7 @@ static int get_rps_cpu(struct net_device
+@@ -3639,7 +3691,7 @@ static int get_rps_cpu(struct net_device
 try_rps:
 
 	if (map) {
@ -78,7 +78,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 		if (cpu_online(tcpu)) {
 			cpu = tcpu;
 			goto done;
-@@ -8427,6 +8479,9 @@ static int __init net_dev_init(void)
+@@ -8430,6 +8482,9 @@ static int __init net_dev_init(void)
 		sd->backlog.weight = weight_p;
 	}
 
--- a/target/linux/oxnas/patches-4.4/250-add-plxtech-vendor-prefix.patch
+++ b/target/linux/oxnas/patches-4.4/250-add-plxtech-vendor-prefix.patch
@ -1,6 +1,6 @@
 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt
 +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
-@@ -174,6 +174,7 @@ picochip	Picochip Ltd
+@@ -175,6 +175,7 @@ picochip	Picochip Ltd
 plathome	Plat'Home Co., Ltd.
 plda	PLDA
 pixcir  PIXCIR MICROELECTRONICS Co., Ltd
--- a/target/linux/ramips/patches-4.9/0067-enable-mt7621-xhci.patch
+++ b/target/linux/ramips/patches-4.9/0067-enable-mt7621-xhci.patch
@ -1,14 +0,0 @@
--- a/drivers/usb/host/Kconfig
-+++ b/drivers/usb/host/Kconfig
-@@ -45,9 +45,9 @@ config USB_XHCI_PLATFORM
- 	  If unsure, say N.
- 
- config USB_XHCI_MTK
-	tristate "xHCI support for Mediatek MT65xx"
-+	tristate "xHCI support for Mediatek MT65xx/MT7621"
- 	select MFD_SYSCON
-	depends on ARCH_MEDIATEK || COMPILE_TEST
-+	depends on SOC_MT7621 || ARCH_MEDIATEK || COMPILE_TEST
- 	---help---
- 	  Say 'Y' to enable the support for the xHCI host controller
- 	  found in Mediatek MT65xx SoCs.
--- a/target/linux/ramips/patches-4.9/0085-pinmux-util.patch
+++ b/target/linux/ramips/patches-4.9/0085-pinmux-util.patch
@ -1,77 +0,0 @@
--- a/arch/mips/ralink/mt7620.c
-+++ b/arch/mips/ralink/mt7620.c
-@@ -176,7 +176,7 @@ static struct rt2880_pmx_func spi_cs1_gr
- 
- static struct rt2880_pmx_func spis_grp_mt7628[] = {
- 	FUNC("pwm_uart2", 3, 14, 4),
-	FUNC("util", 2, 14, 4),
-+	FUNC("utif", 2, 14, 4),
- 	FUNC("gpio", 1, 14, 4),
- 	FUNC("spis", 0, 14, 4),
- };
-@@ -190,28 +190,28 @@ static struct rt2880_pmx_func gpio_grp_m
- 
- static struct rt2880_pmx_func p4led_kn_grp_mt7628[] = {
- 	FUNC("jtag", 3, 30, 1),
-	FUNC("util", 2, 30, 1),
-+	FUNC("utif", 2, 30, 1),
- 	FUNC("gpio", 1, 30, 1),
- 	FUNC("p4led_kn", 0, 30, 1),
- };
- 
- static struct rt2880_pmx_func p3led_kn_grp_mt7628[] = {
- 	FUNC("jtag", 3, 31, 1),
-	FUNC("util", 2, 31, 1),
-+	FUNC("utif", 2, 31, 1),
- 	FUNC("gpio", 1, 31, 1),
- 	FUNC("p3led_kn", 0, 31, 1),
- };
- 
- static struct rt2880_pmx_func p2led_kn_grp_mt7628[] = {
- 	FUNC("jtag", 3, 32, 1),
-	FUNC("util", 2, 32, 1),
-+	FUNC("utif", 2, 32, 1),
- 	FUNC("gpio", 1, 32, 1),
- 	FUNC("p2led_kn", 0, 32, 1),
- };
- 
- static struct rt2880_pmx_func p1led_kn_grp_mt7628[] = {
- 	FUNC("jtag", 3, 33, 1),
-	FUNC("util", 2, 33, 1),
-+	FUNC("utif", 2, 33, 1),
- 	FUNC("gpio", 1, 33, 1),
- 	FUNC("p1led_kn", 0, 33, 1),
- };
-@@ -232,28 +232,28 @@ static struct rt2880_pmx_func wled_kn_gr
- 
- static struct rt2880_pmx_func p4led_an_grp_mt7628[] = {
- 	FUNC("jtag", 3, 39, 1),
-	FUNC("util", 2, 39, 1),
-+	FUNC("utif", 2, 39, 1),
- 	FUNC("gpio", 1, 39, 1),
- 	FUNC("p4led_an", 0, 39, 1),
- };
- 
- static struct rt2880_pmx_func p3led_an_grp_mt7628[] = {
- 	FUNC("jtag", 3, 40, 1),
-	FUNC("util", 2, 40, 1),
-+	FUNC("utif", 2, 40, 1),
- 	FUNC("gpio", 1, 40, 1),
- 	FUNC("p3led_an", 0, 40, 1),
- };
- 
- static struct rt2880_pmx_func p2led_an_grp_mt7628[] = {
- 	FUNC("jtag", 3, 41, 1),
-	FUNC("util", 2, 41, 1),
-+	FUNC("utif", 2, 41, 1),
- 	FUNC("gpio", 1, 41, 1),
- 	FUNC("p2led_an", 0, 41, 1),
- };
- 
- static struct rt2880_pmx_func p1led_an_grp_mt7628[] = {
- 	FUNC("jtag", 3, 42, 1),
-	FUNC("util", 2, 42, 1),
-+	FUNC("utif", 2, 42, 1),
- 	FUNC("gpio", 1, 42, 1),
- 	FUNC("p1led_an", 0, 42, 1),
- };
--- a/target/linux/ramips/patches-4.9/301-fix-rt3883.patch
+++ b/target/linux/ramips/patches-4.9/301-fix-rt3883.patch
@ -1,9 +0,0 @@
--- a/arch/mips/ralink/rt3883.c
-+++ b/arch/mips/ralink/rt3883.c
-@@ -147,5 +147,5 @@ void prom_soc_init(struct ralink_soc_inf
- 
- 	rt2880_pinmux_data = rt3883_pinmux_data;
- 
-	ralink_soc == RT3883_SOC;
-+	ralink_soc = RT3883_SOC;
- }