From a61001d70386c7ec283cd97d1e050907c3a94ae9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Brucker <jean-philippe@linaro.org>
Date: Wed, 14 May 2025 10:38:14 +0100
Subject: [PATCH] configs/cca-3world: Update components to cca/v8

Update the Linux patches to cca/v8. The VMMs needs update as well since
the magic numbers of the KVM API changed. That includes the
buildroot-external-cca component which includes QEMU compatible with
cca/v8.

Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
---
 config/buildroot-cca.yaml | 2 +-
 config/cca-3world.yaml    | 6 +++---
 config/cca-edk2.yaml      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/buildroot-cca.yaml b/config/buildroot-cca.yaml
index e230bab..6f92d5d 100644
--- a/config/buildroot-cca.yaml
+++ b/config/buildroot-cca.yaml
@@ -68,7 +68,7 @@ build:
   buildroot-external-cca:
     repo:
       remote: https://git.codelinaro.org/linaro/dcap/buildroot-external-cca.git
-      revision: main
+      revision: cca/v8
 
     artifacts:
       BUILDROOT_EXTERNAL_CCA:
diff --git a/config/cca-3world.yaml b/config/cca-3world.yaml
index 88c1b05..ffaf98b 100644
--- a/config/cca-3world.yaml
+++ b/config/cca-3world.yaml
@@ -112,7 +112,7 @@ build:
   linux:
     repo:
       remote: https://git.gitlab.arm.com/linux-arm/linux-cca.git
-      revision: cca-host/v7
+      revision: cca-host/v8
     prebuild:
       # Use source dir modification time as timestamp (for locally reproducible build)
       - export KBUILD_BUILD_TIMESTAMP="@$$(stat -c '%Y' ${param:sourcedir})"
@@ -126,13 +126,13 @@ build:
         revision: v1.6.1
       kvmtool:
         remote: https://gitlab.arm.com/linux-arm/kvmtool-cca
-        revision: cca/v5
+        revision: cca/v6
 
   edk2-cca-guest:
     repo:
       edk2:
         remote: https://git.gitlab.arm.com/linux-arm/edk2-cca.git
-        revision: 3223_arm_cca_rmm_v1.0_rel0_v3_patch1
+        revision: 3223_arm_cca_v4
 
     toolchain: aarch64-none-elf-
 
diff --git a/config/cca-edk2.yaml b/config/cca-edk2.yaml
index 9ed1222..b977bc7 100644
--- a/config/cca-edk2.yaml
+++ b/config/cca-edk2.yaml
@@ -52,7 +52,7 @@ build:
     repo:
       edk2:
         remote: https://git.gitlab.arm.com/linux-arm/edk2-cca.git
-        revision: 3223_arm_cca_rmm_v1.0_rel0_v3_patch1
+        revision: 3223_arm_cca_v4
       edk2-platforms:
         remote: https://git.gitlab.arm.com/linux-arm/edk2-platforms-cca.git
-        revision: 3223_arm_cca_rmm_v1.0_rel0_v3
+        revision: 3223_arm_cca_v4
-- 
GitLab