From 75f3a84e182ab478d0855e4aa1ecadd6206441d8 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 1 Dec 2021 01:14:47 +0000
Subject: [PATCH] core/linux-aarch64 to 5.15.5-1

---
 core/linux-aarch64/PKGBUILD                   | 15 ++++++---------
 core/linux-aarch64/config                     |  3 ++-
 core/linux-aarch64/generate_chromebook_its.sh |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/core/linux-aarch64/PKGBUILD b/core/linux-aarch64/PKGBUILD
index 9a5645e10..e74cf3439 100644
--- a/core/linux-aarch64/PKGBUILD
+++ b/core/linux-aarch64/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=linux-aarch64
 _srcname=linux-5.15
 _kernelname=${pkgbase#linux}
 _desc="AArch64 multi-platform"
-pkgver=5.15.1
+pkgver=5.15.5
 pkgrel=1
 arch=('aarch64')
 url="http://www.kernel.org/"
@@ -26,11 +26,11 @@ source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
         '60-linux.hook'
         '90-linux.hook')
 md5sums=('071d49ff4e020d58c04f9f3f76d3b594'
-         'be8741a89421be268c51393e62905636'
+         '532a136dcabc2a416afeaedc4108209f'
          '21d3e833437461aed3b6ca68b5d8afa0'
          'd679f49645578a193d6e3c220787a40d'
-         'c4a5f88c7f62a7d40b8d55fd7f8fb3f8'
-         'e19fbe69f1258b99ee6bed21d7afcbce'
+         '2f0cb91f0749c9947ef8fcd5063e888a'
+         '7c97cf141750ad810235b1ad06eb9f75'
          '61c5ff73c136ed07a7aadbf58db3d96a'
          '584777ae88bce2c5659960151b64c7d8'
          '41cb5fef62715ead2dd109dbea8413d6'
@@ -245,11 +245,8 @@ _package-chromebook() {
   )
   chromebook_dtbs=($(for b in ${chromeos_boards[@]}; do find arch/${KARCH}/boot -name "*${b}*.dtb" | LC_COLLATE=C sort; done))
 
-  for to_compress in ${chromebook_dtbs[@]} ${image}; do
-    #lzma -9 -z -f -k ${to_compress} # This is 40% smaller but takes ~1 sec longer to boot
-    lz4 -20 -z -f -m ${to_compress}
-  done
-  echo ${chromebook_dtbs[@]/%/.lz4} | ../generate_chromebook_its.sh ${image}.lz4 ${KARCH} lz4 > kernel.its
+  lz4 -20 -z -f ${image}
+  echo ${chromebook_dtbs[@]} | ../generate_chromebook_its.sh ${image}.lz4 ${KARCH} lz4 > kernel.its
 
   mkimage -D "-I dts -O dtb -p 2048" -f kernel.its vmlinux.uimg
   dd if=/dev/zero of=bootloader.bin bs=512 count=1
diff --git a/core/linux-aarch64/config b/core/linux-aarch64/config
index bbe3d1f2f..81c73ce03 100644
--- a/core/linux-aarch64/config
+++ b/core/linux-aarch64/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.15.0-1 Kernel Configuration
+# Linux/arm64 5.15.5-1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
 CONFIG_CC_IS_GCC=y
@@ -9846,6 +9846,7 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_CONSOLE is not set
 # CONFIG_PSTORE_PMSG is not set
 CONFIG_PSTORE_RAM=m
+# CONFIG_PSTORE_BLK is not set
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
diff --git a/core/linux-aarch64/generate_chromebook_its.sh b/core/linux-aarch64/generate_chromebook_its.sh
index b585974cd..05b24643c 100755
--- a/core/linux-aarch64/generate_chromebook_its.sh
+++ b/core/linux-aarch64/generate_chromebook_its.sh
@@ -31,7 +31,7 @@ for i in ${!dtb_list[@]}; do
 	            data = /incbin/("${dtb}");
 	            type = "flat_dt";
 	            arch = "${arch}";
-	            compression = "${compression}";
+	            compression = "none";
 	            hash {
 	                algo = "sha1";
 	            };