From 3f2136e071591e455f954e0965750bad0e424ed7 Mon Sep 17 00:00:00 2001
From: Alexandre Bury <alexandre.bury@gmail.com>
Date: Mon, 3 Apr 2023 17:04:17 -0400
Subject: [PATCH] Update to 2.11.5

---
 0001-csr-fix.patch | 17 -----------------
 PKGBUILD           |  6 ++----
 2 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 0001-csr-fix.patch

diff --git a/0001-csr-fix.patch b/0001-csr-fix.patch
deleted file mode 100644
index 76b53d5..0000000
--- a/0001-csr-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
-index 8a107ed18b0dc7..7d81102cffd48e 100644
---- a/arch/riscv/Makefile
-+++ b/arch/riscv/Makefile
-@@ -50,6 +50,12 @@ riscv-march-$(CONFIG_ARCH_RV32I)	:= rv32ima
- riscv-march-$(CONFIG_ARCH_RV64I)	:= rv64ima
- riscv-march-$(CONFIG_FPU)		:= $(riscv-march-y)fd
- riscv-march-$(CONFIG_RISCV_ISA_C)	:= $(riscv-march-y)c
-+
-+# Newer binutils versions default to ISA spec version 20191213 which moves some
-+# instructions from the I extension to the Zicsr and Zifencei extensions.
-+toolchain-need-zicsr-zifencei := $(call cc-option-yn, -march=$(riscv-march-y)_zicsr_zifencei)
-+riscv-march-$(toolchain-need-zicsr-zifencei) := $(riscv-march-y)_zicsr_zifencei
-+
- KBUILD_CFLAGS += -march=$(subst fd,,$(riscv-march-y))
- KBUILD_AFLAGS += -march=$(riscv-march-y)
- 
diff --git a/PKGBUILD b/PKGBUILD
index 8e0153f..8d3a7b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgbase=linux-515-starfive-visionfive2
 _variant=VF2 #5.15-VF2-xxx-x
-pkgver=2.10.4
+pkgver=2.11.5
 epoch=1 #Change to use ver from StarFive's SDK
 pkgrel=3
 _tag=VF2_v${pkgver}
@@ -14,7 +14,6 @@ license=(GPL2)
 makedepends=(bc libelf pahole cpio perl tar xz)
 options=('!strip')
 source=("https://github.com/starfive-tech/linux/archive/refs/tags/${_tag}.tar.gz"
-  "0001-csr-fix.patch::https://github.com/torvalds/linux/commit/6df2a016c0c8a3d0933ef33dd192ea6606b115e3.diff"
   "0002-realloc-fix.patch::https://github.com/torvalds/linux/commit/52a9dab6d892763b2a8334a568bd4e2c1a6fde66.diff"
   "0003-constify-struct-dh.patch" #Modified from https://github.com/torvalds/linux/commit/215bebc8c6ac438c382a6a56bd2764a2d4e1da72.diff"
   "0004-tda998x.patch"
@@ -23,8 +22,7 @@ source=("https://github.com/starfive-tech/linux/archive/refs/tags/${_tag}.tar.gz
   'linux.preset'
   '90-linux.hook')
 
-sha256sums=('5614f50f29fd4aa56525e0b002b5b03ef4109ef92484aab6747516efd2fb213b'
-            '3459b3799b7f9b7d6129ca8996c40d6a12f89127fe54b4af99ec9512b711dced'
+sha256sums=('8a6ef2cc185faf32ae3c544b16874cc0ca7cb35ba06a701bdabeafaf05531fc0'
             '26c03a99bb0f90e334289726f041f454ca9c54f2bbd553bff7ee5ab042f64775'
             '10d29b13ebccd1ea836e89338f6e88874dd6bb80cd01324527cc3ea7108cd65f'
             'f3bc5d054cde348d9bcb2f7eb2be7c3421e60e55efdc2c849f8058ab8e6b9c7a'