From 69d11b64cbf39b2ea9dd7fcc717b376a3cb95b26 Mon Sep 17 00:00:00 2001 From: Peter Hoyes Date: Thu, 24 Feb 2022 11:22:38 +0000 Subject: [PATCH] arm/boot-wrapper-aarch64: Upgrade to newer revision Upgrade boot-wrapper-aarch64 to 1044c77062573985f7c994c3b6cef5695f57e955 Hold back gem5 at 8d5a765251d9113c3c0f9fa14de42a9e7486fe8a in bbappend. Issue-Id: SCM-3871 Signed-off-by: Peter Hoyes Change-Id: Ia5ccca2234dd117d530970f9f90469dacbb778e3 Signed-off-by: Jon Mason --- .../boot-wrapper-aarch64/boot-wrapper-aarch64_git.bb | 2 +- .../boot-wrapper-aarch64/boot-wrapper-aarch64_%.bbappend | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/meta-arm/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_git.bb b/meta-arm/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_git.bb index c7235173..2f375a42 100644 --- a/meta-arm/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_git.bb +++ b/meta-arm/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_git.bb @@ -4,7 +4,7 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=bb63326febfb5fb909226c8e7ebcef5c" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git" -SRCREV = "8d5a765251d9113c3c0f9fa14de42a9e7486fe8a" +SRCREV = "1044c77062573985f7c994c3b6cef5695f57e955" PV = "git${SRCPV}" diff --git a/meta-gem5/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_%.bbappend b/meta-gem5/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_%.bbappend index 57e6b53f..3dd2cba2 100644 --- a/meta-gem5/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_%.bbappend +++ b/meta-gem5/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_%.bbappend @@ -11,3 +11,6 @@ BOOT_WRAPPER_AARCH64_DEVICETREE:gem5-arm64 = "gem5-aarch64.dtb" DEPLOY_DEPEND_LIST ?= "" DEPLOY_DEPEND_LIST:gem5-arm64 = " gem5-aarch64-dtb:do_deploy" do_deploy[depends] += "${DEPLOY_DEPEND_LIST}" + +# The base recipe has been upgraded, so hold back at known working revision +SRCREV = "8d5a765251d9113c3c0f9fa14de42a9e7486fe8a"