From ee2290046ea26ae24ba62415b9e95d0c7e45a9b2 Mon Sep 17 00:00:00 2001
From: moonman <moonman.ca@gmail.com>
Date: Mon, 5 Oct 2015 08:17:12 +0000
Subject: [PATCH] core/linux-kirkwood-dt to 4.2.3-1

---
 core/linux-kirkwood-dt/PKGBUILD               | 51 ++++++++++---------
 .../linux-kirkwood-dt.install                 |  2 +-
 core/linux-kirkwood-dt/nsa325_fdt.patch       |  2 +-
 3 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/core/linux-kirkwood-dt/PKGBUILD b/core/linux-kirkwood-dt/PKGBUILD
index 634e107b6..55c3d75c0 100644
--- a/core/linux-kirkwood-dt/PKGBUILD
+++ b/core/linux-kirkwood-dt/PKGBUILD
@@ -6,18 +6,18 @@ buildarch=2
 pkgbase=linux-kirkwood-dt
 _kernelname=${pkgbase#linux}
 _desc="Marvell Kirkwood DT"
-pkgver=4.2.2
+pkgver=4.2.3
 srcver=${pkgver%.0}
 pkgrel=1
 cryptodev_commit=da730106c2558c8e0c8e1b1b1812d32ef9574ab7
 bfqver=v7r8
 
 ### BFQ patch kernel version
-# bfqkern=${pkgver:0:3}
-bfqkern=4.1
+bfqkern=${pkgver:0:3}
+# bfqkern=4.1
 
 ### AUFS branch name
-# aufsbranch="aufs${pkgver:0:3}"
+aufsbranch="aufs${pkgver:0:3}"
 # aufsbranch="aufs4.x-rcN"
 
 arch=('arm')
@@ -31,7 +31,7 @@ source=("https://kernel.org/pub/linux/kernel/v4.x/linux-${srcver}.tar.xz"
         'archlinuxarm.patch'
         'usb-add-reset-resume-quirk-for-several-webcams.patch'
 	'0001-disable-mv643xx_eth-TSO.patch'
-#        "git+https://github.com/sfjro/aufs4-standalone.git#branch=${aufsbranch}"
+        "git+https://github.com/sfjro/aufs4-standalone.git#branch=${aufsbranch}"
         "cryptodev-${cryptodev_commit}.tar.gz::https://github.com/cryptodev-linux/cryptodev-linux/archive/${cryptodev_commit}.tar.gz"
         "ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${bfqkern}.patch"
         "ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${bfqkern}.patch"
@@ -40,31 +40,32 @@ source=("https://kernel.org/pub/linux/kernel/v4.x/linux-${srcver}.tar.xz"
         'pogoplugv4_fdt.patch'
         'nsa325_fdt.patch')
 
-md5sums=('96fa02a8cba28739b993042d668ad997'
-         '25622b253b53dbe847f6505561ee4306'
-         '8f6f89b315a249a4827783fd9b458e63'
-         '9b5a265440abf57d2052838f31486a3a'
-         '09d44b9f07abfaeaf4f688ee52034786'
-         '8fb4d3b7cc970351f3b5078b7893a107'
-         '74bf103542cbdee0363819309adb97a2'
-         'f09baae3c7add4ed9bedde22ae3efe19'
-         'bd8cc19a31d1cf8aeeaf9245057c4f9b'
-         'ce1975f40c48ec1b08dd09447ab043ca'
-         '7efecf23dbebc1ee2e2ccb527c8579c0'
-         '864fe1862e6cee4f6e213c0caf0338fa')
+md5sums=('936530a3b28f38ec9dbfa1fcabe9acd4'                                                                                      
+         '25622b253b53dbe847f6505561ee4306'                                                                                      
+         '8f6f89b315a249a4827783fd9b458e63'                                                                                      
+         '9b5a265440abf57d2052838f31486a3a'                                                                                      
+         '09d44b9f07abfaeaf4f688ee52034786'                                                                                      
+         'SKIP'                                                                                                                  
+         '8fb4d3b7cc970351f3b5078b7893a107'                                                                                      
+         '82160f921c074b79a64a71b8d8945b06'                                                                                      
+         'd84e9d42dd3378d80af10120806609f7'                                                                                      
+         'b40833e6852e4c4c622836fe05dc6c71'                                                                                      
+         'ce1975f40c48ec1b08dd09447ab043ca'                                                                                      
+         '7efecf23dbebc1ee2e2ccb527c8579c0'                                                                                      
+         '8ac6e9bb64a482925a5192e4d1d570f8')
 
 prepare() {
   cd "${srcdir}/linux-${srcver}"
 
-#  msg2 "Copying aufs patches into the kernel source tree"
-#  cp -ru "${srcdir}/aufs4-standalone/"{Documentation,fs} "${srcdir}/linux-${srcver}/"
-#  cp -ru "${srcdir}/aufs4-standalone/include/uapi/linux/aufs_type.h" "${srcdir}/linux-${srcver}/include/"{linux/,uapi/linux/}
+  msg2 "Copying aufs patches into the kernel source tree"
+  cp -ru "${srcdir}/aufs4-standalone/"{Documentation,fs} "${srcdir}/linux-${srcver}/"
+  cp -ru "${srcdir}/aufs4-standalone/include/uapi/linux/aufs_type.h" "${srcdir}/linux-${srcver}/include/"{linux/,uapi/linux/}
 
-#  msg2 "Applying aufs patches"
-#  patch -Np1 -i ../aufs4-standalone/aufs4-kbuild.patch
-#  patch -Np1 -i ../aufs4-standalone/aufs4-base.patch
-#  patch -Np1 -i ../aufs4-standalone/aufs4-mmap.patch
-#  patch -Np1 -i ../aufs4-standalone/aufs4-standalone.patch
+  msg2 "Applying aufs patches"
+  patch -Np1 -i ../aufs4-standalone/aufs4-kbuild.patch
+  patch -Np1 -i ../aufs4-standalone/aufs4-base.patch
+  patch -Np1 -i ../aufs4-standalone/aufs4-mmap.patch
+  patch -Np1 -i ../aufs4-standalone/aufs4-standalone.patch
 
   msg2 "Disable buggy TCP segmentation offload implementation"
   msg2 "http://archlinuxarm.org/forum/viewtopic.php?f=9&t=7692"
diff --git a/core/linux-kirkwood-dt/linux-kirkwood-dt.install b/core/linux-kirkwood-dt/linux-kirkwood-dt.install
index 615023466..4b12d68a8 100644
--- a/core/linux-kirkwood-dt/linux-kirkwood-dt.install
+++ b/core/linux-kirkwood-dt/linux-kirkwood-dt.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-kirkwood-dt
-KERNEL_VERSION=4.2.2-1-ARCH
+KERNEL_VERSION=4.2.3-1-ARCH
 
 post_install () {
   # updating module dependencies
diff --git a/core/linux-kirkwood-dt/nsa325_fdt.patch b/core/linux-kirkwood-dt/nsa325_fdt.patch
index 8ad9cb227..0c4c9b73f 100644
--- a/core/linux-kirkwood-dt/nsa325_fdt.patch
+++ b/core/linux-kirkwood-dt/nsa325_fdt.patch
@@ -299,7 +299,7 @@ diff -Naur a/arch/arm/boot/dts/kirkwood-nsa325.dts b/arch/arm/boot/dts/kirkwood-
 +
 +&nand {
 +	status = "okay";
-+	chip-delay = <35>;
++	chip-delay = <40>;
 +
 +	partition@0 {
 +		label = "uboot";