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

Add dual FSP binaries support. 

There are two FSP images at different locations in a flash (one factory version is read only and other in updatable version)
TempRamInit, FspMemoryInit and TempRamExit are executed from factory version and FspSiliconInit/NotifyPhase will be executed from updatable version.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: "Ma, Maurice" <maurice.ma@intel.com>
Reviewed-by: "Yao, Jiewen" <Jiewen.Yao@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17249 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Ma, Maurice 2015-04-29 03:50:20 +00:00 committed by jyao1
parent 3b17b24587
commit 5c7c41f81d
5 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IntelFspWrapperPkg/FspInitPei/FspInitPei.inf
View File

@ -81,6 +81,7 @@
[Pcd] [Pcd]
gFspWrapperTokenSpaceGuid.PcdPeiTemporaryRamStackSize ## CONSUMES gFspWrapperTokenSpaceGuid.PcdPeiTemporaryRamStackSize ## CONSUMES
gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase ## CONSUMES gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase ## CONSUMES
gFspWrapperTokenSpaceGuid.PcdFlashFvSecondFspBase ## CONSUMES
gFspWrapperTokenSpaceGuid.PcdFlashFvFspSize ## CONSUMES gFspWrapperTokenSpaceGuid.PcdFlashFvFspSize ## CONSUMES
gFspWrapperTokenSpaceGuid.PcdMaxUpdRegionSize ## CONSUMES gFspWrapperTokenSpaceGuid.PcdMaxUpdRegionSize ## CONSUMES
gFspWrapperTokenSpaceGuid.PcdFspApiVersion ## CONSUMES gFspWrapperTokenSpaceGuid.PcdFspApiVersion ## CONSUMES

6
IntelFspWrapperPkg/FspInitPei/FspInitPeiV2.c
View File

@ -261,7 +261,11 @@ PeiMemoryDiscoveredNotify (
VOID *FspHobList; VOID *FspHobList;
EFI_HOB_GUID_TYPE *GuidHob; EFI_HOB_GUID_TYPE *GuidHob;
FspHeader = FspFindFspHeader (PcdGet32 (PcdFlashFvFspBase)); if (PcdGet32 (PcdFlashFvSecondFspBase) == 0) {
FspHeader = FspFindFspHeader (PcdGet32 (PcdFlashFvFspBase));
} else {
FspHeader = FspFindFspHeader (PcdGet32 (PcdFlashFvSecondFspBase));
}
if (FspHeader == NULL) { if (FspHeader == NULL) {
return EFI_DEVICE_ERROR; return EFI_DEVICE_ERROR;
} }

6
IntelFspWrapperPkg/FspNotifyDxe/FspNotifyDxe.c
View File

@ -120,7 +120,11 @@ FspDxeEntryPoint (
VOID *Registration; VOID *Registration;
EFI_EVENT ProtocolNotifyEvent; EFI_EVENT ProtocolNotifyEvent;
mFspHeader = FspFindFspHeader (PcdGet32 (PcdFlashFvFspBase)); if (PcdGet32 (PcdFlashFvSecondFspBase) == 0) {
mFspHeader = FspFindFspHeader (PcdGet32 (PcdFlashFvFspBase));
} else {
mFspHeader = FspFindFspHeader (PcdGet32 (PcdFlashFvSecondFspBase));
}
DEBUG ((DEBUG_INFO, "FspHeader - 0x%x\n", mFspHeader)); DEBUG ((DEBUG_INFO, "FspHeader - 0x%x\n", mFspHeader));
if (mFspHeader == NULL) { if (mFspHeader == NULL) {
return EFI_DEVICE_ERROR; return EFI_DEVICE_ERROR;

1
IntelFspWrapperPkg/FspNotifyDxe/FspNotifyDxe.inf
View File

@ -49,6 +49,7 @@
[Pcd] [Pcd]
gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase ## CONSUMES gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase ## CONSUMES
gFspWrapperTokenSpaceGuid.PcdFlashFvSecondFspBase ## CONSUMES
gFspWrapperTokenSpaceGuid.PcdFlashFvFspSize ## CONSUMES gFspWrapperTokenSpaceGuid.PcdFlashFvFspSize ## CONSUMES
[Depex] [Depex]

16
IntelFspWrapperPkg/IntelFspWrapperPkg.dec
View File

@ -59,10 +59,22 @@
## Provides the size of the BIOS Flash Device. ## Provides the size of the BIOS Flash Device.
gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00200000|UINT32|0x10000002 gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00200000|UINT32|0x10000002
## Indicates the base address of the FSP binary. ## Indicates the base address of the factory FSP binary.
gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFF80000|UINT32|0x10000003 gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFF80000|UINT32|0x10000003
## Provides the size of the FSP binary. ## Indicates the base address of the updatable FSP binary to support Dual FSP.
# There could be two FSP images at different locations in a flash -
# one factory version (default) and updatable version (updatable).
# TempRamInit, FspMemoryInit and TempRamExit are always executed from factory version.
# FspSiliconInit and NotifyPhase can be executed from updatable version if it is available,
# FspSiliconInit and NotifyPhase are executed from factory version if there is no updateable version,
# PcdFlashFvFspBase is base address of factory FSP, and PcdFlashFvSecondFspBase
# is base address of updatable FSP. If PcdFlashFvSecondFspBase is 0, that means
# there is no updatable FSP.
gFspWrapperTokenSpaceGuid.PcdFlashFvSecondFspBase|0x00000000|UINT32|0x10000008
## Provides the size of the factory FSP binary.
gFspWrapperTokenSpaceGuid.PcdFlashFvFspSize|0x00048000|UINT32|0x10000004 gFspWrapperTokenSpaceGuid.PcdFlashFvFspSize|0x00048000|UINT32|0x10000004
## Provides the size of the updatable FSP binary to support Dual FSP.
gFspWrapperTokenSpaceGuid.PcdFlashFvSecondFspSize|0x00000000|UINT32|0x10000009
## Indicates the base address of the first Microcode Patch in the Microcode Region ## Indicates the base address of the first Microcode Patch in the Microcode Region
gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0x0|UINT64|0x10000005 gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0x0|UINT64|0x10000005