Remove unnecessary use of FixedPcdxxx() functions and [FixedPcd] INF sections. These...

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

diff --git a/UnixPkg/FvbServicesRuntimeDxe/UnixFwh.inf b/UnixPkg/FvbServicesRuntimeDxe/UnixFwh.inf
index 0f3817f02885e3463c19eb24a3d35210ab9491d9..578c7b4d871332021806503ab74f6c95ac8fb47c 100644 (file)
--- a/UnixPkg/FvbServicesRuntimeDxe/UnixFwh.inf
+++ b/UnixPkg/FvbServicesRuntimeDxe/UnixFwh.inf
@@ -3,7 +3,7 @@
 #\r
 # This DXE runtime driver implements and produces the Fimware Volue Block Protocol on \r
 #  Unix emulator.\r
 #\r
 # This DXE runtime driver implements and produces the Fimware Volue Block Protocol on \r
 #  Unix emulator.\r

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

 #\r
 #  All rights reserved. This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  All rights reserved. This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -21,9 +21,6 @@
   FILE_GUID                      = f42fd042-8985-11db-a7db-0040d02b1835\r
   MODULE_TYPE                    = DXE_RUNTIME_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = f42fd042-8985-11db-a7db-0040d02b1835\r
   MODULE_TYPE                    = DXE_RUNTIME_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  EDK_RELEASE_VERSION            = 0x00020000\r
-  EFI_SPECIFICATION_VERSION      = 0x00020000\r
-\r

   ENTRY_POINT                    = FvbInitialize\r
 \r
 #\r
   ENTRY_POINT                    = FvbInitialize\r
 \r
 #\r


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

-[Sources.Ia32]\r
+[Sources]\r

   FvbInfo.c\r
   FWBlockService.c\r
 \r
   FvbInfo.c\r
   FWBlockService.c\r
 \r

-\r

 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
   UnixPkg/UnixPkg.dec\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
   UnixPkg/UnixPkg.dec\r
 \r

-\r

 [LibraryClasses]\r
   UefiBootServicesTableLib\r
   MemoryAllocationLib\r
 [LibraryClasses]\r
   UefiBootServicesTableLib\r
   MemoryAllocationLib\r


@@ -56,7 +51,6 @@
   UefiLib\r
   DevicePathLib\r
 \r
   UefiLib\r
   DevicePathLib\r
 \r

-\r

 [Guids]\r
   gEfiEventVirtualAddressChangeGuid             # ALWAYS_CONSUMED  Create Event: EVENT_GROUP_GUID\r
 \r
 [Guids]\r
   gEfiEventVirtualAddressChangeGuid             # ALWAYS_CONSUMED  Create Event: EVENT_GROUP_GUID\r
 \r


@@ -64,17 +58,15 @@
   gEfiFirmwareVolumeBlockProtocolGuid           # PROTOCOL ALWAYS_PRODUCED\r
   gEfiDevicePathProtocolGuid                    # PROTOCOL SOMETIMES_PRODUCED\r
 \r
   gEfiFirmwareVolumeBlockProtocolGuid           # PROTOCOL ALWAYS_PRODUCED\r
   gEfiDevicePathProtocolGuid                    # PROTOCOL SOMETIMES_PRODUCED\r
 \r

-\r
-[FixedPcd.common]\r
+[FixedPcd]\r

   gEfiUnixPkgTokenSpaceGuid.PcdUnixFirmwareFdSize\r
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFirmwareBlockSize\r
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFirmwareFdSize\r
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFirmwareBlockSize\r

-\r

   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashFvRecoveryBase\r
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashFvRecoverySize\r
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogBase\r
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogSize\r
 \r
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashFvRecoveryBase\r
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashFvRecoverySize\r
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogBase\r
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogSize\r
 \r

-[Pcd.common]\r
+[Pcd]\r

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize\r


@@ -82,7 +74,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase\r
 \r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase\r
 \r

-\r

 [Depex]\r
   TRUE\r
 \r
 [Depex]\r
   TRUE\r
 \r

diff --git a/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf b/UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
index 4ab071fb7a5c33e5b04c1b59b1afae3f7086758a..e17843107d92cedfe5acd1cac9935c6f968217c9 100644 (file)
--- 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\r
 #  MiscSubclassDriver.uni file, the StrGather tool will expand MiscSubclassDriver.uni file \r
 #  and parse all .uni file.\r
 #  All .uni file who tagged with "ToolCode="DUMMY"" in following file list is included by\r
 #  MiscSubclassDriver.uni file, the StrGather tool will expand MiscSubclassDriver.uni file \r
 #  and parse all .uni file.\r

-# Copyright (c) 2006 - 2009, Intel Corporation\r
+# Copyright (c) 2006 - 2010, Intel Corporation\r

 #\r
 #  All rights reserved. This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  All rights reserved. This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -23,9 +23,6 @@
   FILE_GUID                      = f2fbd108-8985-11db-b06a-0040d02b1835\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = f2fbd108-8985-11db-b06a-0040d02b1835\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  EDK_RELEASE_VERSION            = 0x00020000\r
