diff options
| author | Tim He <tim.he@intel.com> | 2015-03-10 05:52:37 +0000 |
|---|---|---|
| committer | timhe <timhe@Edk2> | 2015-03-10 05:52:37 +0000 |
| commit | 359497b7a06b0453cc4f401af0a4669b8d10a907 (patch) | |
| tree | cd0d05ee73857e2af43753e92bf15def4abcb91f /Vlv2TbltDevicePkg | |
| parent | 8268a01d2ca41cddbcccac9a4559d37e782eedc2 (diff) | |
| download | edk2-platforms-359497b7a06b0453cc4f401af0a4669b8d10a907.tar.xz | |
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
Diffstat (limited to 'Vlv2TbltDevicePkg')
| -rw-r--r-- | Vlv2TbltDevicePkg/BiosIdD.env | 2 | ||||
| -rw-r--r-- | Vlv2TbltDevicePkg/BiosIdR.env | 2 | ||||
| -rw-r--r-- | Vlv2TbltDevicePkg/BiosIdx64D.env | 2 | ||||
| -rw-r--r-- | Vlv2TbltDevicePkg/BiosIdx64R.env | 2 | ||||
| -rw-r--r-- | Vlv2TbltDevicePkg/FspSupport/Library/PeiFspHobProcessLibVlv2/FspHobProcessLibVlv2.c | 49 | ||||
| -rw-r--r-- | Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 6 | ||||
| -rw-r--r-- | Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 6 | ||||
| -rw-r--r-- | Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 6 |
8 files changed, 67 insertions, 8 deletions
diff --git a/Vlv2TbltDevicePkg/BiosIdD.env b/Vlv2TbltDevicePkg/BiosIdD.env index 4842c2f72a..693ff43921 100644 --- a/Vlv2TbltDevicePkg/BiosIdD.env +++ b/Vlv2TbltDevicePkg/BiosIdD.env @@ -27,4 +27,4 @@ BUILD_TYPE = D BOARD_ID = BLAKCRB
VERSION_MAJOR = 0078
-VERSION_MINOR = 01
+VERSION_MINOR = 02
diff --git a/Vlv2TbltDevicePkg/BiosIdR.env b/Vlv2TbltDevicePkg/BiosIdR.env index f352f5c5eb..d8d8d8cf7a 100644 --- a/Vlv2TbltDevicePkg/BiosIdR.env +++ b/Vlv2TbltDevicePkg/BiosIdR.env @@ -27,4 +27,4 @@ BUILD_TYPE = R BOARD_ID = BLAKCRB
VERSION_MAJOR = 0078
-VERSION_MINOR = 01
+VERSION_MINOR = 02
diff --git a/Vlv2TbltDevicePkg/BiosIdx64D.env b/Vlv2TbltDevicePkg/BiosIdx64D.env index 0c098566bd..368ed72f0e 100644 --- a/Vlv2TbltDevicePkg/BiosIdx64D.env +++ b/Vlv2TbltDevicePkg/BiosIdx64D.env @@ -26,5 +26,5 @@ OEM_ID = X64 BUILD_TYPE = D
VERSION_MAJOR = 0078
-VERSION_MINOR = 01
+VERSION_MINOR = 02
BOARD_ID = BBAYCRB
diff --git a/Vlv2TbltDevicePkg/BiosIdx64R.env b/Vlv2TbltDevicePkg/BiosIdx64R.env index 7df34cf17a..0dc4f38d1e 100644 --- a/Vlv2TbltDevicePkg/BiosIdx64R.env +++ b/Vlv2TbltDevicePkg/BiosIdx64R.env @@ -26,5 +26,5 @@ OEM_ID = X64 BUILD_TYPE = R
VERSION_MAJOR = 0078
-VERSION_MINOR = 01
+VERSION_MINOR = 02
BOARD_ID = BBAYCRB
diff --git a/Vlv2TbltDevicePkg/FspSupport/Library/PeiFspHobProcessLibVlv2/FspHobProcessLibVlv2.c b/Vlv2TbltDevicePkg/FspSupport/Library/PeiFspHobProcessLibVlv2/FspHobProcessLibVlv2.c index 944255349c..f0b68cd7b2 100644 --- a/Vlv2TbltDevicePkg/FspSupport/Library/PeiFspHobProcessLibVlv2/FspHobProcessLibVlv2.c +++ b/Vlv2TbltDevicePkg/FspSupport/Library/PeiFspHobProcessLibVlv2/FspHobProcessLibVlv2.c @@ -144,7 +144,7 @@ GetPeiMemSize ( **/
EFI_STATUS
EFIAPI
-FspHobProcess (
+FspHobProcessForMemoryResource (
IN VOID *FspHobList
)
{
@@ -375,9 +375,26 @@ FspHobProcess ( SmramHobDescriptorBlock->Descriptor[0].PhysicalSize = TsegSize;
SmramHobDescriptorBlock->Descriptor[0].RegionState = EFI_SMRAM_CLOSED;
}
- //
- // NV Storage Hob
- //
+ return EFI_SUCCESS;
+}
+
+/**
+ 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
//
@@ -385,3 +402,27 @@ FspHobProcess ( 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;
+}
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index 35fce05167..95fdc1a537 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -730,6 +730,12 @@ gEfiVLVTokenSpaceGuid.PcdFTPMResponse|0 gEfiVLVTokenSpaceGuid.PcdFTPMNotRespond|FALSE gEfiVLVTokenSpaceGuid.PcdFTPMStatus|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateSmmDataPtr|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0 + gEfiCpuTokenSpaceGuid.PcdCpuS3DataAddress|0 + gEfiCpuTokenSpaceGuid.PcdCpuHotPlugDataAddress|0 + gEfiCpuTokenSpaceGuid.PcdCpuCallbackSignal|0 + gEfiCpuTokenSpaceGuid.PcdCpuConfigContextBuffer|0 [Components.IA32] diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index ced2007b65..d7a5e6ba7b 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -730,6 +730,12 @@ gEfiVLVTokenSpaceGuid.PcdFTPMResponse|0 gEfiVLVTokenSpaceGuid.PcdFTPMNotRespond|FALSE gEfiVLVTokenSpaceGuid.PcdFTPMStatus|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateSmmDataPtr|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0 + gEfiCpuTokenSpaceGuid.PcdCpuS3DataAddress|0 + gEfiCpuTokenSpaceGuid.PcdCpuHotPlugDataAddress|0 + gEfiCpuTokenSpaceGuid.PcdCpuCallbackSignal|0 + gEfiCpuTokenSpaceGuid.PcdCpuConfigContextBuffer|0 [Components.IA32] diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index 225e0bbbb0..66370def9e 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -730,6 +730,12 @@ gEfiVLVTokenSpaceGuid.PcdFTPMResponse|0 gEfiVLVTokenSpaceGuid.PcdFTPMNotRespond|FALSE gEfiVLVTokenSpaceGuid.PcdFTPMStatus|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateSmmDataPtr|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0 + gEfiCpuTokenSpaceGuid.PcdCpuS3DataAddress|0 + gEfiCpuTokenSpaceGuid.PcdCpuHotPlugDataAddress|0 + gEfiCpuTokenSpaceGuid.PcdCpuCallbackSignal|0 + gEfiCpuTokenSpaceGuid.PcdCpuConfigContextBuffer|0 [Components.IA32] |