From 237c94f5ef890bb21c3031afe8a9ea95ab85224b Mon Sep 17 00:00:00 2001
From: Usama Arif <usama.arif@arm.com>
Date: Fri, 28 Aug 2020 12:21:57 +0100
Subject: [PATCH] arm/kernel: Introduce 5.4 Android Common Kernel

This recipe targets machines based on arm64. The patch
also adds an .inc file to for common code between different
ACK recipes.

The base commit is based on tag refs/tags/ASB-2020-06-05_5.4-stable

Change-Id: I5b5f1eeb8336910355fc9880670c729453a8096a
Signed-off-by: Usama Arif <usama.arif@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .../linux/linux-arm64-ack_5.4.bbappend        |  3 +++
 .../recipes-kernel/linux/linux-arm64-ack.inc  | 21 +++++++++++++++++++
 .../linux/linux-arm64-ack_4.19.bb             | 18 +---------------
 .../linux/linux-arm64-ack_5.4.bb              | 12 +++++++++++
 4 files changed, 37 insertions(+), 17 deletions(-)
 create mode 100644 meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack_5.4.bbappend
 create mode 100644 meta-arm/recipes-kernel/linux/linux-arm64-ack.inc
 create mode 100644 meta-arm/recipes-kernel/linux/linux-arm64-ack_5.4.bb

diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack_5.4.bbappend b/meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack_5.4.bbappend
new file mode 100644
index 00000000..f765661c
--- /dev/null
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack_5.4.bbappend
@@ -0,0 +1,3 @@
+# Machine specific configurations
+
+require linux-arm-platforms.inc
diff --git a/meta-arm/recipes-kernel/linux/linux-arm64-ack.inc b/meta-arm/recipes-kernel/linux/linux-arm64-ack.inc
new file mode 100644
index 00000000..a9d561b2
--- /dev/null
+++ b/meta-arm/recipes-kernel/linux/linux-arm64-ack.inc
@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2020 Arm Limited
+#
+
+DESCRIPTION = "Linux Android Common Kernel"
+SECTION = "kernel"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
+
+require recipes-kernel/linux/linux-yocto.inc
+
+COMPATIBLE_MACHINE ?= "invalid"
+
+ARCH = "arm64"
+
+S = "${WORKDIR}/git"
+
+LINUX_VERSION ?= "${PV}"
+KERNEL_VERSION_SANITY_SKIP = "1"
+KBRANCH = ""
diff --git a/meta-arm/recipes-kernel/linux/linux-arm64-ack_4.19.bb b/meta-arm/recipes-kernel/linux/linux-arm64-ack_4.19.bb
index 4eb17e2c..989b0556 100644
--- a/meta-arm/recipes-kernel/linux/linux-arm64-ack_4.19.bb
+++ b/meta-arm/recipes-kernel/linux/linux-arm64-ack_4.19.bb
@@ -2,17 +2,7 @@
 #
 # Copyright (c) 2020 Arm Limited
 #
-
-DESCRIPTION = "Linux Android Common Kernel"
-SECTION = "kernel"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-
-require recipes-kernel/linux/linux-yocto.inc
-
-COMPATIBLE_MACHINE ?= "invalid"
-
-ARCH = "arm64"
+require linux-arm64-ack.inc
 
 SRC_URI = " \
     git://android.googlesource.com/kernel/common.git;protocol=https;branch=android-4.19-q-release \
@@ -20,9 +10,3 @@ SRC_URI = " \
 
 # ASB-2020-06-05_4.19-q-release tag commit
 SRCREV = "ebd43352dd92e56f14a4985a3c99de767fc8f9cf"
-
-S = "${WORKDIR}/git"
-
-LINUX_VERSION ?= "${PV}"
-KERNEL_VERSION_SANITY_SKIP = "1"
-KBRANCH = ""
diff --git a/meta-arm/recipes-kernel/linux/linux-arm64-ack_5.4.bb b/meta-arm/recipes-kernel/linux/linux-arm64-ack_5.4.bb
new file mode 100644
index 00000000..908873d8
--- /dev/null
+++ b/meta-arm/recipes-kernel/linux/linux-arm64-ack_5.4.bb
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (c) 2020 Arm Limited
+#
+require linux-arm64-ack.inc
+
+SRC_URI = " \
+    git://android.googlesource.com/kernel/common.git;protocol=https;branch=android-5.4-stable \
+    "
+
+# ASB-2020-06-05_5.4-stable tag commit
+SRCREV = "2068976fd7b172b64020006efde1ee57af6bbf99"