-  EFI_SPECIFICATION_VERSION      = 0x00020000\r
-\r

   ENTRY_POINT                    = MiscSubclassDriverEntryPoint\r
 \r
 #\r
   ENTRY_POINT                    = MiscSubclassDriverEntryPoint\r
 \r
 #\r


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

-[Sources.common]\r
+[Sources]\r

   MiscBaseBoardManufacturer.uni\r
   MiscBaseBoardManufacturerData.c\r
   MiscBaseBoardManufacturerFunction.c\r
   MiscBaseBoardManufacturer.uni\r
   MiscBaseBoardManufacturerData.c\r
   MiscBaseBoardManufacturerFunction.c\r


@@ -91,18 +88,15 @@
   HiiLib\r
   DebugLib\r
   BaseLib\r
   HiiLib\r
   DebugLib\r
   BaseLib\r

-\r

   PcdLib\r
 \r
 [Protocols]\r
   gEfiUnixIoProtocolGuid                        # PROTOCOL_NOTIFY SOMETIMES_CONSUMED\r
   gEfiSmbiosProtocolGuid                        # PROTOCOL ALWAYS_CONSUMED\r
 \r
   PcdLib\r
 \r
 [Protocols]\r
   gEfiUnixIoProtocolGuid                        # PROTOCOL_NOTIFY SOMETIMES_CONSUMED\r
   gEfiSmbiosProtocolGuid                        # PROTOCOL ALWAYS_CONSUMED\r
 \r

-[FixedPcd.common]\r
+[Pcd]\r

   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareReleaseDateString\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareReleaseDateString\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString\r

-\r
-[Pcd.common]\r

   gEfiUnixPkgTokenSpaceGuid.PcdUnixMemorySize\r
   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang\r
 \r
   gEfiUnixPkgTokenSpaceGuid.PcdUnixMemorySize\r
   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang\r
 \r

diff --git a/UnixPkg/Sec/SecMain.c b/UnixPkg/Sec/SecMain.c
index da19a4b1343c8b47b3a30efe16339d572945013e..0e5597d267ffddb5b09ac251dfbd98c04f091d27 100644 (file)
--- 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
 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);
 
   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");
 
 
   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)
   //
   //
   // 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.
 
   //
   // 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                        = (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;
   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.
     //
     // 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;
   }
 
   return EFI_SUCCESS;

diff --git a/UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf b/UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf
index 126e8935ea16bd1831ba9065b2fd7649cf9b678f..ddc71953fce4eab6066c943ee20592276af84419 100644 (file)
--- a/UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf
+++ b/UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf
@@ -3,7 +3,7 @@
 #\r
 # This PEIM will produce the HOB to describe Firmware Volume, Firmware Devices\r
 #  on the NT32 emulator.\r
 #\r
 # This PEIM will produce the HOB to describe Firmware Volume, Firmware Devices\r
 #  on the NT32 emulator.\r

-# Copyright (c) 2006, Intel Corporation\r
+# Copyright (c) 2006 - 2010, Intel Corporation\r

 #\r
 #  All rights reserved. This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  All rights reserved. This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -21,9 +21,6 @@
   FILE_GUID                      = f40b7864-8985-11db-af21-0040d02b1835\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = f40b7864-8985-11db-af21-0040d02b1835\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r

-  EDK_RELEASE_VERSION            = 0x00020000\r
-  EFI_SPECIFICATION_VERSION      = 0x00020000\r
-\r

   ENTRY_POINT                    = PeimInitializeUnixFwh\r
 \r
 #\r
   ENTRY_POINT                    = PeimInitializeUnixFwh\r
 \r
 #\r


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

-[Sources.common]\r
+[Sources]\r

   UnixFwh.c\r
 \r
   UnixFwh.c\r
 \r

-\r

 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
   UnixPkg/UnixPkg.dec\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
   UnixPkg/UnixPkg.dec\r
 \r

-\r

 [LibraryClasses]\r
   PeiServicesTablePointerLib\r
   PeiServicesLib\r
 [LibraryClasses]\r
   PeiServicesTablePointerLib\r
   PeiServicesLib\r


@@ -49,20 +44,16 @@
   PeimEntryPoint\r
   DebugLib\r
 \r
   PeimEntryPoint\r
   DebugLib\r
 \r

-\r
-[FixedPcd.common]\r
+[Pcd]\r

   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogSize\r
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageVariableBase\r
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogSize\r
   gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageVariableBase\r

-\r

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize\r
 \r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize\r
 \r

-\r

 [Ppis]\r
   gUnixFwhPpiGuid                               # PPI ALWAYS_CONSUMED\r
 \r
 [Ppis]\r
   gUnixFwhPpiGuid                               # PPI ALWAYS_CONSUMED\r
 \r

-\r

 [Depex]\r
   gUnixFwhPpiGuid AND gEfiPeiMemoryDiscoveredPpiGuid\r
 \r
 [Depex]\r
   gUnixFwhPpiGuid AND gEfiPeiMemoryDiscoveredPpiGuid\r
 \r