From c45d7dffcadcb7c129e7f05023f180b8f7999eca Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Mon, 17 Feb 2025 16:11:42 +0100 Subject: [PATCH] intel/ci: Update GuC firmware for ADL-S and ADL-N Certain ADL devices, like nissa, use the tgl_guc_70.bin firmware. Signed-off-by: Valentine Burley Part-of: --- .gitlab-ci/container/gitlab-ci.yml | 2 +- .gitlab-ci/firmware/i915/{adlp-fw.json => adl-fw.json} | 3 ++- .gitlab-ci/image-tags.yml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) rename .gitlab-ci/firmware/i915/{adlp-fw.json => adl-fw.json} (82%) diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index 6f3bbe2a0e1..22e19ae216d 100644 --- a/.gitlab-ci/container/gitlab-ci.yml +++ b/.gitlab-ci/container/gitlab-ci.yml @@ -502,7 +502,7 @@ debian/arm64_test-vk: .firmware_x86_64: variables: FIRMWARE_FILES: | - .gitlab-ci/firmware/i915/adlp-fw.json + .gitlab-ci/firmware/i915/adl-fw.json .gitlab-ci/firmware/i915/mtl-fw.json .firmware_arm64: diff --git a/.gitlab-ci/firmware/i915/adlp-fw.json b/.gitlab-ci/firmware/i915/adl-fw.json similarity index 82% rename from .gitlab-ci/firmware/i915/adlp-fw.json rename to .gitlab-ci/firmware/i915/adl-fw.json index e25df871133..ad4a763875e 100644 --- a/.gitlab-ci/firmware/i915/adlp-fw.json +++ b/.gitlab-ci/firmware/i915/adl-fw.json @@ -3,7 +3,8 @@ "git_hash": "36d0c64694dcee6cf49654f430ab70c22dd647d8", "files": [ "adlp_dmc.bin", - "adlp_guc_70.bin" + "adlp_guc_70.bin", + "tgl_guc_70.bin" ], "dst": "/lib/firmware/i915/" } diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index f8e97ba45c9..72c348ec98f 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -33,7 +33,7 @@ variables: DEBIAN_TEST_ANDROID_TAG: "20250212-up-angle" DEBIAN_TEST_GL_TAG: "20250221-piglit-04" DEBIAN_TEST_VK_TAG: "20250221-piglit-04" - KERNEL_ROOTFS_TAG: "20250221-rm-kernel" + KERNEL_ROOTFS_TAG: "20250221-adl-fw" DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils" DEBIAN_PYUTILS_TAG: "20250129-lavacli"