From patchwork Fri Aug 30 12:34:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 823992 Delivered-To: patch@linaro.org Received: by 2002:a5d:48c1:0:b0:367:895a:4699 with SMTP id p1csp754307wrs; Fri, 30 Aug 2024 05:35:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWdlmEMXZHuKlVYfiI5Qm5sSMsImx70+jUS+/gj2FYfnXr4zGdDcfSdpibWxxtPbrg1z/Aw6A==@linaro.org X-Google-Smtp-Source: AGHT+IH6CAHQr6CMnBGRHLhs9v+cpDHdRPC4YDs/N0jJt05eRh8R2zBih1pkOM4yvH3FyXse9HSx X-Received: by 2002:a2e:4a0a:0:b0:2f6:1d5a:709b with SMTP id 38308e7fff4ca-2f61f2a1887mr11205061fa.43.1725021334365; Fri, 30 Aug 2024 05:35:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725021334; cv=none; d=google.com; s=arc-20240605; b=lNZJkdzBkrkzG6w8oPJ8RURqpaiBcO4T4/5IlU0uprpoMiuyBufDktxZd110u6yi1S wDf5h3LXG6UFcBQ7hWeWRb+Jk3m3tz9aYRfPGFDrjfxzerC7+n/IiNLq3NLgVuLuVDxo pTgvK3MczLjPgCTrQSQO5F/YX3t3zEJlgWw8eZ9h4bjezEbINIJi5I6r7Vibd7O23EX3 gnq7eaIoGazgbrOHTTWrdKAmUOa+54vbFB2GtIP2tc8cV4gdhtwJaNXx0+tQtMl8aPxw icHu5OpZKeZa5+4rg/oy2bPqZbOakpvtlwp6T7ogarrEAsDyPYzOKtJRlH/M6e4S5Lmu jnJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:cc:to:in-reply-to:references :message-id:content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=r6YJ+zEV9RlWK+fgXZsmPvk1MUsoZRb/Nw//sI06sYU=; fh=+EZxyR56yrOuHmbP1DvuRyrmkR7uhLZYyH8+1SGcsEI=; b=aBXqwUxm4Nsyv9u8cRJ09tdG8nZfVEc6ozf/74UWhn/IYnPtLaDfvZsfd55RyzVDuj TTUtC/Iiwv/jJV32tACQd9ZJ8EyfTKp73W0C7A4wCu9H4YnKcYIwos4Z5/3/dAPKiU+u L6+30KKhEqvrUo05B5bYVrhnRzMdwxsmlqkG7UfzfndlRyg2N69XGhIRFBB6qImqOde+ 5cY4dQGWnRqTnaK8QA3WOjL+wSq118dEdL5moPsJsSWTr+EU5H0p7qxo8DB8Fq7Thczl eylVIvLH13t6kyh8DdPYH2qt26xeZm6DkHIGS5Y/o9fqszojw1yQ5I9hotkM6CBbNMbg u5aA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="a/LGgrA1"; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id 4fb4d7f45d1cf-5c226d0090bsi2754938a12.413.2024.08.30.05.35.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 05:35:34 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="a/LGgrA1"; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 91AF288C66; Fri, 30 Aug 2024 14:34:47 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="a/LGgrA1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1D12388C3A; Fri, 30 Aug 2024 14:34:43 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id F39C288C01 for ; Fri, 30 Aug 2024 14:34:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=caleb.connolly@linaro.org Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-37193ef72a4so1149086f8f.1 for ; Fri, 30 Aug 2024 05:34:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725021280; x=1725626080; darn=lists.denx.de; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=r6YJ+zEV9RlWK+fgXZsmPvk1MUsoZRb/Nw//sI06sYU=; b=a/LGgrA10q2uDtwF8TE47qOf+IbFKbdTHFEz1RXqpXd/BgRd9jwc13UpjXNFRDHGO1 j/u7XpMpa4kjpWHEDa7w24qLZnDOqw+a+38ihroxjMJIYAAxNX54lSWbkHIpm57srsrN MYF0Z7Dk+7CexwxAGRw1C+FW3XnhSXj67eLu/2suVKpiIgf6+i/S3+Dip9fZjazloQ2O aphJ27/GwgOMo6plSEHSUzC+GOB/YragGc5bcgNuo5JeRTQP8YTkNXO8OYhRCS6oGmRl +BScxW05Rjmv9rtSRjElCJp/Bt/gVVlLasGt7/Zen6hJFguqE6Lq/Fud5I5I5LHOItRK qAyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725021280; x=1725626080; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=r6YJ+zEV9RlWK+fgXZsmPvk1MUsoZRb/Nw//sI06sYU=; b=Y/VFwMBw0Rp4CNp8wApxH2Dg3nCkGSwrO4buwIO6ud1l72EhmqFuEHeA6ph/rCKL5m ux6r3eHnfJLfqlViymZ2eFa+jSkKGsWdR6GuQ7LeN3O5OhWyyLmhXwZ3xWOVgZk55Pvy GQLHvOYW1oPUE7GuMi830MuzDhSl7vXXQg8oaZjtSb7jLwQWZvQQ9DFgzvWR8Ge8kzCq kHCI/cBpl6x75/t/2uMNEA+y7kfaesVT91YSzOHBxPvcHeY5PTejGQWOT6zmkCMVXNhY DIAxP4kIFhSt499s8YWb5R3SMdrWo1DzkiILhsnmbXmpkujinQQzjXvl5dNzkVG5MVtA h6pw== X-Forwarded-Encrypted: i=1; AJvYcCXXhgG9R+JJhSkP/KCJ2UM8l6l6nl/vd4sRthD8ivTmICAhk2mNJSR5nJUgYeANoAZenPCemkM=@lists.denx.de X-Gm-Message-State: AOJu0YwX4Dj+2sALuJwucj7fcVrLpt2FtrBSNSj2Yu7wTCbF3IvloLSA sVTwDpKgDKlUqZwWoAMHqmErl80aRMUT/CeS+scpGGs+hb8uBtxUxo7Yd0Tx9nY= X-Received: by 2002:a5d:5d85:0:b0:374:b5bc:8c93 with SMTP id ffacd0b85a97d-374b5bc8f24mr723010f8f.8.1725021280311; Fri, 30 Aug 2024 05:34:40 -0700 (PDT) Received: from [192.168.1.17] (host-80-47-105-51.as13285.net. [80.47.105.51]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-374b960ef94sm648207f8f.103.2024.08.30.05.34.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 05:34:39 -0700 (PDT) From: Caleb Connolly Date: Fri, 30 Aug 2024 13:34:35 +0100 Subject: [PATCH v8 05/11] sandbox: switch to dynamic UUIDs MIME-Version: 1.0 Message-Id: <20240830-b4-dynamic-uuid-v8-5-79b31b199bee@linaro.org> References: <20240830-b4-dynamic-uuid-v8-0-79b31b199bee@linaro.org> In-Reply-To: <20240830-b4-dynamic-uuid-v8-0-79b31b199bee@linaro.org> To: Tom Rini , Heinrich Schuchardt , Ilias Apalodimas , Simon Glass , Mario Six , Alper Nebi Yasak , Abdellatif El Khlifi Cc: Richard Hughes , u-boot@lists.denx.de, Caleb Connolly X-Mailer: b4 0.14-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=10634; i=caleb.connolly@linaro.org; h=from:subject:message-id; bh=o31iVK1g11OWZDtfgCEcTtP5yaGmjPRi3LpsdCMNZtY=; b=owEBbQKS/ZANAwAIAQWDMSsZX2S2AcsmYgBm0bxZMyuGbs0V2/uPPPmg3p9XdAH3AnGxsac91 nMOOIxs5PWJAjMEAAEIAB0WIQS2UaFGPGq+0GkMVc0FgzErGV9ktgUCZtG8WQAKCRAFgzErGV9k tl3oD/sFLdnIjdleP9sbb6dJXn6HQAo20dZtXRRyaz52+sR6DcxeKk4vqXpAUjn5HGmT1rzao57 jj11q5Sar+1pLUnWZN5nvTEq1n0/vUSeZLvfYUd+wR/ffkHPNXohuhcOFaDSLgPS9MgTNcX4JUQ jXkIrv1OXkAwRxcIzjfb7ohYY7h/8y3TPLP5JMwaePYdRkx8ASKukV4Y6Ovbemz2Z03oBpOeUYl mLwLkrheCaa+GuwSONP7u+YIuesiFZhkhMpW2FW4k+4SPogP5XuICg+bciWhEwO31oNupaYc0AO uyrwGjCSUYZqODBEgR613OXS0LxJluPy/6+175fqTnBN71HVIZ7kQGjl1nWTUz/MzHeWQkin4Ks 7NX1ORA8WFbe3HoeEIgl5JbPOS8+/ylUTX5kV3tQlcjlj8+ZCcxSEWIljTiquFkJTMoSn0sS1N3 cdjzAxd8QpHACoZ+9xWyMSYiPQVAd+ahsV8/85vi9eMLyioGZYZimT/iaJKPzgQ67EmNx0d1oY7 Dd4q43hrjRGdbf+oKtNjM7twt3yZarzoOaCSCnu3NdL7X4TTH3NKlkXs1QHEu3b5j1IVHXiP8Xa TmN6MlABXPr6f29IwBJ5KJNnUMkFQ0RooygLWMo32NRyGTRN9O1vFJYFFkxgBMK0MMLYY4cv0Lc aAlO48VlQyalmng== X-Developer-Key: i=caleb.connolly@linaro.org; a=openpgp; fpr=83B24DA7FE145076BC38BB250CD904EB673A7C47 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Migrate sandbox over to generating it's capsule update image GUIDs dynamically from the namespace and board/image info. Update the reference and tests to use the new GUIDs. Acked-by: Ilias Apalodimas Signed-off-by: Caleb Connolly --- board/sandbox/sandbox.c | 16 ---------------- include/sandbox_efi_capsule.h | 6 +++--- .../tests/test_efi_capsule/test_capsule_firmware_fit.py | 2 +- .../tests/test_efi_capsule/test_capsule_firmware_raw.py | 8 ++++---- .../test_efi_capsule/test_capsule_firmware_signed_fit.py | 2 +- .../test_efi_capsule/test_capsule_firmware_signed_raw.py | 4 ++-- test/py/tests/test_efi_capsule/version.dtso | 6 +++--- tools/binman/etype/efi_capsule.py | 2 +- tools/binman/ftest.py | 2 +- 9 files changed, 16 insertions(+), 32 deletions(-) diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c index 802596569c64..d97945e58fcf 100644 --- a/board/sandbox/sandbox.c +++ b/board/sandbox/sandbox.c @@ -31,36 +31,20 @@ */ gd_t *gd; #if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) -/* GUIDs for capsule updatable firmware images */ -#define SANDBOX_UBOOT_IMAGE_GUID \ - EFI_GUID(0x09d7cf52, 0x0720, 0x4710, 0x91, 0xd1, \ - 0x08, 0x46, 0x9b, 0x7f, 0xe9, 0xc8) - -#define SANDBOX_UBOOT_ENV_IMAGE_GUID \ - EFI_GUID(0x5a7021f5, 0xfef2, 0x48b4, 0xaa, 0xba, \ - 0x83, 0x2e, 0x77, 0x74, 0x18, 0xc0) - -#define SANDBOX_FIT_IMAGE_GUID \ - EFI_GUID(0x3673b45d, 0x6a7c, 0x46f3, 0x9e, 0x60, \ - 0xad, 0xab, 0xb0, 0x3f, 0x79, 0x37) - struct efi_fw_image fw_images[] = { #if defined(CONFIG_EFI_CAPSULE_FIRMWARE_RAW) { - .image_type_id = SANDBOX_UBOOT_IMAGE_GUID, .fw_name = u"SANDBOX-UBOOT", .image_index = 1, }, { - .image_type_id = SANDBOX_UBOOT_ENV_IMAGE_GUID, .fw_name = u"SANDBOX-UBOOT-ENV", .image_index = 2, }, #elif defined(CONFIG_EFI_CAPSULE_FIRMWARE_FIT) { - .image_type_id = SANDBOX_FIT_IMAGE_GUID, .fw_name = u"SANDBOX-FIT", .image_index = 1, }, #endif diff --git a/include/sandbox_efi_capsule.h b/include/sandbox_efi_capsule.h index 3e288e8a84a2..84d45ec5cfd5 100644 --- a/include/sandbox_efi_capsule.h +++ b/include/sandbox_efi_capsule.h @@ -5,11 +5,11 @@ #if !defined(_SANDBOX_EFI_CAPSULE_H_) #define _SANDBOX_EFI_CAPSULE_H_ -#define SANDBOX_UBOOT_IMAGE_GUID "09d7cf52-0720-4710-91d1-08469b7fe9c8" -#define SANDBOX_UBOOT_ENV_IMAGE_GUID "5a7021f5-fef2-48b4-aaba-832e777418c0" -#define SANDBOX_FIT_IMAGE_GUID "3673b45d-6a7c-46f3-9e60-adabb03f7937" +#define SANDBOX_UBOOT_IMAGE_GUID "985f2937-7c2e-5e9a-8a5e-8e063312964b" +#define SANDBOX_UBOOT_ENV_IMAGE_GUID "9e339473-c2eb-530a-a69b-0cd6bbbed40e" +#define SANDBOX_FIT_IMAGE_GUID "46610520-469e-59dc-a8dd-c11832b877ea" #define SANDBOX_INCORRECT_GUID "058b7d83-50d5-4c47-a195-60d86ad341c4" #define UBOOT_FIT_IMAGE "u-boot_bin_env.itb" diff --git a/test/py/tests/test_efi_capsule/test_capsule_firmware_fit.py b/test/py/tests/test_efi_capsule/test_capsule_firmware_fit.py index 11bcdc2bb293..a726c71c1138 100644 --- a/test/py/tests/test_efi_capsule/test_capsule_firmware_fit.py +++ b/test/py/tests/test_efi_capsule/test_capsule_firmware_fit.py @@ -146,9 +146,9 @@ class TestEfiCapsuleFirmwareFit(): verify_content(u_boot_console, '100000', 'u-boot:Old') verify_content(u_boot_console, '150000', 'u-boot-env:Old') else: # ensure that SANDBOX_UBOOT_IMAGE_GUID is in the ESRT. - assert '3673B45D-6A7C-46F3-9E60-ADABB03F7937' in ''.join(output) + assert '985F2937-7C2E-5E9A-8A5E-8E063312964B' in ''.join(output) assert 'ESRT: fw_version=5' in ''.join(output) assert 'ESRT: lowest_supported_fw_version=3' in ''.join(output) verify_content(u_boot_console, '100000', 'u-boot:New') diff --git a/test/py/tests/test_efi_capsule/test_capsule_firmware_raw.py b/test/py/tests/test_efi_capsule/test_capsule_firmware_raw.py index f3a2dff5c2c8..8a790405c7c4 100644 --- a/test/py/tests/test_efi_capsule/test_capsule_firmware_raw.py +++ b/test/py/tests/test_efi_capsule/test_capsule_firmware_raw.py @@ -144,12 +144,12 @@ class TestEfiCapsuleFirmwareRaw: 'env set dfu_alt_info "sf 0:0=u-boot-bin raw 0x100000 0x50000;u-boot-env raw 0x150000 0x200000"', 'efidebug capsule esrt']) # ensure that SANDBOX_UBOOT_ENV_IMAGE_GUID is in the ESRT. - assert '5A7021F5-FEF2-48B4-AABA-832E777418C0' in ''.join(output) + assert '9E339473-C2EB-530A-A69B-0CD6BBBED40E' in ''.join(output) # ensure that SANDBOX_UBOOT_IMAGE_GUID is in the ESRT. - assert '09D7CF52-0720-4710-91D1-08469B7FE9C8' in ''.join(output) + assert '985F2937-7C2E-5E9A-8A5E-8E063312964B' in ''.join(output) check_file_removed(u_boot_console, disk_img, capsule_files) expected = 'u-boot:Old' if capsule_auth else 'u-boot:New' @@ -198,14 +198,14 @@ class TestEfiCapsuleFirmwareRaw: verify_content(u_boot_console, '100000', 'u-boot:Old') verify_content(u_boot_console, '150000', 'u-boot-env:Old') else: # ensure that SANDBOX_UBOOT_IMAGE_GUID is in the ESRT. - assert '09D7CF52-0720-4710-91D1-08469B7FE9C8' in ''.join(output) + assert '985F2937-7C2E-5E9A-8A5E-8E063312964B' in ''.join(output) assert 'ESRT: fw_version=5' in ''.join(output) assert 'ESRT: lowest_supported_fw_version=3' in ''.join(output) # ensure that SANDBOX_UBOOT_ENV_IMAGE_GUID is in the ESRT. - assert '5A7021F5-FEF2-48B4-AABA-832E777418C0' in ''.join(output) + assert '9E339473-C2EB-530A-A69B-0CD6BBBED40E' in ''.join(output) assert 'ESRT: fw_version=10' in ''.join(output) assert 'ESRT: lowest_supported_fw_version=7' in ''.join(output) verify_content(u_boot_console, '100000', 'u-boot:New') diff --git a/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_fit.py b/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_fit.py index 44a58baa3106..debbce8bdbdf 100644 --- a/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_fit.py +++ b/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_fit.py @@ -156,9 +156,9 @@ class TestEfiCapsuleFirmwareSignedFit(): 'u-boot-env raw 0x150000 0x200000"', 'efidebug capsule esrt']) # ensure that SANDBOX_UBOOT_IMAGE_GUID is in the ESRT. - assert '3673B45D-6A7C-46F3-9E60-ADABB03F7937' in ''.join(output) + assert '46610520-469E-59DC-A8DD-C11832B877EA' in ''.join(output) assert 'ESRT: fw_version=5' in ''.join(output) assert 'ESRT: lowest_supported_fw_version=3' in ''.join(output) verify_content(u_boot_console, '100000', 'u-boot:New') diff --git a/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_raw.py b/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_raw.py index 83a10e160b8c..439bd71b3a7d 100644 --- a/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_raw.py +++ b/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_raw.py @@ -150,14 +150,14 @@ class TestEfiCapsuleFirmwareSignedRaw(): 'u-boot-env raw 0x150000 0x200000"', 'efidebug capsule esrt']) # ensure that SANDBOX_UBOOT_IMAGE_GUID is in the ESRT. - assert '09D7CF52-0720-4710-91D1-08469B7FE9C8' in ''.join(output) + assert '985F2937-7C2E-5E9A-8A5E-8E063312964B' in ''.join(output) assert 'ESRT: fw_version=5' in ''.join(output) assert 'ESRT: lowest_supported_fw_version=3' in ''.join(output) # ensure that SANDBOX_UBOOT_ENV_IMAGE_GUID is in the ESRT. - assert '5A7021F5-FEF2-48B4-AABA-832E777418C0' in ''.join(output) + assert '9E339473-C2EB-530A-A69B-0CD6BBBED40E' in ''.join(output) assert 'ESRT: fw_version=10' in ''.join(output) assert 'ESRT: lowest_supported_fw_version=7' in ''.join(output) verify_content(u_boot_console, '100000', 'u-boot:New') diff --git a/test/py/tests/test_efi_capsule/version.dtso b/test/py/tests/test_efi_capsule/version.dtso index 07850cc6064c..3aebb5b64fbd 100644 --- a/test/py/tests/test_efi_capsule/version.dtso +++ b/test/py/tests/test_efi_capsule/version.dtso @@ -7,18 +7,18 @@ firmware-version { image1 { lowest-supported-version = <3>; image-index = <1>; - image-type-id = "09D7CF52-0720-4710-91D1-08469B7FE9C8"; + image-type-id = "985F2937-7C2E-5E9A-8A5E-8E063312964B"; }; image2 { lowest-supported-version = <7>; image-index = <2>; - image-type-id = "5A7021F5-FEF2-48B4-AABA-832E777418C0"; + image-type-id = "9E339473-C2EB-530A-A69B-0CD6BBBED40E"; }; image3 { lowest-supported-version = <3>; image-index = <1>; - image-type-id = "3673B45D-6A7C-46F3-9E60-ADABB03F7937"; + image-type-id = "46610520-469E-59DC-A8DD-C11832B877EA"; }; }; }; diff --git a/tools/binman/etype/efi_capsule.py b/tools/binman/etype/efi_capsule.py index 5941545d0b29..768e006dc50d 100644 --- a/tools/binman/etype/efi_capsule.py +++ b/tools/binman/etype/efi_capsule.py @@ -23,9 +23,9 @@ def get_binman_test_guid(type_str): Returns: The actual GUID value (str) """ TYPE_TO_GUID = { - 'binman-test' : '09d7cf52-0720-4710-91d1-08469b7fe9c8' + 'binman-test' : '985f2937-7c2e-5e9a-8a5e-8e063312964b' } return TYPE_TO_GUID[type_str] diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 93f3d22cf573..2577c0016c0c 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -124,9 +124,9 @@ TEE_ADDR = 0x5678 # Firmware Management Protocol(FMP) GUID FW_MGMT_GUID = '6dcbd5ed-e82d-4c44-bda1-7194199ad92a' # Image GUID specified in the DTS -CAPSULE_IMAGE_GUID = '09d7cf52-0720-4710-91d1-08469b7fe9c8' +CAPSULE_IMAGE_GUID = '985F2937-7C2E-5E9A-8A5E-8E063312964B' # Windows cert GUID WIN_CERT_TYPE_EFI_GUID = '4aafd29d-68df-49ee-8aa9-347d375665a7' # Empty capsule GUIDs EMPTY_CAPSULE_ACCEPT_GUID = '0c996046-bcc0-4d04-85ec-e1fcedf1c6f8'