IntelFsp2WrapperPkg: Update gFspWrapperTokenSpaceGuid to gIntelFsp2WrapperTokenSpaceGuid.

[mirror_edk2.git] / OvmfPkg / VarStore.fdf.inc

diff --git a/OvmfPkg/VarStore.fdf.inc b/OvmfPkg/VarStore.fdf.inc
index 59b46988bc402ce673b0f1ff3a81efda3178aef9..ce901c0109b13d858950840197f6f9e6ecc4238b 100644 (file)
--- a/OvmfPkg/VarStore.fdf.inc
+++ b/OvmfPkg/VarStore.fdf.inc
@@ -16,7 +16,6 @@
 ##\r
 \r
 0x00000000|0x0000e000\r
-gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize\r
 #NV_VARIABLE_STORE\r
 DATA = {\r
   ## This is the EFI_FIRMWARE_VOLUME_HEADER\r
@@ -39,19 +38,12 @@ DATA = {
   # Blockmap[1]: End\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   ## This is the VARIABLE_STORE_HEADER\r
-!if $(SECURE_BOOT_ENABLE) == TRUE\r
+  # It is compatible with SECURE_BOOT_ENABLE == FALSE as well.\r
   # Signature: gEfiAuthenticatedVariableGuid =\r
   #   { 0xaaf32c78, 0x947b, 0x439a,\r
   #     { 0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92 }}\r
   0x78, 0x2c, 0xf3, 0xaa, 0x7b, 0x94, 0x9a, 0x43,\r
   0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92,\r
-!else\r
-  # Signature: gEfiVariableGuid =\r
-  #   { 0xddcf3616, 0x3275, 0x4164,\r
-  #     { 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d }}\r
-  0x16, 0x36, 0xcf, 0xdd, 0x75, 0x32, 0x64, 0x41,\r
-  0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d,\r
-!endif\r
   # Size: 0xe000 (gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize) -\r
   #         0x48 (size of EFI_FIRMWARE_VOLUME_HEADER) = 0xdfb8\r
   # This can speed up the Variable Dispatch a bit.\r
@@ -62,10 +54,8 @@ DATA = {
 \r
 0x0000e000|0x00001000\r
 #NV_EVENT_LOG\r
-gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageEventLogBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageEventLogSize\r
 \r
 0x0000f000|0x00001000\r
-gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize\r
 #NV_FTW_WORKING\r
 DATA = {\r
   # EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER->Signature = gEdkiiWorkingBlockSignatureGuid         =\r
@@ -80,5 +70,3 @@ DATA = {
 \r
 0x00010000|0x00010000\r
 #NV_FTW_SPARE\r
-gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize\r
-\r