tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
mdkinney 2010-01-29 23:33:08 +00:00
parent f7c58a94cf
commit cdccd99e24
4 changed files with 16 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
UnixPkg/FvbServicesRuntimeDxe/UnixFwh.inf
View File

@ -3,7 +3,7 @@
# #
# This DXE runtime driver implements and produces the Fimware Volue Block Protocol on # This DXE runtime driver implements and produces the Fimware Volue Block Protocol on
# Unix emulator. # Unix emulator.
# Copyright (c) 2008, Intel Corporation # Copyright (c) 2008 - 2010, Intel Corporation
# #
# All rights reserved. This program and the accompanying materials # All rights reserved. This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # 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 FILE_GUID = f42fd042-8985-11db-a7db-0040d02b1835
MODULE_TYPE = DXE_RUNTIME_DRIVER MODULE_TYPE = DXE_RUNTIME_DRIVER
VERSION_STRING = 1.0 VERSION_STRING = 1.0
EDK_RELEASE_VERSION = 0x00020000
EFI_SPECIFICATION_VERSION = 0x00020000
ENTRY_POINT = FvbInitialize ENTRY_POINT = FvbInitialize
# #
@ -32,17 +29,15 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC # VALID_ARCHITECTURES = IA32 X64 IPF EBC
# #
[Sources.Ia32] [Sources]
FvbInfo.c FvbInfo.c
FWBlockService.c FWBlockService.c
[Packages] [Packages]
MdePkg/MdePkg.dec MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec MdeModulePkg/MdeModulePkg.dec
UnixPkg/UnixPkg.dec UnixPkg/UnixPkg.dec
[LibraryClasses] [LibraryClasses]
UefiBootServicesTableLib UefiBootServicesTableLib
MemoryAllocationLib MemoryAllocationLib
@ -56,7 +51,6 @@
UefiLib UefiLib
DevicePathLib DevicePathLib
[Guids] [Guids]
gEfiEventVirtualAddressChangeGuid # ALWAYS_CONSUMED Create Event: EVENT_GROUP_GUID gEfiEventVirtualAddressChangeGuid # ALWAYS_CONSUMED Create Event: EVENT_GROUP_GUID
@ -64,17 +58,15 @@
gEfiFirmwareVolumeBlockProtocolGuid # PROTOCOL ALWAYS_PRODUCED gEfiFirmwareVolumeBlockProtocolGuid # PROTOCOL ALWAYS_PRODUCED
gEfiDevicePathProtocolGuid # PROTOCOL SOMETIMES_PRODUCED gEfiDevicePathProtocolGuid # PROTOCOL SOMETIMES_PRODUCED
[FixedPcd]
[FixedPcd.common]
gEfiUnixPkgTokenSpaceGuid.PcdUnixFirmwareFdSize gEfiUnixPkgTokenSpaceGuid.PcdUnixFirmwareFdSize
gEfiUnixPkgTokenSpaceGuid.PcdUnixFirmwareBlockSize gEfiUnixPkgTokenSpaceGuid.PcdUnixFirmwareBlockSize
gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashFvRecoveryBase gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashFvRecoveryBase
gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashFvRecoverySize gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashFvRecoverySize
gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogBase gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogBase
gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogSize gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogSize
[Pcd.common] [Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
@ -82,7 +74,6 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase
[Depex] [Depex]
TRUE TRUE

12
UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
View File

@ -5,7 +5,7 @@
# All .uni file who tagged with "ToolCode="DUMMY"" in following file list is included by # 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 # MiscSubclassDriver.uni file, the StrGather tool will expand MiscSubclassDriver.uni file
# and parse all .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 # All rights reserved. This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # 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 FILE_GUID = f2fbd108-8985-11db-b06a-0040d02b1835
MODULE_TYPE = DXE_DRIVER MODULE_TYPE = DXE_DRIVER
VERSION_STRING = 1.0 VERSION_STRING = 1.0
EDK_RELEASE_VERSION = 0x00020000
EFI_SPECIFICATION_VERSION = 0x00020000
ENTRY_POINT = MiscSubclassDriverEntryPoint ENTRY_POINT = MiscSubclassDriverEntryPoint
# #
@ -34,7 +31,7 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC # VALID_ARCHITECTURES = IA32 X64 IPF EBC
# #
[Sources.common] [Sources]
MiscBaseBoardManufacturer.uni MiscBaseBoardManufacturer.uni
MiscBaseBoardManufacturerData.c MiscBaseBoardManufacturerData.c
MiscBaseBoardManufacturerFunction.c MiscBaseBoardManufacturerFunction.c
@ -91,18 +88,15 @@
HiiLib HiiLib
DebugLib DebugLib
BaseLib BaseLib
PcdLib PcdLib
[Protocols] [Protocols]
gEfiUnixIoProtocolGuid # PROTOCOL_NOTIFY SOMETIMES_CONSUMED gEfiUnixIoProtocolGuid # PROTOCOL_NOTIFY SOMETIMES_CONSUMED
gEfiSmbiosProtocolGuid # PROTOCOL ALWAYS_CONSUMED gEfiSmbiosProtocolGuid # PROTOCOL ALWAYS_CONSUMED
[FixedPcd.common] [Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareReleaseDateString gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareReleaseDateString
gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString
[Pcd.common]
gEfiUnixPkgTokenSpaceGuid.PcdUnixMemorySize gEfiUnixPkgTokenSpaceGuid.PcdUnixMemorySize
gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang

12
UnixPkg/Sec/SecMain.c
View File

@ -1,6 +1,6 @@
/*++ /*++
Copyright (c) 2006 - 2009 Intel Corporation. Copyright (c) 2006 - 2010, Intel Corporation.
Portions copyright (c) 2008-2009 Apple Inc. Portions copyright (c) 2008-2009 Apple Inc.
All rights reserved. This program and the accompanying materials All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
@ -188,8 +188,8 @@ Returns:
setbuf(stdout, 0); setbuf(stdout, 0);
setbuf(stderr, 0); setbuf(stderr, 0);
MemorySizeStr = (CHAR16 *) FixedPcdGetPtr (PcdUnixMemorySizeForSecMain); MemorySizeStr = (CHAR16 *) PcdGetPtr (PcdUnixMemorySizeForSecMain);
FirmwareVolumesStr = (CHAR16 *) FixedPcdGetPtr (PcdUnixFirmwareVolume); 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 = (EFI_SEC_PEI_HAND_OFF*)(UINTN) TopOfStack;
SecCoreData->DataSize = sizeof(EFI_SEC_PEI_HAND_OFF); SecCoreData->DataSize = sizeof(EFI_SEC_PEI_HAND_OFF);
SecCoreData->BootFirmwareVolumeBase = (VOID*)BootFirmwareVolumeBase; SecCoreData->BootFirmwareVolumeBase = (VOID*)BootFirmwareVolumeBase;
SecCoreData->BootFirmwareVolumeSize = FixedPcdGet32(PcdUnixFirmwareFdSize); SecCoreData->BootFirmwareVolumeSize = PcdGet32 (PcdUnixFirmwareFdSize);
SecCoreData->TemporaryRamBase = (VOID*)(UINTN)LargestRegion; SecCoreData->TemporaryRamBase = (VOID*)(UINTN)LargestRegion;
SecCoreData->TemporaryRamSize = STACK_SIZE; SecCoreData->TemporaryRamSize = STACK_SIZE;
SecCoreData->StackBase = SecCoreData->TemporaryRamBase; SecCoreData->StackBase = SecCoreData->TemporaryRamBase;
@ -868,7 +868,7 @@ Returns:
// If the memory buffer could not be allocated at the FD build address // If the memory buffer could not be allocated at the FD build address
// the Fixup is the difference. // the Fixup is the difference.
// //
*FixUp = *FdBase - FixedPcdGet32 (PcdUnixFdBaseAddress); *FixUp = *FdBase - PcdGet32 (PcdUnixFdBaseAddress);
} }
return EFI_SUCCESS; return EFI_SUCCESS;

15
UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf
View File

@ -3,7 +3,7 @@
# #
# This PEIM will produce the HOB to describe Firmware Volume, Firmware Devices # This PEIM will produce the HOB to describe Firmware Volume, Firmware Devices
# on the NT32 emulator. # on the NT32 emulator.
# Copyright (c) 2006, Intel Corporation # Copyright (c) 2006 - 2010, Intel Corporation
# #
# All rights reserved. This program and the accompanying materials # All rights reserved. This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # 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 FILE_GUID = f40b7864-8985-11db-af21-0040d02b1835
MODULE_TYPE = PEIM MODULE_TYPE = PEIM
VERSION_STRING = 1.0 VERSION_STRING = 1.0
EDK_RELEASE_VERSION = 0x00020000
EFI_SPECIFICATION_VERSION = 0x00020000
ENTRY_POINT = PeimInitializeUnixFwh ENTRY_POINT = PeimInitializeUnixFwh
# #
@ -32,16 +29,14 @@
# VALID_ARCHITECTURES = IA32 X64 IPF EBC # VALID_ARCHITECTURES = IA32 X64 IPF EBC
# #
[Sources.common] [Sources]
UnixFwh.c UnixFwh.c
[Packages] [Packages]
MdePkg/MdePkg.dec MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec MdeModulePkg/MdeModulePkg.dec
UnixPkg/UnixPkg.dec UnixPkg/UnixPkg.dec
[LibraryClasses] [LibraryClasses]
PeiServicesTablePointerLib PeiServicesTablePointerLib
PeiServicesLib PeiServicesLib
@ -49,20 +44,16 @@
PeimEntryPoint PeimEntryPoint
DebugLib DebugLib
[Pcd]
[FixedPcd.common]
gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogSize gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageEventLogSize
gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageVariableBase gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashNvStorageVariableBase
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
[Ppis] [Ppis]
gUnixFwhPpiGuid # PPI ALWAYS_CONSUMED gUnixFwhPpiGuid # PPI ALWAYS_CONSUMED
[Depex] [Depex]
gUnixFwhPpiGuid AND gEfiPeiMemoryDiscoveredPpiGuid gUnixFwhPpiGuid AND gEfiPeiMemoryDiscoveredPpiGuid