From 8aba5b46326b0a34e63dfe4b3c4a00b1b4af88b9 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 5 Sep 2020 20:40:14 +0000
Subject: [PATCH] core/linux-kirkwood-dt to 5.8.7-1

---
 core/linux-kirkwood-dt/PKGBUILD |  9 +++++----
 core/linux-kirkwood-dt/config   | 11 ++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/core/linux-kirkwood-dt/PKGBUILD b/core/linux-kirkwood-dt/PKGBUILD
index 8b96de25a..264d394a8 100644
--- a/core/linux-kirkwood-dt/PKGBUILD
+++ b/core/linux-kirkwood-dt/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=linux-kirkwood-dt
 _srcname=linux-5.8
 _kernelname=${pkgbase#linux}
 _desc="Marvell Kirkwood DT"
-pkgver=5.8.0
+pkgver=5.8.7
 pkgrel=1
 arch=('arm')
 url="http://www.kernel.org/"
@@ -15,7 +15,7 @@ license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'kmod' 'inetutils' 'bc' 'git')
 options=('!strip')
 source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
-        #"http://www.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz"
+        "http://www.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz"
         '0001-leds-trigger-Introduce-a-SATA-trigger.patch'
         '0002-ata-sata_mv-Add-SATA-activity-LED-trigger-support.patch'
         '0003-ARM-dts-kirkwood-pogo_e02-Set-health-LED-to-default-.patch'
@@ -26,13 +26,14 @@ source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
         'linux.preset'
         '99-linux.hook')
 md5sums=('0e5c4c15266218ef26c50fac0016095b'
+         '91663a89a7bbb70a35999a0a807f581f'
          '6d1c68eff8d3d14855934915b4db629f'
          '673fa211745465f0af73bfc6d6ace606'
          'a15280d3ef0605dbdb831049ec71238b'
          '832e5f66f42e07f5c0014772afa789fb'
          '536d5ff2e76bcfc73f86f0527ad40dba'
          '6e22952ece3f53be88bc1d1a3cdeb13f'
-         'c512233edfa8328d2dae584c49491792'
+         '867be2076e40491236a527d8091997f7'
          '959e49540dac4c5e689ad9037150a360'
          '79fa396e3f9a09a85156d6d7c2d34b58')
 
@@ -40,7 +41,7 @@ prepare() {
   cd "${srcdir}/${_srcname}"
  
   # add upstream patch
-  #git apply --whitespace=nowarn "${srcdir}/patch-${pkgver}"
+  git apply --whitespace=nowarn "${srcdir}/patch-${pkgver}"
 
   # ALARM patches
   git apply ../0001-leds-trigger-Introduce-a-SATA-trigger.patch
diff --git a/core/linux-kirkwood-dt/config b/core/linux-kirkwood-dt/config
index bf29fdded..ea0bc7a28 100644
--- a/core/linux-kirkwood-dt/config
+++ b/core/linux-kirkwood-dt/config
@@ -1,11 +1,11 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.8.0-1 Kernel Configuration
+# Linux/arm 5.8.7-1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 9.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90200
-CONFIG_LD_VERSION=233010000
+CONFIG_GCC_VERSION=100200
+CONFIG_LD_VERSION=235000000
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
@@ -95,7 +95,7 @@ CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_PSI=y
-CONFIG_PSI_DEFAULT_DISABLED=y
+# CONFIG_PSI_DEFAULT_DISABLED is not set
 # end of CPU/Task time and stats accounting
 
 #
@@ -5392,6 +5392,7 @@ CONFIG_HAVE_CLK=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
+# CONFIG_CLK_HSDK is not set
 # CONFIG_COMMON_CLK_MAX9485 is not set
 # CONFIG_COMMON_CLK_SI5341 is not set
 # CONFIG_COMMON_CLK_SI5351 is not set