arm-bsp/machine: Fix ACK version for tc0 to 4.19
PATCH 1/2 arm-bsp/machine: Fix ACK version for tc0 to 4.19
Change-Id Ieca56d40c26367c158b9394d546323be4c1f81ce
Signed-off-by Usama Arif <[email protected]>
--- meta-arm-bsp/conf/machine/tc0.conf | 1 + 1 file changed, 1 insertion(+)
meta-arm-bsp/conf/machine/tc0.conf +1 -0
@@ -14,6 +14,7 @@ UBOOT_MACHINE ?= "total_compute_defconfig" # Trusted firmware A v2.3 PREFERRED_PROVIDER_virtual/trusted-firmware-a ?= "trusted-firmware-a" PREFERRED_VERSION_trusted-firmware-a ?= "2.3%" +PREFERRED_VERSION_linux-arm64-ack ?= "4.19" EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a"
Signature · 1 line
2.17.1
PATCH 2/2 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 <[email protected]>
--- .../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
meta-arm-bsp/recipes-kernel/linux/linux-arm64-ack_5.4.bbappend new file +3 -0
@@ -0,0 +1,3 @@ +# Machine specific configurations + +require linux-arm-platforms.inc
meta-arm/recipes-kernel/linux/linux-arm64-ack.inc new file +21 -0
@@ -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 = ""
meta-arm/recipes-kernel/linux/linux-arm64-ack_4.19.bb +1 -17
@@ -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 = ""
meta-arm/recipes-kernel/linux/linux-arm64-ack_5.4.bb new file +12 -0
@@ -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"
Signature · 1 line
2.17.1
Quoted 2 lines · Usama Arif
Change-Id Ieca56d40c26367c158b9394d546323be4c1f81ceSigned-off-by Usama Arif <[email protected]>
Both patches pulled into master.
Thanks,
Jon
Quoted 21 lines
--- meta-arm-bsp/conf/machine/tc0.conf | 1 + 1 file changed, 1 insertion(+)meta-arm-bsp/conf/machine/tc0.conf +1
-0@@ -14,6 +14,7 @@ UBOOT_MACHINE ?= "total_compute_defconfig" # Trusted firmware A v2.3 PREFERRED_PROVIDER_virtual/trusted-firmware-a ?= "trusted-firmware-a" PREFERRED_VERSION_trusted-firmware-a ?= "2.3%" +PREFERRED_VERSION_linux-arm64-ack ?= "4.19" EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a"Signature · 1 line
2.17.1