Remove unnecessary use of FixedPcdxxx() functions and [FixedPcd] INF sections. These should only be used for PCDs that are used to pre-init global variables, pre-init global structures, or size arrays.

Do some minor clean ups to INF files
 


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9870 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 7 insertions, 17 deletions

diff --git a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
index ed17bdb41a..6836014882 100644
--- a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
+++ b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
@@ -2,7 +2,7 @@
   Firmware Block Services to support emulating non-volatile variables

   by pretending that a memory buffer is storage for the NV variables.

 

-  Copyright (c) 2006 - 2009, Intel Corporation

+  Copyright (c) 2006 - 2010, Intel Corporation

   All rights reserved. This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -769,8 +769,8 @@ FvbInitialize (
   // Verify that the PCD's are set correctly.

   //

   if (

-       (FixedPcdGet32 (PcdVariableStoreSize) +

-        FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize)

+       (PcdGet32 (PcdVariableStoreSize) +

+        PcdGet32 (PcdFlashNvStorageFtwWorkingSize)

        ) >

        EMU_FVB_BLOCK_SIZE

      ) {

@@ -820,7 +820,7 @@ FvbInitialize (
   //

   // Initialize the Fault Tolerant Write data area

   //

-  SubPtr = (VOID*) ((UINT8*) Ptr + FixedPcdGet32 (PcdVariableStoreSize));

+  SubPtr = (VOID*) ((UINT8*) Ptr + PcdGet32 (PcdVariableStoreSize));

   if (Initialize) {

     InitializeFtwState (SubPtr);

   }

diff --git a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf
index c015116e8c..60eb23207e 100644
--- a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf
+++ b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf
@@ -2,7 +2,7 @@
 #  Firmware Block Services to support emulating non-volatile variables

 #  by pretending that a memory buffer is storage for the NV variables.

 #

-#  Copyright (c) 2008 - 2009, Intel Corporation

+#  Copyright (c) 2008 - 2010, Intel Corporation

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -19,9 +19,6 @@
   FILE_GUID                      = 22dc2b60-fe40-42ac-b01f-3ab1fad9aad8

   MODULE_TYPE                    = DXE_RUNTIME_DRIVER

   VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

-  EFI_SPECIFICATION_VERSION      = 0x00020000

-

   ENTRY_POINT                    = FvbInitialize

 

 #

@@ -30,16 +27,14 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

 #

 

-[Sources.common]

+[Sources]

   Fvb.c

 

-

 [Packages]

   MdePkg/MdePkg.dec

   MdeModulePkg/MdeModulePkg.dec

   OvmfPkg/OvmfPkg.dec

 

-

 [LibraryClasses]

   BaseLib

   BaseMemoryLib

@@ -54,30 +49,25 @@
   UefiLib

   UefiRuntimeLib

 

-

 [Guids]

   gEfiEventVirtualAddressChangeGuid             # ALWAYS_CONSUMED  Create Event: EVENT_GROUP_GUID

 

-

 [Protocols]

   gEfiFirmwareVolumeBlockProtocolGuid           # PROTOCOL ALWAYS_PRODUCED

   gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_PRODUCED

 

-

 [FixedPcd]

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize

   gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize

 

-

 [Pcd]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase

   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved

 

-

 [Depex]

   TRUE