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, 6 insertions, 11 deletions

diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
index a886a00d75..889ba51240 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 1ef3a368cb..9d40837da7 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]