summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunil V L <sunilvl@ventanamicro.com>2023-04-18 10:28:07 +0530
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2023-06-23 04:49:11 +0000
commitf6c4b0a78e0fb601e817739e289e889de2d196e4 (patch)
tree8ddaf9a1855ee9a13be341ad35ea87895846e554
parentfcd71642df9a3a5932a2db116acc6fe23458d8f5 (diff)
downloadedk2-f6c4b0a78e0fb601e817739e289e889de2d196e4.tar.gz
edk2-f6c4b0a78e0fb601e817739e289e889de2d196e4.tar.bz2
edk2-f6c4b0a78e0fb601e817739e289e889de2d196e4.zip
OvmfPkg/RiscVVirt: Fix couple of issues in VarStore
The size of the FV and the WriteQueueSize is incorrect which causes the flash to be re-written during boot. Fix them and update the new checksum value. Signed-off-by: Sunil V L <sunilvl@ventanamicro.com> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org> Cc: Jiewen Yao <jiewen.yao@intel.com> Cc: Jordan Justen <jordan.l.justen@intel.com> Cc: Gerd Hoffmann <kraxel@redhat.com> Cc: Andrei Warkentin <andrei.warkentin@intel.com> Cc: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
-rw-r--r--OvmfPkg/RiscVVirt/VarStore.fdf.inc12
1 files changed, 6 insertions, 6 deletions
diff --git a/OvmfPkg/RiscVVirt/VarStore.fdf.inc b/OvmfPkg/RiscVVirt/VarStore.fdf.inc
index 30b170d779..6bc619e50c 100644
--- a/OvmfPkg/RiscVVirt/VarStore.fdf.inc
+++ b/OvmfPkg/RiscVVirt/VarStore.fdf.inc
@@ -25,12 +25,12 @@ DATA = {
# { 0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50 }}
0x8D, 0x2B, 0xF1, 0xFF, 0x96, 0x76, 0x8B, 0x4C,
0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50,
- # FvLength: 0x20000
- 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+ # FvLength: 0xC0000
+ 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,
# Signature "_FVH" # Attributes
0x5f, 0x46, 0x56, 0x48, 0xff, 0xfe, 0x04, 0x00,
# HeaderLength # CheckSum # ExtHeaderOffset #Reserved #Revision
- 0x48, 0x00, 0x39, 0xF1, 0x00, 0x00, 0x00, 0x02,
+ 0x48, 0x00, 0x2F, 0xF1, 0x00, 0x00, 0x00, 0x02,
# Blockmap[0]: 0x20 Blocks * 0x1000 Bytes / Block
0x00, 0x08, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
# Blockmap[1]: End
@@ -60,7 +60,7 @@ DATA = {
$(VARS_FTW_WORKING_OFFSET)|$(VARS_FTW_WORKING_SIZE)
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
#
-#NV_FTW_WROK
+#NV_FTW_WORK
#
DATA = {
# EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER->Signature = gEdkiiWorkingBlockSignatureGuid =
@@ -68,9 +68,9 @@ DATA = {
0x2b, 0x29, 0x58, 0x9e, 0x68, 0x7c, 0x7d, 0x49,
0xa0, 0xce, 0x65, 0x0, 0xfd, 0x9f, 0x1b, 0x95,
# Crc:UINT32 #WorkingBlockValid:1, WorkingBlockInvalid:1, Reserved
- 0x2c, 0xaf, 0x2c, 0x64, 0xFE, 0xFF, 0xFF, 0xFF,
+ 0x5b, 0xe7, 0xc6, 0x86, 0xFE, 0xFF, 0xFF, 0xFF,
# WriteQueueSize: UINT64
- 0xE0, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ 0xE0, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00
}
$(VARS_FTW_SPARE_OFFSET)|$(VARS_FTW_SPARE_SIZE)