diff --git a/core/linux-armv7-rc/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/core/linux-armv7-rc/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch index 73dc810d0..832db2af6 100644 --- a/core/linux-armv7-rc/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch +++ b/core/linux-armv7-rc/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch @@ -1,4 +1,4 @@ -From dccadc9e5eb4dc16815e27c286c16d235e4ff8e8 Mon Sep 17 00:00:00 2001 +From c70ce57c9b88dda1a839b211a9ca29712a0a9bce Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 2 Dec 2012 19:59:28 +0100 Subject: [PATCH 1/8] ARM: atags: add support for Marvell's u-boot @@ -47,5 +47,5 @@ index 979ff40..d1d0c19 100644 }; -- -2.8.2 +2.8.3 diff --git a/core/linux-armv7-rc/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/core/linux-armv7-rc/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch index 9c0f4d1a7..2dedc63a7 100644 --- a/core/linux-armv7-rc/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch +++ b/core/linux-armv7-rc/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch @@ -1,4 +1,4 @@ -From 2fe6588b6ca5cb817c78ee0b44ca9b2a6f6bdeb1 Mon Sep 17 00:00:00 2001 +From 7fa60a4b808762904700d462241ec591adbd60c1 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 2 Dec 2012 19:56:58 +0100 Subject: [PATCH 2/8] ARM: atags/fdt: retrieve MAC addresses from Marvell boot @@ -43,5 +43,5 @@ index 9448aa0..ac7b6ae 100644 } -- -2.8.2 +2.8.3 diff --git a/core/linux-armv7-rc/0003-SMILE-Plug-device-tree-file.patch b/core/linux-armv7-rc/0003-SMILE-Plug-device-tree-file.patch index 6943a2d5a..2ae964cf7 100644 --- a/core/linux-armv7-rc/0003-SMILE-Plug-device-tree-file.patch +++ b/core/linux-armv7-rc/0003-SMILE-Plug-device-tree-file.patch @@ -1,4 +1,4 @@ -From 66047514f80a831be0461566faffa79113151783 Mon Sep 17 00:00:00 2001 +From 0788f6d154807b5340cdbaf76b990ec78f188da2 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 5 Sep 2014 15:41:19 -0600 Subject: [PATCH 3/8] SMILE Plug device tree file @@ -14,10 +14,10 @@ Signed-off-by: Kevin Mihelich create mode 100644 arch/arm/boot/dts/armada-370-smileplug.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 95c1923..38c06e4 100644 +index 06b6c2d..2878a62 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -793,6 +793,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \ +@@ -843,6 +843,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \ armada-370-db.dtb \ armada-370-dlink-dns327l.dtb \ armada-370-mirabox.dtb \ @@ -205,5 +205,5 @@ index 0000000..d01308a + }; +}; -- -2.8.2 +2.8.3 diff --git a/core/linux-armv7-rc/0004-fix-mvsdio-eMMC-timing.patch b/core/linux-armv7-rc/0004-fix-mvsdio-eMMC-timing.patch index 8a1c48132..6a13c9379 100644 --- a/core/linux-armv7-rc/0004-fix-mvsdio-eMMC-timing.patch +++ b/core/linux-armv7-rc/0004-fix-mvsdio-eMMC-timing.patch @@ -1,4 +1,4 @@ -From 57abb5f14c98e72b246083465441ce75086304e0 Mon Sep 17 00:00:00 2001 +From bd521172b389468129e3d513cc40f20a64313c91 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 5 Sep 2014 15:43:56 -0600 Subject: [PATCH 4/8] fix mvsdio eMMC timing @@ -34,5 +34,5 @@ index 42296e5..e5ce6d2 100644 host->clock = ios->clock; host->ns_per_clk = 1000000000 / (host->base_clock / (m+1)); -- -2.8.2 +2.8.3 diff --git a/core/linux-armv7-rc/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/core/linux-armv7-rc/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch index 03fdd191c..a9523994f 100644 --- a/core/linux-armv7-rc/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch +++ b/core/linux-armv7-rc/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch @@ -1,4 +1,4 @@ -From 573ed812140e4319d2333206679e55a2f03ae632 Mon Sep 17 00:00:00 2001 +From dfde3f815866d3d5456f82a54775d9872968e12b Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 18 Feb 2014 01:43:50 -0300 Subject: [PATCH 5/8] net/smsc95xx: Allow mac address to be set as a parameter @@ -8,7 +8,7 @@ Subject: [PATCH 5/8] net/smsc95xx: Allow mac address to be set as a parameter 1 file changed, 56 insertions(+) diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c -index 2edc2bc..2445b56 100644 +index dc989a8..912be75 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -60,6 +60,7 @@ @@ -17,9 +17,9 @@ index 2edc2bc..2445b56 100644 SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3) +#define MAC_ADDR_LEN (6) - struct smsc95xx_priv { - u32 mac_cr; -@@ -75,6 +76,10 @@ static bool turbo_mode = true; + #define CARRIER_CHECK_DELAY (2 * HZ) + +@@ -80,6 +81,10 @@ static bool turbo_mode = true; module_param(turbo_mode, bool, 0644); MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction"); @@ -30,7 +30,7 @@ index 2edc2bc..2445b56 100644 static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index, u32 *data, int in_pm) { -@@ -764,8 +769,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd) +@@ -809,8 +814,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd) return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL); } @@ -91,5 +91,5 @@ index 2edc2bc..2445b56 100644 /* maybe the boot loader passed the MAC address in devicetree */ -- -2.8.2 +2.8.3 diff --git a/core/linux-armv7-rc/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch b/core/linux-armv7-rc/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch index fb1918b12..1724e59c5 100644 --- a/core/linux-armv7-rc/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch +++ b/core/linux-armv7-rc/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch @@ -1,4 +1,4 @@ -From c211758069c908d9d76c31f16cccaf521c42e5f0 Mon Sep 17 00:00:00 2001 +From 19696cf9f73cdbb589358e1bb0bcbb47f2770e3c Mon Sep 17 00:00:00 2001 From: dobatog Date: Thu, 26 Feb 2015 12:32:27 +0100 Subject: [PATCH 6/8] ARM: TLV320AIC23 SoC Audio Codec: Fix errors reported @@ -45,5 +45,5 @@ index cd8c02b..95e6b11 100644 /* input mux */ {"Capture Source", "Line", "Line Input"}, -- -2.8.2 +2.8.3 diff --git a/core/linux-armv7-rc/0007-set-default-cubietruck-led-triggers.patch b/core/linux-armv7-rc/0007-set-default-cubietruck-led-triggers.patch index 0f1c13e2b..a7ff851e2 100644 --- a/core/linux-armv7-rc/0007-set-default-cubietruck-led-triggers.patch +++ b/core/linux-armv7-rc/0007-set-default-cubietruck-led-triggers.patch @@ -1,4 +1,4 @@ -From b5e99f293a21f1d27222c9e262831588e206bfc5 Mon Sep 17 00:00:00 2001 +From a13b9f0aa86aa2a77b683739456540afd40da81c Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 14 Feb 2015 12:32:27 +0100 Subject: [PATCH 7/8] set default cubietruck led triggers @@ -9,7 +9,7 @@ Signed-off-by: Kevin Mihelich 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts -index 8da939a..9957d5f 100644 +index 83f39b0..15e9626 100644 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts @@ -70,6 +70,7 @@ @@ -29,5 +29,5 @@ index 8da939a..9957d5f 100644 }; -- -2.8.2 +2.8.3 diff --git a/core/linux-armv7-rc/0008-USB-armory-support.patch b/core/linux-armv7-rc/0008-USB-armory-support.patch index beeecfa90..afd2bfc9e 100644 --- a/core/linux-armv7-rc/0008-USB-armory-support.patch +++ b/core/linux-armv7-rc/0008-USB-armory-support.patch @@ -1,4 +1,4 @@ -From 4709ed524ab21c1578e96f837c77ce23bb25c108 Mon Sep 17 00:00:00 2001 +From 42930e86f6f0d4be217c6822507e1ef739a1ae00 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 7 Feb 2015 12:32:27 +0100 Subject: [PATCH 8/8] USB armory support @@ -20,10 +20,10 @@ Subject: [PATCH 8/8] USB armory support create mode 100644 arch/arm/boot/dts/imx53-usbarmory.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 38c06e4..ce5c9de 100644 +index 2878a62..f6b3d97 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -295,6 +295,11 @@ dtb-$(CONFIG_SOC_IMX53) += \ +@@ -303,6 +303,11 @@ dtb-$(CONFIG_SOC_IMX53) += \ imx53-smd.dtb \ imx53-tx53-x03x.dtb \ imx53-tx53-x13x.dtb \ @@ -452,5 +452,5 @@ index 0000000..902a73b + status = "okay"; +}; -- -2.8.2 +2.8.3 diff --git a/core/linux-armv7-rc/PKGBUILD b/core/linux-armv7-rc/PKGBUILD index faa14a4ad..c9bef5271 100644 --- a/core/linux-armv7-rc/PKGBUILD +++ b/core/linux-armv7-rc/PKGBUILD @@ -4,7 +4,7 @@ buildarch=4 _rcver=4.7 -_rcrel=1 +_rcrel=2 _rcnrel=armv7-x0 pkgbase=linux-armv7-rc @@ -36,17 +36,17 @@ source=(#"http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" 'kernel.its' 'kernel.keyblock' 'kernel_data_key.vbprivk') -md5sums=('b5d7583fa8e332a11cd78dc8da0802d6' - 'f4befee3a1b8731b50008981d602f787' - '1b4bb8c2a33606ede339e5661f0e7fb8' - '8e2d392b751e5cf1862f1472d0d7a992' - '56ce0f700dcee0584183452d15c96b58' - '3a66481fa1aabbff1ed8a947d5aadc99' - '4864a3dc1188c51d505034932adadf92' - '2f7506cf70805d688a880e19e2f3e20a' - '276e39a7d0ff9bac45607ef4d50e0ab9' - '1c76d22a3281e9539222ee242da5a7fb' - '4e7602a09054fe37e22e3f30d9231271' +md5sums=('687e3ff4f6be272e69cd1633d2955027' + '8c739cba64b00b4f1f48f2f2eed78d29' + 'abf9fe78fae0ffd10b6db56670bbb0f1' + 'cd9c5400cf4fcd261d19c472d61f7445' + '99bb48b1b02b3ace761633622a315d84' + '914e279e5fabedc2f2d1afb22ddd225c' + '2f4e6922546a4851abdefbfd89f12e00' + '6fdf2b5666d534f83eeec6b43c6838c3' + 'e4ff8c1bcdeb833ca1f86802ef03bc35' + 'e7e0c12b90941b30ef1f2f6fcda46bf0' + '9652b6d6ccbf002f298bf4e9996c6182' '7d3061393c215d08f44a46ca48b13b7e' '4f2379ed84258050edb858ee8d281678' '61c5ff73c136ed07a7aadbf58db3d96a' diff --git a/core/linux-armv7-rc/config b/core/linux-armv7-rc/config index 745a4d5b8..ae40435dd 100644 --- a/core/linux-armv7-rc/config +++ b/core/linux-armv7-rc/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.7.0-rc1-1 Kernel Configuration +# Linux/arm 4.7.0-rc2-1 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -1010,6 +1010,8 @@ CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_NDISC_NODETYPE=y CONFIG_IPV6_TUNNEL=m CONFIG_IPV6_GRE=m +CONFIG_IPV6_FOU=m +CONFIG_IPV6_FOU_TUNNEL=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y CONFIG_IPV6_MROUTE=y @@ -3392,7 +3394,6 @@ CONFIG_VT_CONSOLE_SLEEP=y CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_UNIX98_PTYS=y -CONFIG_DEVPTS_MULTIPLE_INSTANCES=y # CONFIG_LEGACY_PTYS is not set # CONFIG_SERIAL_NONSTANDARD is not set CONFIG_NOZOMI=m @@ -7732,6 +7733,7 @@ CONFIG_TRACING_SUPPORT=y # CONFIG_TEST_KSTRTOX is not set # CONFIG_TEST_PRINTF is not set # CONFIG_TEST_BITMAP is not set +# CONFIG_TEST_UUID is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_HASH is not set # CONFIG_DMA_API_DEBUG is not set