Merge Official Source

2020-04-15 20:21:38 +08:00 · 2020-04-15 20:21:38 +08:00 · 924089dd4c
commit 924089dd4c
parent f29471fe1e 508462a399
13 changed files with 50 additions and 59 deletions
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@ -8,11 +8,11 @@ endif

 LINUX_VERSION-4.14 = .174
 LINUX_VERSION-4.19 = .113
-LINUX_VERSION-5.4 = .31
+LINUX_VERSION-5.4 = .32

 LINUX_KERNEL_HASH-4.14.174 = 4c223ca3565d4267b403f7432860d87c8301767eb654d046d268782b18155189
 LINUX_KERNEL_HASH-4.19.113 = b5a0576d5f7e85aeeba4922fba8d9aa2c2a09cd6f48d07265999b890cf97c0e5
-LINUX_KERNEL_HASH-5.4.31 = a11083f8f809887f6a0f8d4467532385b99418f17998fe6e837807491c276eeb
+LINUX_KERNEL_HASH-5.4.32 = 192d99fab7a47a537493b6d7eddb52892b98f8ada655c0bbb419b360a995f2b3

 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
--- a/package/network/config/netifd/Makefile
+++ b/package/network/config/netifd/Makefile
@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=netifd
-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git
 PKG_SOURCE_DATE:=2020-04-14
-PKG_SOURCE_VERSION:=dbf97b47a53809a6ff812d4466d2082aa4d3efb6
-PKG_MIRROR_HASH:=c46c4c12edcf5a869b8d84197700415e538d3e4d5f1cbe35e2baa30f15d49a17
+PKG_SOURCE_VERSION:=cfccdc22ca6d8f28d70a2546a495c9ead4bbb765
+PKG_MIRROR_HASH:=4c680fa979f21b2a1280e8bffca9fa1412215a4058dfcde2569df9befea43999
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>

 PKG_LICENSE:=GPL-2.0
--- a/package/system/procd/Makefile
+++ b/package/system/procd/Makefile
@ -12,9 +12,9 @@ PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git
-PKG_SOURCE_DATE:=2020-04-09
-PKG_SOURCE_VERSION:=28a06e55cd4235faf52638dd85709e3da04c5c06
-PKG_MIRROR_HASH:=f747393e2208888fdb15444d0fad354f46e47cccc393fd408e8cb1c51ef1dfc8
+PKG_SOURCE_DATE:=2020-04-14
+PKG_SOURCE_VERSION:=a4cc165a9fdcc9d76a0ba58a2e9ccde605e5f40d
+PKG_MIRROR_HASH:=773585b1616884829d86efe349ac61bc9b9e4a0c46e2ec0ed6ce913cced7806e
 CMAKE_INSTALL:=1

 PKG_LICENSE:=GPL-2.0
--- a/scripts/download.pl
+++ b/scripts/download.pl
@ -272,6 +272,7 @@ foreach my $mirror (@ARGV) {
 	}
 }

+unshift @mirrors, 'https://sources.cdn.openwrt.org';
 #push @mirrors, 'https://mirror1.openwrt.org';
 push @mirrors, 'https://sources.openwrt.org';
 push @mirrors, 'https://mirror2.openwrt.org/sources';
--- a/scripts/json_overview_image_info.py
+++ b/scripts/json_overview_image_info.py
@ -15,8 +15,6 @@ assert getenv("WORK_DIR"), "$WORK_DIR required"

 work_dir = Path(getenv("WORK_DIR"))

-assert work_dir.is_dir(), "$WORK_DIR not a directory"
-
 output = {}

 for json_file in work_dir.glob("*.json"):
--- a/target/linux/ath79/image/tiny-tp-link.mk
+++ b/target/linux/ath79/image/tiny-tp-link.mk
@ -166,6 +166,7 @@ define Device/tplink_tl-wa901nd-v2
  DEVICE_MODEL := TL-WA901ND
  DEVICE_VARIANT := v2
  TPLINK_HWID := 0x09010002
+  SUPPORTED_DEVICES += tl-wa901nd-v2
 endef
 TARGET_DEVICES += tplink_tl-wa901nd-v2

--- a/target/linux/ath79/patches-5.4/410-spi-ath79-Implement-the-spi_mem-interface.patch
+++ b/target/linux/ath79/patches-5.4/410-spi-ath79-Implement-the-spi_mem-interface.patch
@ -8,10 +8,8 @@ Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
 drivers/spi/spi-ath79.c | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

