From 8ca5a4d6d236cef3f836935a573803921471b1af Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 7 Dec 2017 01:03:02 +0000
Subject: [PATCH] core/linux-gru to 4.4.96-2

---
 core/linux-gru/PKGBUILD   | 12 ++++++------
 core/linux-gru/config     |  4 +++-
 core/linux-gru/kernel.its | 28 ++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/core/linux-gru/PKGBUILD b/core/linux-gru/PKGBUILD
index b70767f9d..32255393d 100644
--- a/core/linux-gru/PKGBUILD
+++ b/core/linux-gru/PKGBUILD
@@ -7,8 +7,8 @@ pkgbase=linux-gru
 _kernelname=${pkgbase#linux}
 _desc="Gru Chromebooks"
 pkgver=4.4.96
-pkgrel=1
-_commit=3e4eb6ada739d895212df83c625677af60bdde77
+pkgrel=2
+_commit=9c49e93f7e32b419b6795e57858d28e323a7737d
 arch=('aarch64')
 url="https://chromium.googlesource.com/chromiumos/third_party/kernel/+/chromeos-4.4"
 license=('GPL2')
@@ -22,12 +22,12 @@ source=("https://chromium.googlesource.com/chromiumos/third_party/kernel/+archiv
         'kernel.its'
         'kernel.keyblock'
         'kernel_data_key.vbprivk')
-md5sums=('a22d493b1f1b73c4b982d29026766c2b'
+md5sums=('fc5a97809ceebffd02b92dde1e8cab68'
          'd3b3d9d59f91cc6fad24c29873ad87bc'
          '66cd7c64f8861025fa8e394675222aa1'
          '8f416793377fc69914851a32fe6ca33e'
-         '47eb96295ae31e5d8e40ef3251dfff62'
-         '25dea537b93937f77b92cde7adffcb55'
+         '8c6563466ecf1dbe544a450491ce021e'
+         '83316d1ef9a687c8777b56e99268b52f'
          '61c5ff73c136ed07a7aadbf58db3d96a'
          '584777ae88bce2c5659960151b64c7d8')
 
@@ -96,7 +96,7 @@ _package() {
   
   mkimage -D "-I dts -O dtb -p 2048" -f kernel.its vmlinux.uimg
   dd if=/dev/zero of=bootloader.bin bs=512 count=1
-  echo "console=tty1 console=ttyS2,115200n8 earlyprintk=ttyS2,115200n8 init=/sbin/init root=PARTUUID=%U/PARTNROFF=1 rootwait rw noinitrd" > cmdline
+  echo "console=ttyS2,115200n8 earlyprintk=ttyS2,115200n8 console=tty1 init=/sbin/init root=PARTUUID=%U/PARTNROFF=1 rootwait rw noinitrd loglevel=4" > cmdline
   vbutil_kernel \
     --pack vmlinux.kpart \
     --version 1 \
diff --git a/core/linux-gru/config b/core/linux-gru/config
index 3d5c9dfde..a19c3a0ef 100644
--- a/core/linux-gru/config
+++ b/core/linux-gru/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.4.96-1 Kernel Configuration
+# Linux/arm64 4.4.96-2 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -3191,6 +3191,7 @@ CONFIG_DRM_PANEL=y
 #
 CONFIG_DRM_PANEL_SIMPLE=y
 CONFIG_DRM_PANEL_INNOLUX_P079ZCA=y
+CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04=y
 # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
@@ -3209,6 +3210,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # CONFIG_DRM_PARADE_PS8640 is not set
 CONFIG_DRM_ANALOGIX_DP=y
 # CONFIG_DRM_ANALOGIX_ANX7688 is not set
+CONFIG_DRM_DW_MIPI_DSI=y
 # CONFIG_DRM_POWERVR_ROGUE_1_9 is not set
 # CONFIG_DRM_POWERVR_ROGUE_1_8 is not set
 
diff --git a/core/linux-gru/kernel.its b/core/linux-gru/kernel.its
index 2f4697c21..68404772c 100644
--- a/core/linux-gru/kernel.its
+++ b/core/linux-gru/kernel.its
@@ -113,6 +113,26 @@
                 algo = "sha1";
             };
         };
+        fdt@11{
+            description = "rk3399-gru-scarlet-r2.dtb";
+            data = /incbin/("arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-r2.dtb");
+            type = "flat_dt";
+            arch = "arm64";
+            compression = "none";
+            hash@1{
+                algo = "sha1";
+            };
+        };
+        fdt@12{
+            description = "rk3399-gru-scarlet-r3.dtb";
+            data = /incbin/("arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-r3.dtb");
+            type = "flat_dt";
+            arch = "arm64";
+            compression = "none";
+            hash@1{
+                algo = "sha1";
+            };
+        };
     };
     configurations {
         default = "conf@1";
@@ -156,5 +176,13 @@
             kernel = "kernel@1";
             fdt = "fdt@10";
         };
+        conf@11{
+            kernel = "kernel@1";
+            fdt = "fdt@11";
+        };
+        conf@12{
+            kernel = "kernel@1";
+            fdt = "fdt@12";
+        };
     };
 };