Sync the branch changes to trunk.

Increase the BiosID VERSION_MINOR  to 02.

Modified some PCDs as PcdsDynamicEx, and modified FSP support API.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Tim He <tim.he@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17035 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Tim He 2015-03-10 05:52:37 +00:00 committed by timhe
parent 8268a01d2c
commit 359497b7a0
8 changed files with 67 additions and 8 deletions

View File

@ -27,4 +27,4 @@ BUILD_TYPE = D
BOARD_ID = BLAKCRB BOARD_ID = BLAKCRB
VERSION_MAJOR = 0078 VERSION_MAJOR = 0078
VERSION_MINOR = 01 VERSION_MINOR = 02

View File

@ -27,4 +27,4 @@ BUILD_TYPE = R
BOARD_ID = BLAKCRB BOARD_ID = BLAKCRB
VERSION_MAJOR = 0078 VERSION_MAJOR = 0078
VERSION_MINOR = 01 VERSION_MINOR = 02

View File

@ -26,5 +26,5 @@ OEM_ID = X64
BUILD_TYPE = D BUILD_TYPE = D
VERSION_MAJOR = 0078 VERSION_MAJOR = 0078
VERSION_MINOR = 01 VERSION_MINOR = 02
BOARD_ID = BBAYCRB BOARD_ID = BBAYCRB

View File

@ -26,5 +26,5 @@ OEM_ID = X64
BUILD_TYPE = R BUILD_TYPE = R
VERSION_MAJOR = 0078 VERSION_MAJOR = 0078
VERSION_MINOR = 01 VERSION_MINOR = 02
BOARD_ID = BBAYCRB BOARD_ID = BBAYCRB

View File

@ -144,7 +144,7 @@ GetPeiMemSize (
**/ **/
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
FspHobProcess ( FspHobProcessForMemoryResource (
IN VOID *FspHobList IN VOID *FspHobList
) )
{ {
@ -375,9 +375,26 @@ FspHobProcess (
SmramHobDescriptorBlock->Descriptor[0].PhysicalSize = TsegSize; SmramHobDescriptorBlock->Descriptor[0].PhysicalSize = TsegSize;
SmramHobDescriptorBlock->Descriptor[0].RegionState = EFI_SMRAM_CLOSED; SmramHobDescriptorBlock->Descriptor[0].RegionState = EFI_SMRAM_CLOSED;
} }
// return EFI_SUCCESS;
// NV Storage Hob }
//
/**
BIOS process FspBobList for other data (not Memory Resource Descriptor).
@param[in] FspHobList Pointer to the HOB data structure produced by FSP.
@return If platform process the FSP hob list successfully.
**/
EFI_STATUS
EFIAPI
FspHobProcessForOtherData (
IN VOID *FspHobList
)
{
EFI_PEI_SERVICES **PeiServices;
PeiServices = (EFI_PEI_SERVICES **)GetPeiServicesTablePointer ();
// //
// Other hob for platform // Other hob for platform
// //
@ -385,3 +402,27 @@ FspHobProcess (
return EFI_SUCCESS; return EFI_SUCCESS;
} }
/**
BIOS process FspBobList.
@param[in] FspHobList Pointer to the HOB data structure produced by FSP.
@return If platform process the FSP hob list successfully.
**/
EFI_STATUS
EFIAPI
FspHobProcess (
IN VOID *FspHobList
)
{
EFI_STATUS Status;
Status = FspHobProcessForMemoryResource (FspHobList);
if (EFI_ERROR (Status)) {
return Status;
}
Status = FspHobProcessForOtherData (FspHobList);
return Status;
}

View File

@ -730,6 +730,12 @@
gEfiVLVTokenSpaceGuid.PcdFTPMResponse|0 gEfiVLVTokenSpaceGuid.PcdFTPMResponse|0
gEfiVLVTokenSpaceGuid.PcdFTPMNotRespond|FALSE gEfiVLVTokenSpaceGuid.PcdFTPMNotRespond|FALSE
gEfiVLVTokenSpaceGuid.PcdFTPMStatus|0 gEfiVLVTokenSpaceGuid.PcdFTPMStatus|0
gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateSmmDataPtr|0
gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0
gEfiCpuTokenSpaceGuid.PcdCpuS3DataAddress|0
gEfiCpuTokenSpaceGuid.PcdCpuHotPlugDataAddress|0
gEfiCpuTokenSpaceGuid.PcdCpuCallbackSignal|0
gEfiCpuTokenSpaceGuid.PcdCpuConfigContextBuffer|0
[Components.IA32] [Components.IA32]

View File

@ -730,6 +730,12 @@
gEfiVLVTokenSpaceGuid.PcdFTPMResponse|0 gEfiVLVTokenSpaceGuid.PcdFTPMResponse|0
gEfiVLVTokenSpaceGuid.PcdFTPMNotRespond|FALSE gEfiVLVTokenSpaceGuid.PcdFTPMNotRespond|FALSE
gEfiVLVTokenSpaceGuid.PcdFTPMStatus|0 gEfiVLVTokenSpaceGuid.PcdFTPMStatus|0
gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateSmmDataPtr|0
gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0
gEfiCpuTokenSpaceGuid.PcdCpuS3DataAddress|0
gEfiCpuTokenSpaceGuid.PcdCpuHotPlugDataAddress|0
gEfiCpuTokenSpaceGuid.PcdCpuCallbackSignal|0
gEfiCpuTokenSpaceGuid.PcdCpuConfigContextBuffer|0
[Components.IA32] [Components.IA32]

View File

@ -730,6 +730,12 @@
gEfiVLVTokenSpaceGuid.PcdFTPMResponse|0 gEfiVLVTokenSpaceGuid.PcdFTPMResponse|0
gEfiVLVTokenSpaceGuid.PcdFTPMNotRespond|FALSE gEfiVLVTokenSpaceGuid.PcdFTPMNotRespond|FALSE
gEfiVLVTokenSpaceGuid.PcdFTPMStatus|0 gEfiVLVTokenSpaceGuid.PcdFTPMStatus|0
gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateSmmDataPtr|0
gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0
gEfiCpuTokenSpaceGuid.PcdCpuS3DataAddress|0
gEfiCpuTokenSpaceGuid.PcdCpuHotPlugDataAddress|0
gEfiCpuTokenSpaceGuid.PcdCpuCallbackSignal|0
gEfiCpuTokenSpaceGuid.PcdCpuConfigContextBuffer|0
[Components.IA32] [Components.IA32]