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 9a61246cc..09ba229ea 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 1865738986bfdcd18cfc5d19e8f07e25fb6bc700 Mon Sep 17 00:00:00 2001 +From 7a5c6503ca3622ce2586526e73053d841e4f6586 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 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 6d399376c..ad8f97369 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 d2b101f19de81748f19cf4760d57efccda2c5d66 Mon Sep 17 00:00:00 2001 +From 040d668336081568cd29c4d70955bb90827e382a 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 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 114fdd85b..6b50824c7 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 9acdd8ae2bd23c3ef43fcef69e400672b92de95b Mon Sep 17 00:00:00 2001 +From 19dd2897d9d753a42e9610ff7ebc4370e995474e 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 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 660dbc46a..ceb304b94 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 f643f71b3f1a017bce6a1c6180a2c337faa4d955 Mon Sep 17 00:00:00 2001 +From 011e108826ecd2d14f714543171e32e74ec52878 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 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 715cc95a5..cc74344e4 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 5cde4e462ceb11f52c1db73e64820e8012956c15 Mon Sep 17 00:00:00 2001 +From 3fc16f5db6a177bb5277962c808c45c74f75ae9e 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 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 333b7898d..52c3cea75 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 563309df6c312c412771dc979994fa91918fdc15 Mon Sep 17 00:00:00 2001 +From c7df0a759a4e82d1fd4ea24a63a8f0a2c8b3821e 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 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 ef84e8086..e741518eb 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 48dd6fad6145335b72315ab3de6b16d2a3a0ea25 Mon Sep 17 00:00:00 2001 +From 2cc0b133d9bb620d3b48651b95d60d2c3d1ae37e 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 diff --git a/core/linux-armv7-rc/0008-USB-armory-support.patch b/core/linux-armv7-rc/0008-USB-armory-support.patch index 188093329..5b4309080 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 eac6f9c17be14dd033a7464a50aced593e7d5973 Mon Sep 17 00:00:00 2001 +From 19ca41a82a2fde0e6cd80b70ab1deb2b793edb86 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 @@ -37,7 +37,7 @@ index c710c30..e9a95ef 100644 imx6dl-apf6dev.dtb \ diff --git a/arch/arm/boot/dts/imx53-usbarmory-common.dtsi b/arch/arm/boot/dts/imx53-usbarmory-common.dtsi new file mode 100644 -index 0000000..b73c399 +index 0000000..6f9ca1d --- /dev/null +++ b/arch/arm/boot/dts/imx53-usbarmory-common.dtsi @@ -0,0 +1,241 @@ @@ -74,7 +74,7 @@ index 0000000..b73c399 + + user { + label = "LED"; -+ gpios = <&gpio4 27 0>; ++ gpios = <&gpio4 27 GPIO_ACTIVE_LOW>; + linux,default-trigger = "heartbeat"; + }; + }; diff --git a/core/linux-armv7-rc/PKGBUILD b/core/linux-armv7-rc/PKGBUILD index 55ba4946a..aa79a207a 100644 --- a/core/linux-armv7-rc/PKGBUILD +++ b/core/linux-armv7-rc/PKGBUILD @@ -4,8 +4,8 @@ buildarch=4 _rcver=4.5 -_rcrel=2 -_rcnrel=armv7-x0 +_rcrel=3 +_rcnrel=armv7-x1 pkgbase=linux-armv7-rc #_srcname=linux-4.$((${_rcver##*.}-1)) @@ -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=('9babc43f354354285a2f62fe091be38d' - 'e0dff94537a55bc3cd1cd7e0c5a7fb3d' - '961fa2a54f528b43dcb81ba2a25d7b70' - '3af7a357c66bef25efdf53d8a56f4e55' - 'be5dfa1c765ab00da3c47e4a334e5701' - '63daab470ba29aa34e9131dc90068ec1' - '64329ab3d41be3f7b95585aad1af3923' - '15a9ab8c8c2446778a29789e9415deb8' - '82821ac063e3426d19f5e63265cc3887' - 'fcdc94a493f2c6cdfdaa7cedf997e858' - 'f15ad495aa6b5ecec541e14d7bdf7ce1' +md5sums=('0193a0e972cd696fd8a870b78a10e234' + '5ccf8ae623c10b00f436b3d630271af6' + '9cdde35f0612e461f658f5679322cf05' + '42b8dc1ac8f7366498f3d1bec4708f57' + '734c3a326deae7783aab2a2b9c2496c5' + '9d419858c9e0b50ef082b501514ae7b5' + 'afa863eec444bc60cb5d3c4216bb4dd8' + '5222447ca6733a635f0014e4286497fd' + 'd65428fd325c67b540f86c59ae29bcff' + '911c1d70d8659d42bde1844569149233' + 'f4ba72b02e60f3c60fc0035b5aa76042' '1813b39074d01af6548951764a0f6444' '4f2379ed84258050edb858ee8d281678' '61c5ff73c136ed07a7aadbf58db3d96a' diff --git a/core/linux-armv7-rc/config b/core/linux-armv7-rc/config index 75ec13670..957b635eb 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.5.0-rc2-1 Kernel Configuration +# Linux/arm 4.5.0-rc3-1 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -4012,7 +4012,7 @@ CONFIG_ARM_SP805_WATCHDOG=m # CONFIG_CADENCE_WATCHDOG is not set CONFIG_HAVE_S3C2410_WATCHDOG=y CONFIG_S3C2410_WATCHDOG=y -# CONFIG_DW_WATCHDOG is not set +CONFIG_DW_WATCHDOG=y CONFIG_OMAP_WATCHDOG=y CONFIG_DAVINCI_WATCHDOG=y CONFIG_ORION_WATCHDOG=y