-Index: linux-5.4.22/drivers/spi/spi-ath79.c
-===================================================================
--- linux-5.4.22.orig/drivers/spi/spi-ath79.c
-+++ linux-5.4.22/drivers/spi/spi-ath79.c
+--- a/drivers/spi/spi-ath79.c
+++ b/drivers/spi/spi-ath79.c
@@ -15,6 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
--- a/target/linux/generic/backport-5.4/745-v5.7-net-dsa-mt7530-add-support-for-port-mirroring.patch
+++ b/target/linux/generic/backport-5.4/745-v5.7-net-dsa-mt7530-add-support-for-port-mirroring.patch
@ -82,7 +82,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 static enum dsa_tag_protocol
 mtk_get_tag_protocol(struct dsa_switch *ds, int port)
 {
-@@ -1606,6 +1664,8 @@ static const struct dsa_switch_ops mt753
+@@ -1609,6 +1667,8 @@ static const struct dsa_switch_ops mt753
 	.port_vlan_prepare	= mt7530_port_vlan_prepare,
 	.port_vlan_add		= mt7530_port_vlan_add,
 	.port_vlan_del		= mt7530_port_vlan_del,
--- a/target/linux/generic/backport-5.4/746-stable-net-dsa-mt7530-fix-null-pointer-dereferencing-in-por.patch
+++ b/target/linux/generic/backport-5.4/746-stable-net-dsa-mt7530-fix-null-pointer-dereferencing-in-por.patch
@ -1,39 +0,0 @@
-From 0452800f6db4ed0a42ffb15867c0acfd68829f6a Mon Sep 17 00:00:00 2001
-From: Chuanhong Guo <gch981213@gmail.com>
-Date: Fri, 3 Apr 2020 19:28:24 +0800
-Subject: net: dsa: mt7530: fix null pointer dereferencing in port5 setup
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The 2nd gmac of mediatek soc ethernet may not be connected to a PHY
-and a phy-handle isn't always available.
-Unfortunately, mt7530 dsa driver assumes that the 2nd gmac is always
-connected to switch port 5 and setup mt7530 according to phy address
-of 2nd gmac node, causing null pointer dereferencing when phy-handle
-isn't defined in dts.
-This commit fix this setup code by checking return value of
-of_parse_phandle before using it.
-
-Fixes: 38f790a80560 ("net: dsa: mt7530: Add support for port 5")
-Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
-Reviewed-by: Vivien Didelot <vivien.didelot@gmail.com>
-Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-Tested-by: René van Dorst <opensource@vdorst.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
---
- drivers/net/dsa/mt7530.c | 3 +++
- 1 file changed, 3 insertions(+)
-
--- a/drivers/net/dsa/mt7530.c
-+++ b/drivers/net/dsa/mt7530.c
-@@ -1411,6 +1411,9 @@ mt7530_setup(struct dsa_switch *ds)
- 				continue;
- 
- 			phy_node = of_parse_phandle(mac_np, "phy-handle", 0);
-+			if (!phy_node)
-+				continue;
-+
- 			if (phy_node->parent == priv->dev->of_node->parent) {
- 				interface = of_get_phy_mode(mac_np);
- 				id = of_mdio_parse_addr(ds->dev, phy_node);
--- a/target/linux/generic/pending-5.4/001-v5.4-pinctrl-qcom-fix-wrong-write-in-update_dual_edge.patch.patch
+++ b/target/linux/generic/pending-5.4/001-v5.4-pinctrl-qcom-fix-wrong-write-in-update_dual_edge.patch.patch
@ -0,0 +1,26 @@
+From 17d4771b9740e0c504067b18d527cc29ba490e16 Mon Sep 17 00:00:00 2001
+From: Ansuel Smith <ansuelsmth@gmail.com>
+Date: Tue, 14 Apr 2020 02:28:00 +0200
+Subject: [PATCH] pinctrl: qcom: fix wrong write in update_dual_edge
+
+Fix a typo in the readl/writel accessor conversion where val is used
+instead of pol changing the behavior of the original code.
+
+Fixes: 6c73698904aa pinctrl: qcom: Introduce readl/writel accessors
+
+Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
+---
+ drivers/pinctrl/qcom/pinctrl-msm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/pinctrl/qcom/pinctrl-msm.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm.c
+@@ -688,7 +688,7 @@ static void msm_gpio_update_dual_edge_po
+ 
+ 		pol = msm_readl_intr_cfg(pctrl, g);
+ 		pol ^= BIT(g->intr_polarity_bit);
+-		msm_writel_intr_cfg(val, pctrl, g);
+		msm_writel_intr_cfg(pol, pctrl, g);
+ 
+ 		val2 = msm_readl_io(pctrl, g) & BIT(g->in_bit);
+ 		intstat = msm_readl_intr_status(pctrl, g);
--- a/target/linux/ipq40xx/patches-5.4/304-mtd-spi-nor-Add-support-for-mx25r3235f.patch
+++ b/target/linux/ipq40xx/patches-5.4/304-mtd-spi-nor-Add-support-for-mx25r3235f.patch
@ -15,7 +15,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>

 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -2286,6 +2286,8 @@ static const struct flash_info spi_nor_i
+@@ -2313,6 +2313,8 @@ static const struct flash_info spi_nor_i
 	{ "mx25u6435f",  INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) },
 	{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
 	{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@ -565,6 +565,7 @@ endef
 TARGET_DEVICES += netgear_ex6150

 define Device/netgear_sercomm_nand
+  $(Device/uimage-lzma-loader)
  BLOCKSIZE := 128k
  PAGESIZE := 2048
  KERNEL_SIZE := 4096k
@ -658,6 +659,7 @@ endef
 TARGET_DEVICES += netgear_r6850

 define Device/netgear_wndr3700-v5
+  $(Device/uimage-lzma-loader)
  BLOCKSIZE := 64k
  IMAGE_SIZE := 15232k
  SERCOMM_HWID := AYB
@ -792,6 +794,7 @@ endef
 TARGET_DEVICES += tplink_re650-v1

 define Device/ubnt_edgerouter_common
+  $(Device/uimage-lzma-loader)
  DEVICE_VENDOR := Ubiquiti
  IMAGE_SIZE := 256768k
  FILESYSTEMS := squashfs
@ -868,6 +871,7 @@ endef
 TARGET_DEVICES += wevo_w2914ns-v2

 define Device/xiaomi_mir3g
+  $(Device/uimage-lzma-loader)
  BLOCKSIZE := 128k
  PAGESIZE := 2048
  KERNEL_SIZE := 4096k
@ -887,6 +891,7 @@ endef
 TARGET_DEVICES += xiaomi_mir3g

 define Device/xiaomi_mir3g-v2
+  $(Device/uimage-lzma-loader)
  IMAGE_SIZE := 14848k
  DEVICE_VENDOR := Xiaomi
  DEVICE_MODEL := Mi Router 3G
@ -899,6 +904,7 @@ endef
 TARGET_DEVICES += xiaomi_mir3g-v2

 define Device/xiaomi_mir3p
+  $(Device/uimage-lzma-loader)
  BLOCKSIZE := 128k
  PAGESIZE := 2048
  KERNEL_SIZE:= 4096k
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@ -113,15 +113,15 @@ endef
 DEVICE_VARS += GRUB2_VARIANT
 define Device/Default
  ARTIFACT/image.iso := grub-config iso | iso
-  IMAGE/combined.img := grub-config pc | combined | grub-install
-  IMAGE/combined.img.gz := grub-config pc | combined | grub-install | gzip
+  IMAGE/combined.img := grub-config pc | combined | grub-install | append-metadata
+  IMAGE/combined.img.gz := grub-config pc | combined | grub-install | gzip | append-metadata
  IMAGE/combined.vdi := grub-config pc | combined | grub-install | qemu-image vdi
  IMAGE/combined.vmdk := grub-config pc | combined | grub-install | qemu-image vmdk
  IMAGE/rootfs.img := append-rootfs
  IMAGE/rootfs.img.gz := append-rootfs | gzip
  ARTIFACT/image-efi.iso := grub-config iso | iso efi
-  IMAGE/combined-efi.img := grub-config efi | combined efi | grub-install efi
-  IMAGE/combined-efi.img.gz := grub-config efi | combined efi | grub-install efi | gzip
+  IMAGE/combined-efi.img := grub-config efi | combined efi | grub-install efi | append-metadata
+  IMAGE/combined-efi.img.gz := grub-config efi | combined efi | grub-install efi | gzip | append-metadata
  IMAGE/combined-efi.vdi := grub-config efi | combined efi | grub-install efi | qemu-image vdi
  IMAGE/combined-efi.vmdk := grub-config efi | combined efi | grub-install efi | qemu-image vmdk
  ifeq ($(CONFIG_TARGET_IMAGES_GZIP),y)