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

5 files changed, 15 insertions, 32 deletions

diff --git a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
index ed17bdb41..683601488 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 c015116e8..60eb23207 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

 

diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
index a886a00d7..889ba5124 100644
--- a/OvmfPkg/PlatformPei/Platform.c
+++ b/OvmfPkg/PlatformPei/Platform.c
@@ -1,7 +1,7 @@
 /**@file

   Platform PEI driver

 

-  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

@@ -173,12 +173,12 @@ ReserveEmuVariableNvStore (
   VariableStore =

     (EFI_PHYSICAL_ADDRESS)(UINTN)

       AllocateRuntimePool (

-        2 * FixedPcdGet32(PcdFlashNvStorageFtwSpareSize)

+        2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)

         );

   DEBUG ((EFI_D_INFO,

           "Reserved variable store memory: 0x%lX; size: %dkb\n",

           VariableStore,

-          (2 * FixedPcdGet32(PcdFlashNvStorageFtwSpareSize)) / 1024

+          (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)) / 1024

         ));

   PcdSet64 (PcdEmuVariableNvStoreReserved, VariableStore);

 }

diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf
index 1ef3a368c..9d40837da 100644
--- a/OvmfPkg/PlatformPei/PlatformPei.inf
+++ b/OvmfPkg/PlatformPei/PlatformPei.inf
@@ -2,7 +2,7 @@
 #  Platform PEI driver

 #

 #  This module provides platform specific function to detect boot mode.

-#  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

@@ -20,9 +20,6 @@
   FILE_GUID                      = 222c386d-5abc-4fb4-b124-fbb82488acf4

   MODULE_TYPE                    = PEIM

   VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

-  EFI_SPECIFICATION_VERSION      = 0x00020000

-

   ENTRY_POINT                    = InitializePlatform

 

 #

@@ -31,7 +28,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

 #

 

-[Sources.common]

+[Sources]

   Cmos.c

   Fv.c

   MemDetect.c

@@ -53,14 +50,12 @@
   PeiServicesTablePointerLib

   PeimEntryPoint

 

-[FixedPcd.common]

+[Pcd]

   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvBase

   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize

   gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize

-

-[Pcd.common]

   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved

 

 [Depex]

diff --git a/OvmfPkg/Sec/SecMain.inf b/OvmfPkg/Sec/SecMain.inf
index 08e26d2ac..d60d005f9 100644
--- a/OvmfPkg/Sec/SecMain.inf
+++ b/OvmfPkg/Sec/SecMain.inf
@@ -1,7 +1,7 @@
 #/** @file

 #  SEC Driver

 #

-#  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,8 +19,6 @@
   FILE_GUID                      = df1ccef6-f301-4a63-9661-fc6030dcc880

   MODULE_TYPE                    = SEC

   VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

-  EFI_SPECIFICATION_VERSION      = 0x00020000

   ENTRY_POINT                    = SecMain

 

 #

@@ -59,7 +57,7 @@
 [Ppis]

   gEfiTemporaryRamSupportPpiGuid                # PPI ALWAYS_PRODUCED

 

-[FixedPcd.common]

+[Pcd]

   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvBase

   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize