From e32b2f92b1912e875cf4a0feedcbe65d7d41e641 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Wed, 11 May 2016 19:47:32 +0200 Subject: [PATCH] kernel: update kernel 4.4 to version 4.4.10 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas --- include/kernel-version.mk | 4 ++-- ...CNS3xxx-Fix-PCI-cns3xxx_write_config.patch | 19 ------------------- ...-mips-vdso-dbg-rebuild-after-genvdso.patch | 14 ++++++-------- ...IPS-ralink-fix-USB-frequency-scaling.patch | 9 ++------- 4 files changed, 10 insertions(+), 36 deletions(-) delete mode 100644 target/linux/cns3xxx/patches-4.4/033-CNS3xxx-Fix-PCI-cns3xxx_write_config.patch diff --git a/include/kernel-version.mk b/include/kernel-version.mk index b108f9fcfa1c..5cd81385776e 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -5,12 +5,12 @@ LINUX_RELEASE?=1 LINUX_VERSION-3.18 = .29 LINUX_VERSION-4.1 = .20 LINUX_VERSION-4.3 = .4 -LINUX_VERSION-4.4 = .9 +LINUX_VERSION-4.4 = .10 LINUX_KERNEL_MD5SUM-3.18.29 = b25737a0bc98e80d12200de93f239c28 LINUX_KERNEL_MD5SUM-4.1.20 = 075c38a3a23ca5bc80437b13606df00a LINUX_KERNEL_MD5SUM-4.3.4 = 5275d02132107c28b85f986bad576d91 -LINUX_KERNEL_MD5SUM-4.4.9 = ec1e5011cc2ab3f441e39716dcf4730e +LINUX_KERNEL_MD5SUM-4.4.10 = f7033cbe05e1359a347815ca52d051ed ifdef KERNEL_PATCHVER LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER))) diff --git a/target/linux/cns3xxx/patches-4.4/033-CNS3xxx-Fix-PCI-cns3xxx_write_config.patch b/target/linux/cns3xxx/patches-4.4/033-CNS3xxx-Fix-PCI-cns3xxx_write_config.patch deleted file mode 100644 index 3f5ab06ba517..000000000000 --- a/target/linux/cns3xxx/patches-4.4/033-CNS3xxx-Fix-PCI-cns3xxx_write_config.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/arch/arm/mach-cns3xxx/pcie.c -+++ b/arch/arm/mach-cns3xxx/pcie.c -@@ -220,13 +220,13 @@ static void cns3xxx_write_config(struct - u32 mask = (0x1ull << (size * 8)) - 1; - int shift = (where % 4) * 8; - -- v = readl_relaxed(base + (where & 0xffc)); -+ v = readl_relaxed(base); - - v &= ~(mask << shift); - v |= (val & mask) << shift; - -- writel_relaxed(v, base + (where & 0xffc)); -- readl_relaxed(base + (where & 0xffc)); -+ writel_relaxed(v, base); -+ readl_relaxed(base); - } - - static void __init cns3xxx_pcie_hw_init(struct cns3xxx_pcie *cnspci) diff --git a/target/linux/generic/patches-4.4/207-mips-vdso-dbg-rebuild-after-genvdso.patch b/target/linux/generic/patches-4.4/207-mips-vdso-dbg-rebuild-after-genvdso.patch index 2a36f2a7a028..cd988a95041f 100644 --- a/target/linux/generic/patches-4.4/207-mips-vdso-dbg-rebuild-after-genvdso.patch +++ b/target/linux/generic/patches-4.4/207-mips-vdso-dbg-rebuild-after-genvdso.patch @@ -1,7 +1,5 @@ -Index: linux-4.4.9/arch/mips/vdso/Makefile -=================================================================== ---- linux-4.4.9.orig/arch/mips/vdso/Makefile -+++ linux-4.4.9/arch/mips/vdso/Makefile +--- a/arch/mips/vdso/Makefile ++++ b/arch/mips/vdso/Makefile @@ -75,7 +75,7 @@ $(obj-vdso): KBUILD_AFLAGS := $(aflags-v $(obj)/vdso.lds: KBUILD_CPPFLAGS := $(native-abi) @@ -13,10 +11,10 @@ Index: linux-4.4.9/arch/mips/vdso/Makefile $(obj)/vdso-image.c: $(obj)/vdso.so.dbg $(obj)/genvdso FORCE @@ -109,7 +109,7 @@ $(obj)/vdso-o32.lds: KBUILD_CPPFLAGS := $(obj)/vdso-o32.lds: $(src)/vdso.lds.S FORCE - $(call if_changed_dep,cpp_lds_S) - + $(call if_changed_dep,cpp_lds_S) + -$(obj)/vdso-o32.so.dbg: $(obj)/vdso-o32.lds $(obj-vdso-o32) FORCE +$(obj)/vdso-o32.so.dbg: $(obj)/vdso-o32.lds $(obj-vdso-o32) $(obj)/genvdso FORCE - $(call if_changed,vdsold) - + $(call if_changed,vdsold) + $(obj)/vdso-o32-image.c: VDSO_NAME := o32 diff --git a/target/linux/ramips/patches-4.4/0080-MIPS-ralink-fix-USB-frequency-scaling.patch b/target/linux/ramips/patches-4.4/0080-MIPS-ralink-fix-USB-frequency-scaling.patch index 0f3129e931c8..3020cdb6b587 100644 --- a/target/linux/ramips/patches-4.4/0080-MIPS-ralink-fix-USB-frequency-scaling.patch +++ b/target/linux/ramips/patches-4.4/0080-MIPS-ralink-fix-USB-frequency-scaling.patch @@ -15,12 +15,10 @@ Signed-off-by: Ralf Baechle arch/mips/ralink/mt7620.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c -index dfb04fc..fc19932 100644 --- a/arch/mips/ralink/mt7620.c +++ b/arch/mips/ralink/mt7620.c -@@ -439,7 +439,7 @@ void __init ralink_clk_init(void) - ralink_clk_add("10000c00.uartlite", periph_rate); +@@ -442,7 +442,7 @@ void __init ralink_clk_init(void) + ralink_clk_add("10000e00.uart2", periph_rate); ralink_clk_add("10180000.wmac", xtal_rate); - if (IS_ENABLED(CONFIG_USB) && is_mt76x8()) { @@ -28,6 +26,3 @@ index dfb04fc..fc19932 100644 /* * When the CPU goes into sleep mode, the BUS clock will be * too low for USB to function properly. Adjust the busses --- -2.1.4 - -- 2.30.2