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@9866 6f19259b-4bc3-4df7-8a09-765794883524

4 files changed, 16 insertions, 40 deletions

diff --git a/UnixPkg/FvbServicesRuntimeDxe/UnixFwh.inf b/UnixPkg/FvbServicesRuntimeDxe/UnixFwh.inf
index 0f3817f028..578c7b4d87 100644
--- a/UnixPkg/FvbServicesRuntimeDxe/UnixFwh.inf
+++ b/UnixPkg/FvbServicesRuntimeDxe/UnixFwh.inf
@@ -3,7 +3,7 @@
 #

 # This DXE runtime driver implements and produces the Fimware Volue Block Protocol on 

 #  Unix emulator.

-# Copyright (c) 2008, 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

@@ -21,9 +21,6 @@
   FILE_GUID                      = f42fd042-8985-11db-a7db-0040d02b1835

   MODULE_TYPE                    = DXE_RUNTIME_DRIVER

   VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

-  EFI_SPECIFICATION_VERSION      = 0x00020000

-

   ENTRY_POINT                    = FvbInitialize

 

 #

@@ -32,17 +29,15 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

 #

 

-[Sources.Ia32]

+[Sources]

   FvbInfo.c

   FWBlockService.c

 

-

 [Packages]

   MdePkg/MdePkg.dec

   MdeModulePkg/MdeModulePkg.dec

   UnixPkg/UnixPkg.dec

 

-

 [LibraryClasses]

   UefiBootServicesTableLib

   MemoryAllocationLib

@@ -56,7 +51,6 @@
   UefiLib

   DevicePathLib

 

-

 [Guids]

   gEfiEventVirtualAddressChangeGuid             # ALWAYS_CONSUMED  Create Event: EVENT_GROUP_GUID

 

@@ -64,17 +58,15 @@
   gEfiFirmwareVolumeBlockProtocolGuid           # PROTOCOL ALWAYS_PRODUCED

   gEfiDevicePathProtocolGuid                    # PROTOCOL SOMETIMES_PRODUCED

 

-

-[FixedPcd.common]

+[FixedPcd]

   gEfiUnixPkgTokenSpaceGuid.PcdUnixFirmwareFdSize

   gEfiUnixPkgTokenSpaceGuid.PcdUnixFirmwareBlockSize

-

   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashFvRecoveryBase

   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashFvRecoverySize

   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogBase

   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogSize

 

-[Pcd.common]

