(1) Fixed the issue that the VBT passed to OS is not the right VBT file. All 
boards are affected.
(2) For UP2, disable Onboard LSPCON for HDMI 2.0 in VBT.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: David Wei <david....@intel.com>
CC: Mike Wu  <mike...@intel.com>
CC: Mang Guo <mang....@intel.com>
---
 Platform/BroxtonPlatformPkg/Board/UP2/Vbt/Vbt.bin     | Bin 5632 -> 5632 bytes
 .../PlatformPostMemPei/PlatformInit.c                 |   5 +++--
 .../PlatformPostMemPei/PlatformPostMemPei.inf         |   1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Platform/BroxtonPlatformPkg/Board/UP2/Vbt/Vbt.bin 
b/Platform/BroxtonPlatformPkg/Board/UP2/Vbt/Vbt.bin
index 
0d94dac62a8e410c4f456b52f4de37a50a6655e6..e9b20fe9f7082511c467160a94d0bc00b842c052
 100644
GIT binary patch
delta 25
hcmZqBY0#M<#e9gtU~(X%@J55xjEn-C?=Y%}003j{2UY+8

delta 25
hcmZqBY0#M<#k`NfU~(X%@J55xjEo|i?=Y%}003jX2UY+8

diff --git 
a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformInit.c
 
b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformInit.c
index 17c09ecf6f..acaaebbfbb 100644
--- 
a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformInit.c
+++ 
b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformInit.c
@@ -271,7 +271,7 @@ BXTPolicyInit (
   VOID*                           Buffer;
   UINT32                          Size;
   EFI_GUID                        PeiLogoGuid        = { 0x7BB28B99, 0x61BB, 
0x11D5, {0x9A, 0x5D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D} };
-  EFI_GUID                        TianmaVbtGuid      = { 0xE08CA6D5, 0x8D02, 
0x43ae, {0xAB, 0xB1, 0x95, 0x2C, 0xC7, 0x87, 0xC9, 0x33} };
+  EFI_GUID                        VbtGuid;
   VBT_INFO                        VbtInfo;
 
 
@@ -286,7 +286,8 @@ BXTPolicyInit (
   //
   // May need a different VBT depending on PanelSel
   //
-  PeiGetSectionFromFv (TianmaVbtGuid, &Buffer, &Size);
+  CopyMem (&VbtGuid, PcdGetPtr (PcdBoardVbtFileGuid), sizeof (EFI_GUID));
+  PeiGetSectionFromFv (VbtGuid, &Buffer, &Size);
 
   if (Buffer == NULL) {
     DEBUG (( DEBUG_ERROR, "Could not locate VBT"));
diff --git 
a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformPostMemPei.inf
 
b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformPostMemPei.inf
index 2fb7fb6a6f..35e6e1c4a0 100644
--- 
a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformPostMemPei.inf
+++ 
b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformPostMemPei.inf
@@ -121,6 +121,7 @@
   gPlatformModuleTokenSpaceGuid.PcdVibratorFeature
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid       ## CONSUMES
   gPlatformModuleTokenSpaceGuid.PcdBoardPostMemInitFunc
+  gPlatformModuleTokenSpaceGuid.PcdBoardVbtFileGuid
 
 [Depex]
   gDramPolicyPpiGuid
-- 
2.14.1.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Reply via email to