From 3774e935d0dbbedaf994868ee3bbb1b5d1d313e9 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 5 Sep 2020 20:39:33 +0000
Subject: [PATCH] core/linux-armv5 to 5.8.7-1

---
 core/linux-armv5/PKGBUILD |  9 +++++----
 core/linux-armv5/config   | 13 ++++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/core/linux-armv5/PKGBUILD b/core/linux-armv5/PKGBUILD
index f019b7d97..5c84eb903 100644
--- a/core/linux-armv5/PKGBUILD
+++ b/core/linux-armv5/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=linux-armv5
 _srcname=linux-5.8
 _kernelname=${pkgbase#linux}
 _desc="ARMv5 multi-platform"
-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' '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-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch'
         '0002-at91-ariag25-updates.patch'
         '0003-at91-arietta-g25-support.patch'
@@ -29,6 +29,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
         'linux.preset'
         '99-linux.hook')
 md5sums=('0e5c4c15266218ef26c50fac0016095b'
+         '91663a89a7bbb70a35999a0a807f581f'
          'aa78f2eb08697a37a008b5f7222cd841'
          'f8809636914113c0f50550246622d717'
          'fe75743ae785314a319e552fd8fa42d5'
@@ -38,7 +39,7 @@ md5sums=('0e5c4c15266218ef26c50fac0016095b'
          '732c978ddf76ae61b52f4c415fd16e60'
          '041676e8e7c6805b7248ed89c3f6c79e'
          '97b58cacccf86ab94f3ecfcce1202660'
-         '28e60712e9e90b5bc579e42cd4afcc33'
+         '4aa05531bccf8576d5d4473474147b42'
          '73d88ba395003e8cdb07daeb2c080ec5'
          '79fa396e3f9a09a85156d6d7c2d34b58')
 
@@ -46,7 +47,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-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
diff --git a/core/linux-armv5/config b/core/linux-armv5/config
index 8d93c96ed..7a1082ab9 100644
--- a/core/linux-armv5/config
+++ b/core/linux-armv5/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
@@ -92,7 +92,8 @@ CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
-# CONFIG_PSI is not set
+CONFIG_PSI=y
+# CONFIG_PSI_DEFAULT_DISABLED is not set
 # end of CPU/Task time and stats accounting
 
 #
@@ -3178,6 +3179,7 @@ CONFIG_SPI_SPIDEV=y
 # CONFIG_SPI_LOOPBACK_TEST is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_SLAVE is not set
+CONFIG_SPI_DYNAMIC=y
 # CONFIG_SPMI is not set
 # CONFIG_HSI is not set
 CONFIG_PPS=y
@@ -6027,6 +6029,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