+[Pcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize

@@ -82,7 +74,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase

 

-

 [Depex]

   TRUE

 

diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf b/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
index 4ab071fb7a..e17843107d 100644
--- a/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
+++ b/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
@@ -5,7 +5,7 @@
 #  All .uni file who tagged with "ToolCode="DUMMY"" in following file list is included by

 #  MiscSubclassDriver.uni file, the StrGather tool will expand MiscSubclassDriver.uni file 

 #  and parse all .uni file.

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

@@ -23,9 +23,6 @@
   FILE_GUID                      = f2fbd108-8985-11db-b06a-0040d02b1835

   MODULE_TYPE                    = DXE_DRIVER

   VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

-  EFI_SPECIFICATION_VERSION      = 0x00020000

-

   ENTRY_POINT                    = MiscSubclassDriverEntryPoint

 

 #

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

 #

 

-[Sources.common]

+[Sources]

   MiscBaseBoardManufacturer.uni

   MiscBaseBoardManufacturerData.c

   MiscBaseBoardManufacturerFunction.c

@@ -91,18 +88,15 @@
   HiiLib

   DebugLib

   BaseLib

-

   PcdLib

 

 [Protocols]

   gEfiUnixIoProtocolGuid                        # PROTOCOL_NOTIFY SOMETIMES_CONSUMED

   gEfiSmbiosProtocolGuid                        # PROTOCOL ALWAYS_CONSUMED

 

-[FixedPcd.common]

+[Pcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareReleaseDateString

   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString

-

-[Pcd.common]

   gEfiUnixPkgTokenSpaceGuid.PcdUnixMemorySize

   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang

 

diff --git a/UnixPkg/Sec/SecMain.c b/UnixPkg/Sec/SecMain.c
index da19a4b134..0e5597d267 100644
--- a/UnixPkg/Sec/SecMain.c
+++ b/UnixPkg/Sec/SecMain.c
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2006 - 2009 Intel Corporation.
+Copyright (c) 2006 - 2010, Intel Corporation.
 Portions copyright (c) 2008-2009 Apple Inc.
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
@@ -188,8 +188,8 @@ Returns:
   setbuf(stdout, 0);
   setbuf(stderr, 0);
 
-  MemorySizeStr      = (CHAR16 *) FixedPcdGetPtr (PcdUnixMemorySizeForSecMain);
-  FirmwareVolumesStr = (CHAR16 *) FixedPcdGetPtr (PcdUnixFirmwareVolume);
+  MemorySizeStr      = (CHAR16 *) PcdGetPtr (PcdUnixMemorySizeForSecMain);
+  FirmwareVolumesStr = (CHAR16 *) PcdGetPtr (PcdUnixFirmwareVolume);
 
   printf ("\nEDK SEC Main UNIX Emulation Environment from www.TianoCore.org\n");
 
@@ -227,7 +227,7 @@ Returns:
   //
   // Setup Boot Mode. If BootModeStr == "" then BootMode = 0 (BOOT_WITH_FULL_CONFIGURATION)
   //
-  printf ("  BootMode 0x%02x\n", (unsigned int)FixedPcdGet32 (PcdUnixBootMode));
+  printf ("  BootMode 0x%02x\n", (unsigned int)PcdGet32 (PcdUnixBootMode));
 
   //
   // Open up a 128K file to emulate temp memory for PEI.
@@ -621,7 +621,7 @@ Returns:
   SecCoreData                        = (EFI_SEC_PEI_HAND_OFF*)(UINTN) TopOfStack;
   SecCoreData->DataSize               = sizeof(EFI_SEC_PEI_HAND_OFF);
   SecCoreData->BootFirmwareVolumeBase = (VOID*)BootFirmwareVolumeBase;
-  SecCoreData->BootFirmwareVolumeSize = FixedPcdGet32(PcdUnixFirmwareFdSize);
+  SecCoreData->BootFirmwareVolumeSize = PcdGet32 (PcdUnixFirmwareFdSize);
   SecCoreData->TemporaryRamBase       = (VOID*)(UINTN)LargestRegion; 
   SecCoreData->TemporaryRamSize       = STACK_SIZE;
   SecCoreData->StackBase              = SecCoreData->TemporaryRamBase;
@@ -868,7 +868,7 @@ Returns:
     // If the memory buffer could not be allocated at the FD build address
     // the Fixup is the difference.
     //
-    *FixUp = *FdBase - FixedPcdGet32 (PcdUnixFdBaseAddress);
+    *FixUp = *FdBase - PcdGet32 (PcdUnixFdBaseAddress);
   }
 
   return EFI_SUCCESS;
diff --git a/UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf b/UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf
index 126e8935ea..ddc71953fc 100644
--- a/UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf
+++ b/UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf
@@ -3,7 +3,7 @@
 #

 # This PEIM will produce the HOB to describe Firmware Volume, Firmware Devices

 #  on the NT32 emulator.

-# Copyright (c) 2006, 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

@@ -21,9 +21,6 @@
   FILE_GUID                      = f40b7864-8985-11db-af21-0040d02b1835

   MODULE_TYPE                    = PEIM

   VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

-  EFI_SPECIFICATION_VERSION      = 0x00020000

-

   ENTRY_POINT                    = PeimInitializeUnixFwh

 

 #

@@ -32,16 +29,14 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

 #

 

-[Sources.common]

+[Sources]

   UnixFwh.c

 

-

 [Packages]

   MdePkg/MdePkg.dec

   MdeModulePkg/MdeModulePkg.dec

   UnixPkg/UnixPkg.dec

 

-

 [LibraryClasses]

   PeiServicesTablePointerLib

   PeiServicesLib

@@ -49,20 +44,16 @@
   PeimEntryPoint

   DebugLib

 

-

-[FixedPcd.common]

+[Pcd]

   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogSize

   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageVariableBase

-

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize

 

-

 [Ppis]

   gUnixFwhPpiGuid                               # PPI ALWAYS_CONSUMED

 

-

 [Depex]

   gUnixFwhPpiGuid AND gEfiPeiMemoryDiscoveredPpiGuid