fc7a119df2
- edk2-OvmfPkg-RiscVVirt-use-gEfiAuthenticatedVariableGuid-.patch [RHEL-20963] - edk2-OvmfPkg-VirtNorFlashDxe-stop-accepting-gEfiVariableG.patch [RHEL-20963] - edk2-OvmfPkg-VirtNorFlashDxe-sanity-check-variables.patch [RHEL-20963] - Resolves: RHEL-20963 ([rhel9] guest fails to boot due to ASSERT error)
53 lines
2.0 KiB
Diff
53 lines
2.0 KiB
Diff
From 390efa52b8c2b61bcc6f24cc9f3b805798150b6e Mon Sep 17 00:00:00 2001
|
|
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Tue, 9 Jan 2024 12:29:00 +0100
|
|
Subject: [PATCH 1/3] OvmfPkg/RiscVVirt: use gEfiAuthenticatedVariableGuid
|
|
unconditionally
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
ArmVirt and OVMF are doing the same.
|
|
|
|
See commit d92eaabefbe0 ("OvmfPkg: simplify VARIABLE_STORE_HEADER
|
|
generation") for details.
|
|
|
|
Suggested-by: László Érsek <lersek@redhat.com>
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>
|
|
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
|
|
Message-Id: <20240109112902.30002-2-kraxel@redhat.com>
|
|
(cherry picked from commit 3b1ddbddeee64cee5aba4f0170fbf5e4781d4879)
|
|
---
|
|
OvmfPkg/RiscVVirt/VarStore.fdf.inc | 9 +--------
|
|
1 file changed, 1 insertion(+), 8 deletions(-)
|
|
|
|
diff --git a/OvmfPkg/RiscVVirt/VarStore.fdf.inc b/OvmfPkg/RiscVVirt/VarStore.fdf.inc
|
|
index aba32315cc..6679c246b3 100644
|
|
--- a/OvmfPkg/RiscVVirt/VarStore.fdf.inc
|
|
+++ b/OvmfPkg/RiscVVirt/VarStore.fdf.inc
|
|
@@ -36,19 +36,12 @@ DATA = {
|
|
# Blockmap[1]: End
|
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
## This is the VARIABLE_STORE_HEADER
|
|
-!if $(SECURE_BOOT_ENABLE) == TRUE
|
|
+ # It is compatible with SECURE_BOOT_ENABLE == FALSE as well.
|
|
# Signature: gEfiAuthenticatedVariableGuid =
|
|
# { 0xaaf32c78, 0x947b, 0x439a,
|
|
# { 0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92 }}
|
|
0x78, 0x2c, 0xf3, 0xaa, 0x7b, 0x94, 0x9a, 0x43,
|
|
0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92,
|
|
-!else
|
|
- # Signature: gEfiVariableGuid =
|
|
- # { 0xddcf3616, 0x3275, 0x4164,
|
|
- # { 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d }}
|
|
- 0x16, 0x36, 0xcf, 0xdd, 0x75, 0x32, 0x64, 0x41,
|
|
- 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d,
|
|
-!endif
|
|
# Size: 0x40000 (gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize) -
|
|
# 0x48 (size of EFI_FIRMWARE_VOLUME_HEADER) = 0x3FFB8
|
|
# This can speed up the Variable Dispatch a bit.
|
|
--
|
|
2.39.3
|
|
|