Update INF file to properly declare which PCDs must be Fixed, and update PCD usage that does not require the FixedPcdGetxx() access method.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9732 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
mdkinney 2010-01-14 01:59:30 +00:00
parent 1427885873
commit f4391d63e0
3 changed files with 13 additions and 11 deletions

View File

@ -1,7 +1,7 @@
/** @file /** @file
EFI PEI Core dispatch services EFI PEI Core dispatch services
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
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -417,7 +417,7 @@ PeiDispatcher (
REPORT_STATUS_CODE_WITH_EXTENDED_DATA ( REPORT_STATUS_CODE_WITH_EXTENDED_DATA (
EFI_PROGRESS_CODE, EFI_PROGRESS_CODE,
FixedPcdGet32(PcdStatusCodeValuePeimDispatch), PcdGet32(PcdStatusCodeValuePeimDispatch),
(VOID *)(&ExtendedData), (VOID *)(&ExtendedData),
sizeof (ExtendedData) sizeof (ExtendedData)
); );
@ -442,7 +442,7 @@ PeiDispatcher (
REPORT_STATUS_CODE_WITH_EXTENDED_DATA ( REPORT_STATUS_CODE_WITH_EXTENDED_DATA (
EFI_PROGRESS_CODE, EFI_PROGRESS_CODE,
FixedPcdGet32(PcdStatusCodeValuePeimDispatch), PcdGet32(PcdStatusCodeValuePeimDispatch),
(VOID *)(&ExtendedData), (VOID *)(&ExtendedData),
sizeof (ExtendedData) sizeof (ExtendedData)
); );
@ -478,10 +478,10 @@ PeiDispatcher (
// //
OldPeiStackSize = (UINT64) SecCoreData->StackSize; OldPeiStackSize = (UINT64) SecCoreData->StackSize;
NewPeiStackSize = (RShiftU64 (Private->PhysicalMemoryLength, 1) + EFI_PAGE_MASK) & ~EFI_PAGE_MASK; NewPeiStackSize = (RShiftU64 (Private->PhysicalMemoryLength, 1) + EFI_PAGE_MASK) & ~EFI_PAGE_MASK;
if (FixedPcdGet32(PcdPeiCoreMaxPeiStackSize) > (UINT32) NewPeiStackSize) { if (PcdGet32(PcdPeiCoreMaxPeiStackSize) > (UINT32) NewPeiStackSize) {
Private->StackSize = NewPeiStackSize; Private->StackSize = NewPeiStackSize;
} else { } else {
Private->StackSize = FixedPcdGet32(PcdPeiCoreMaxPeiStackSize); Private->StackSize = PcdGet32(PcdPeiCoreMaxPeiStackSize);
} }
// //

View File

@ -84,13 +84,15 @@
gEfiPeiSecurity2PpiGuid ## NOTIFY gEfiPeiSecurity2PpiGuid ## NOTIFY
gEfiTemporaryRamSupportPpiGuid ## CONSUMES gEfiTemporaryRamSupportPpiGuid ## CONSUMES
[Pcd] [FixedPcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported ## CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeimPerFv ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeimPerFv ## CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPpiSupported ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPpiSupported ## CONSUMES
gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValuePeimDispatch ## CONSUMES
gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValuePeiCoreEntry ## CONSUMES [Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeiStackSize ## CONSUMES gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValuePeimDispatch ## CONSUMES
gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValuePeiCoreEntry ## CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeiStackSize ## CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst ## CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport ## CONSUMES

View File

@ -1,7 +1,7 @@
/** @file /** @file
Pei Core Main Entry Point Pei Core Main Entry Point
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
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -184,7 +184,7 @@ PeiCore (
// //
REPORT_STATUS_CODE ( REPORT_STATUS_CODE (
EFI_PROGRESS_CODE, EFI_PROGRESS_CODE,
FixedPcdGet32 (PcdStatusCodeValuePeiCoreEntry) PcdGet32 (PcdStatusCodeValuePeiCoreEntry)
); );
PERF_START (NULL, "SEC", NULL, 1); PERF_START (NULL, "SEC", NULL, 1);