From fa673e3638798c1fab18cf5e3cc4c3036fdb13e7 Mon Sep 17 00:00:00 2001 From: zwei4 Date: Fri, 29 Sep 2017 17:19:00 +0800 Subject: VBT table change Move VBT tables from common folder into board specific folders. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: zwei4 Cc: Loeppert, Anthony --- .../BensonGlacier/BoardInitPostMem/BoardInit.c | 7 ++ .../BoardInitPostMem/BoardInitPostMem.inf | 2 + .../Board/BensonGlacier/Vbt/VbtBxtEdp.bin | Bin 0 -> 5632 bytes .../Board/BensonGlacier/Vbt/VbtBxtMipi.bin | Bin 0 -> 5632 bytes .../Board/LeafHill/BoardInitPostMem/BoardInit.c | 7 ++ .../LeafHill/BoardInitPostMem/BoardInitPostMem.inf | 2 + .../Board/LeafHill/Vbt/VbtBxtEdp.bin | Bin 0 -> 5632 bytes .../Board/LeafHill/Vbt/VbtBxtMipi.bin | Bin 0 -> 5632 bytes .../MinnowBoard3/BoardInitPostMem/BoardInit.c | 7 ++ .../BoardInitPostMem/BoardInitPostMem.inf | 2 + .../Board/MinnowBoard3/Vbt/VbtBxtEdp.bin | Bin 0 -> 5632 bytes .../Board/MinnowBoard3/Vbt/VbtBxtMipi.bin | Bin 0 -> 5632 bytes .../Common/Binaries/Vbt/VbtBxtEdp.bin | Bin 5632 -> 0 bytes .../Common/Binaries/Vbt/VbtBxtMipi.bin | Bin 5632 -> 0 bytes .../PlatformGopPolicyDxe/PlatformGopPolicy.c | 88 +++++---------------- .../PlatformGopPolicyDxe/PlatformGopPolicyDxe.inf | 4 +- .../PeiFspPolicyInitLib/PeiFspPolicyInitLib.inf | 6 +- .../PeiFspPolicyInitLib/PeiFspSaPolicyInitLib.c | 4 +- Platform/BroxtonPlatformPkg/PlatformPkg.dec | 7 +- Platform/BroxtonPlatformPkg/PlatformPkg.fdf | 22 ++++-- 20 files changed, 72 insertions(+), 86 deletions(-) create mode 100644 Platform/BroxtonPlatformPkg/Board/BensonGlacier/Vbt/VbtBxtEdp.bin create mode 100644 Platform/BroxtonPlatformPkg/Board/BensonGlacier/Vbt/VbtBxtMipi.bin create mode 100644 Platform/BroxtonPlatformPkg/Board/LeafHill/Vbt/VbtBxtEdp.bin create mode 100644 Platform/BroxtonPlatformPkg/Board/LeafHill/Vbt/VbtBxtMipi.bin create mode 100644 Platform/BroxtonPlatformPkg/Board/MinnowBoard3/Vbt/VbtBxtEdp.bin create mode 100644 Platform/BroxtonPlatformPkg/Board/MinnowBoard3/Vbt/VbtBxtMipi.bin delete mode 100644 Platform/BroxtonPlatformPkg/Common/Binaries/Vbt/VbtBxtEdp.bin delete mode 100644 Platform/BroxtonPlatformPkg/Common/Binaries/Vbt/VbtBxtMipi.bin diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.c index a4f3414b49..8b21b50a7e 100644 --- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.c +++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInit.c @@ -49,6 +49,7 @@ BensonGlacierPostMemInitCallback ( UINT8 BoardId; UINT8 FabId; UINT8 ResetType; + UINTN BufferSize; Status = PeiServicesLocatePpi ( &gBoardPostMemInitDoneGuid, @@ -82,6 +83,12 @@ BensonGlacierPostMemInitCallback ( ResetType = V_RST_CNT_HARDRESET; PcdSet8 (PcdResetType, (UINT8) ResetType); + // + // Board specific VBT table. + // + BufferSize = sizeof (EFI_GUID); + PcdSetPtr(PcdBoardVbtFileGuid, &BufferSize, (UINT8 *)&gPeiBensonGlacierVbtGuid); + // // Add init steps here // diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitPostMem.inf b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitPostMem.inf index 4ce6ab2dbc..c22bfadb51 100644 --- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitPostMem.inf +++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPostMem/BoardInitPostMem.inf @@ -62,6 +62,7 @@ gPlatformModuleTokenSpaceGuid.PcdBoardId gPlatformModuleTokenSpaceGuid.PcdFabId gPlatformModuleTokenSpaceGuid.PcdResetType + gPlatformModuleTokenSpaceGuid.PcdBoardVbtFileGuid [Guids] gEfiPlatformInfoGuid @@ -73,6 +74,7 @@ gEfiTpmDeviceInstanceTpm12Guid gEfiTpmDeviceInstanceTpm20DtpmGuid gTpmDeviceInstanceTpm20PttPtpGuid + gPeiBensonGlacierVbtGuid [Ppis] gBoardPostMemInitStartGuid diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/Vbt/VbtBxtEdp.bin b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/Vbt/VbtBxtEdp.bin new file mode 100644 index 0000000000..7b4e32699b Binary files /dev/null and b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/Vbt/VbtBxtEdp.bin differ diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/Vbt/VbtBxtMipi.bin b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/Vbt/VbtBxtMipi.bin new file mode 100644 index 0000000000..23b52baea1 Binary files /dev/null and b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/Vbt/VbtBxtMipi.bin differ diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.c index e591b1d1f0..60fe1a31a0 100644 --- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.c +++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInit.c @@ -57,6 +57,7 @@ LeafHillPostMemInitCallback ( UINT8 BoardId; UINT8 FabId; UINT8 ResetType; + UINTN BufferSize; Status = PeiServicesLocatePpi ( &gBoardPostMemInitDoneGuid, @@ -90,6 +91,12 @@ LeafHillPostMemInitCallback ( ResetType = V_RST_CNT_FULLRESET; PcdSet8 (PcdResetType, (UINT8) ResetType); + // + // Board specific VBT table. + // + BufferSize = sizeof (EFI_GUID); + PcdSetPtr(PcdBoardVbtFileGuid, &BufferSize, (UINT8 *)&gPeiLeafHillVbtGuid); + // // Add init steps here // diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInitPostMem.inf b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInitPostMem.inf index 01931b8c6c..0717bc3dc9 100644 --- a/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInitPostMem.inf +++ b/Platform/BroxtonPlatformPkg/Board/LeafHill/BoardInitPostMem/BoardInitPostMem.inf @@ -60,6 +60,7 @@ gPlatformModuleTokenSpaceGuid.PcdBoardId gPlatformModuleTokenSpaceGuid.PcdFabId gPlatformModuleTokenSpaceGuid.PcdResetType + gPlatformModuleTokenSpaceGuid.PcdBoardVbtFileGuid [Guids] gEfiPlatformInfoGuid @@ -71,6 +72,7 @@ gEfiTpmDeviceInstanceTpm12Guid gEfiTpmDeviceInstanceTpm20DtpmGuid gTpmDeviceInstanceTpm20PttPtpGuid + gPeiLeafHillVbtGuid [Ppis] gBoardPostMemInitStartGuid diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/Vbt/VbtBxtEdp.bin b/Platform/BroxtonPlatformPkg/Board/LeafHill/Vbt/VbtBxtEdp.bin new file mode 100644 index 0000000000..7b4e32699b Binary files /dev/null and b/Platform/BroxtonPlatformPkg/Board/LeafHill/Vbt/VbtBxtEdp.bin differ diff --git a/Platform/BroxtonPlatformPkg/Board/LeafHill/Vbt/VbtBxtMipi.bin b/Platform/BroxtonPlatformPkg/Board/LeafHill/Vbt/VbtBxtMipi.bin new file mode 100644 index 0000000000..23b52baea1 Binary files /dev/null and b/Platform/BroxtonPlatformPkg/Board/LeafHill/Vbt/VbtBxtMipi.bin differ diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c index ef14216d88..ca79940ea2 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInit.c @@ -57,6 +57,7 @@ MinnowBoard3PostMemInitCallback ( UINT8 BoardId; UINT8 FabId; UINT8 ResetType; + UINTN BufferSize; Status = PeiServicesLocatePpi ( &gBoardPostMemInitDoneGuid, @@ -90,6 +91,12 @@ MinnowBoard3PostMemInitCallback ( ResetType = V_RST_CNT_FULLRESET; PcdSet8 (PcdResetType, (UINT8) ResetType); + // + // Board specific VBT table. + // + BufferSize = sizeof (EFI_GUID); + PcdSetPtr(PcdBoardVbtFileGuid, &BufferSize, (UINT8 *)&gPeiMinnowBoard3VbtGuid); + // // Add init steps here // diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf index f066703e1f..90494bae46 100644 --- a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf +++ b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/BoardInitPostMem/BoardInitPostMem.inf @@ -58,6 +58,7 @@ gPlatformModuleTokenSpaceGuid.PcdBoardId gPlatformModuleTokenSpaceGuid.PcdFabId gPlatformModuleTokenSpaceGuid.PcdResetType + gPlatformModuleTokenSpaceGuid.PcdBoardVbtFileGuid [Guids] gEfiPlatformInfoGuid @@ -69,6 +70,7 @@ gEfiTpmDeviceInstanceTpm12Guid gEfiTpmDeviceInstanceTpm20DtpmGuid gTpmDeviceInstanceTpm20PttPtpGuid + gPeiMinnowBoard3VbtGuid [Ppis] gBoardPostMemInitStartGuid diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/Vbt/VbtBxtEdp.bin b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/Vbt/VbtBxtEdp.bin new file mode 100644 index 0000000000..7b4e32699b Binary files /dev/null and b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/Vbt/VbtBxtEdp.bin differ diff --git a/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/Vbt/VbtBxtMipi.bin b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/Vbt/VbtBxtMipi.bin new file mode 100644 index 0000000000..23b52baea1 Binary files /dev/null and b/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/Vbt/VbtBxtMipi.bin differ diff --git a/Platform/BroxtonPlatformPkg/Common/Binaries/Vbt/VbtBxtEdp.bin b/Platform/BroxtonPlatformPkg/Common/Binaries/Vbt/VbtBxtEdp.bin deleted file mode 100644 index 7b4e32699b..0000000000 Binary files a/Platform/BroxtonPlatformPkg/Common/Binaries/Vbt/VbtBxtEdp.bin and /dev/null differ diff --git a/Platform/BroxtonPlatformPkg/Common/Binaries/Vbt/VbtBxtMipi.bin b/Platform/BroxtonPlatformPkg/Common/Binaries/Vbt/VbtBxtMipi.bin deleted file mode 100644 index 23b52baea1..0000000000 Binary files a/Platform/BroxtonPlatformPkg/Common/Binaries/Vbt/VbtBxtMipi.bin and /dev/null differ diff --git a/Platform/BroxtonPlatformPkg/Common/Console/PlatformGopPolicyDxe/PlatformGopPolicy.c b/Platform/BroxtonPlatformPkg/Common/Console/PlatformGopPolicyDxe/PlatformGopPolicy.c index 8f3bc44287..71ab6b575c 100644 --- a/Platform/BroxtonPlatformPkg/Common/Console/PlatformGopPolicyDxe/PlatformGopPolicy.c +++ b/Platform/BroxtonPlatformPkg/Common/Console/PlatformGopPolicyDxe/PlatformGopPolicy.c @@ -27,12 +27,6 @@ extern EFI_BOOT_SERVICES *gBS; PLATFORM_GOP_POLICY_PROTOCOL mPlatformGOPPolicy; -extern EFI_GUID gPeiDefaultVbtGuid; -extern EFI_GUID gVbtMipiAuoGuid; -extern EFI_GUID gVbtMipiSharpGuid; -extern EFI_GUID gVbtMipiJdiGuid; -extern EFI_GUID gVbtEdpTypeCGuid; - // // Function implementations // @@ -79,71 +73,27 @@ GetVbtData ( OUT UINT32 *VbtSize ) { - SYSTEM_CONFIGURATION SystemConfiguration; - UINTN VarSize; - EFI_STATUS Status; - EFI_GUID BmpImageGuid = { 0xE08CA6D5, 0x8D02, 0x43ae, {0xAB, 0xB1, 0x95, 0x2C, 0xC7, 0x87, 0xC9, 0x33} }; - UINTN FvProtocolCount; - EFI_HANDLE *FvHandles; - EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv; - UINTN Index; - UINT32 AuthenticationStatus; - UINT8 *Buffer; - UINTN VbtBufferSize; - - if (VbtAddress == NULL || VbtSize == NULL){ - return EFI_INVALID_PARAMETER; - } - VarSize = sizeof (SYSTEM_CONFIGURATION); - Status = gRT->GetVariable ( - L"Setup", - &gEfiSetupVariableGuid, - NULL, - &VarSize, - &SystemConfiguration - ); - ASSERT_EFI_ERROR (Status); - - BmpImageGuid = gPeiDefaultVbtGuid; - - Fv = NULL; - Buffer = 0; - FvHandles = NULL; - Status = gBS->LocateHandleBuffer( - ByProtocol, - &gEfiFirmwareVolume2ProtocolGuid, - NULL, - &FvProtocolCount, - &FvHandles - ); - if (!EFI_ERROR (Status)) { - for (Index = 0; Index < FvProtocolCount; Index++) { - Status = gBS->HandleProtocol( - FvHandles[Index], - &gEfiFirmwareVolume2ProtocolGuid, - (VOID **) &Fv - ); - VbtBufferSize = 0; - Status = Fv->ReadSection ( - Fv, - &BmpImageGuid, - EFI_SECTION_RAW, - 0, - (VOID **)&Buffer, - &VbtBufferSize, - &AuthenticationStatus - ); - if (!EFI_ERROR (Status)) { - *VbtAddress = (EFI_PHYSICAL_ADDRESS) Buffer; - *VbtSize = (UINT32) VbtBufferSize; + VBT_INFO *VbtInfo = NULL; + EFI_PEI_HOB_POINTERS GuidHob; + EFI_STATUS Status; + + // + // Get VBT data from HOB, which has been created in PEI phase. + // + Status = EFI_NOT_FOUND; + DEBUG ((DEBUG_ERROR, "GOP Policy Protocol GetVbtData from HOB\n")); + + GuidHob.Raw = GetHobList (); + if (GuidHob.Raw != NULL) { + if ((GuidHob.Raw = GetNextGuidHob (&gVbtInfoGuid, GuidHob.Raw)) != NULL) { + VbtInfo = GET_GUID_HOB_DATA (GuidHob.Guid); + *VbtAddress = VbtInfo->VbtAddress; + *VbtSize = VbtInfo->VbtSize; Status = EFI_SUCCESS; - break; - } - } - } else { - Status = EFI_NOT_FOUND; - } + DEBUG ((DEBUG_ERROR, "Found VBT.\n")); + } + } return Status; } diff --git a/Platform/BroxtonPlatformPkg/Common/Console/PlatformGopPolicyDxe/PlatformGopPolicyDxe.inf b/Platform/BroxtonPlatformPkg/Common/Console/PlatformGopPolicyDxe/PlatformGopPolicyDxe.inf index ae7fd1c2ae..3f61a0928c 100644 --- a/Platform/BroxtonPlatformPkg/Common/Console/PlatformGopPolicyDxe/PlatformGopPolicyDxe.inf +++ b/Platform/BroxtonPlatformPkg/Common/Console/PlatformGopPolicyDxe/PlatformGopPolicyDxe.inf @@ -47,7 +47,6 @@ [Guids] gEfiSetupVariableGuid gVbtInfoGuid - gPeiDefaultVbtGuid gVbtMipiAuoGuid gVbtMipiSharpGuid gVbtMipiJdiGuid @@ -59,7 +58,8 @@ gEfiFirmwareVolume2ProtocolGuid gPlatformGOPPolicyGuid -[Pcd] +[Pcd.common] + gPlatformModuleTokenSpaceGuid.PcdBoardVbtFileGuid [Depex] gEfiCpuIo2ProtocolGuid AND diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.inf b/Platform/BroxtonPlatformPkg/Common/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.inf index b4099b2ea1..f0e6bf710c 100644 --- a/Platform/BroxtonPlatformPkg/Common/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.inf +++ b/Platform/BroxtonPlatformPkg/Common/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.inf @@ -76,11 +76,6 @@ [Guids] gEfiSetupVariableGuid - gPeiDefaultVbtGuid - gVbtMipiAuoGuid - gVbtMipiSharpGuid - gVbtMipiJdiGuid - gVbtEdpTypeCGuid gEfiPlatformInfoGuid gPeiLogoGuid @@ -89,6 +84,7 @@ gEfiBxtTokenSpaceGuid.PcdP2SBBaseAddress gEfiBxtTokenSpaceGuid.PcdPmcGcrBaseAddress gPlatformModuleTokenSpaceGuid.PcdResetType + gPlatformModuleTokenSpaceGuid.PcdBoardVbtFileGuid [Ppis] gSiPolicyPpiGuid ## CONSUMES diff --git a/Platform/BroxtonPlatformPkg/Common/Library/PeiFspPolicyInitLib/PeiFspSaPolicyInitLib.c b/Platform/BroxtonPlatformPkg/Common/Library/PeiFspPolicyInitLib/PeiFspSaPolicyInitLib.c index 1dc31a08ca..c76f433332 100644 --- a/Platform/BroxtonPlatformPkg/Common/Library/PeiFspPolicyInitLib/PeiFspSaPolicyInitLib.c +++ b/Platform/BroxtonPlatformPkg/Common/Library/PeiFspPolicyInitLib/PeiFspSaPolicyInitLib.c @@ -233,9 +233,9 @@ PeiFspSaPolicyInit ( } // - // Update VbtGuid based on VbtSelect opion from setup + // Update VbtGuid. // - PeiVbtGuid = gPeiDefaultVbtGuid; + CopyMem (&PeiVbtGuid, PcdGetPtr (PcdBoardVbtFileGuid), sizeof (EFI_GUID)); // // Update UPD:LogoPtr diff --git a/Platform/BroxtonPlatformPkg/PlatformPkg.dec b/Platform/BroxtonPlatformPkg/PlatformPkg.dec index 208f2a5348..4813145d0d 100644 --- a/Platform/BroxtonPlatformPkg/PlatformPkg.dec +++ b/Platform/BroxtonPlatformPkg/PlatformPkg.dec @@ -58,7 +58,9 @@ gVbtMipiSharpGuid = { 0xC7DCFF6F, 0x6F2A, 0x4DC1, { 0x91, 0xC6, 0xDF, 0x0B, 0xAF, 0xDB, 0xDA, 0x46 } } gVbtMipiJdiGuid = { 0xB850A139, 0xBABB, 0x4D91, { 0x9F, 0x27, 0x72, 0xD2, 0xEF, 0x01, 0xBF, 0x3A } } gVbtEdpTypeCGuid = { 0x21E70404, 0xDF72, 0x4122, { 0xB0, 0x30, 0x28, 0x13, 0x06, 0xEB, 0x7B, 0xE3 } } - gPeiDefaultVbtGuid = { 0xE08CA6D5, 0x8D02, 0x43ae, { 0xAB, 0xB1, 0x95, 0x2C, 0xC7, 0x87, 0xC9, 0x33 } } + gPeiLeafHillVbtGuid = { 0x6ae80680, 0x5e3f, 0x4e63, { 0xa5, 0xf5, 0x78, 0xe5, 0x21, 0x4f, 0x13, 0xfe } } + gPeiMinnowBoard3VbtGuid = { 0xE08CA6D5, 0x8D02, 0x43ae, { 0xAB, 0xB1, 0x95, 0x2C, 0xC7, 0x87, 0xC9, 0x33 } } + gPeiBensonGlacierVbtGuid = { 0xbfde308e, 0x2d5a, 0x4ca7, { 0xaa, 0x76, 0x19, 0x93, 0x8a, 0xaa, 0xe4, 0xda } } gPeiLogoGuid = { 0x7BB28B99, 0x61BB, 0x11d5, { 0x9A, 0x5D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D } } gPlatformEmmcHs400TuningInfoGuid = { 0xb0ae3e81, 0xc6b0, 0x4d35, { 0xad, 0x51, 0x91, 0x17, 0xe0, 0x65, 0x1e, 0xa3 } } gEfiTraceHubDebugLibIa32Guid = { 0x23a3e7ba, 0x75d1, 0x4cb9, { 0x9c, 0x8f, 0x56, 0xfa, 0x4e, 0x48, 0xd9, 0x9e } } @@ -179,7 +181,8 @@ gPlatformModuleTokenSpaceGuid.PcdDramCreatePolicyDefaultsFunc|0|UINT64|0x80000011 gPlatformModuleTokenSpaceGuid.PcdGetBoardNameFunc|0|UINT64|0x80000012 gPlatformModuleTokenSpaceGuid.PcdResetType|0x0E|UINT8|0x80000013 - + gPlatformModuleTokenSpaceGuid.PcdBoardVbtFileGuid|{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }|VOID*|0x80000014 + ## MemoryCheck value for checking memory before boot OS. ## To save the boot performance, the default MemoryCheck is set to 0. gClientCommonModuleTokenSpaceGuid.PcdPlatformMemoryCheck|0|UINT8|0x40000005 diff --git a/Platform/BroxtonPlatformPkg/PlatformPkg.fdf b/Platform/BroxtonPlatformPkg/PlatformPkg.fdf index c975a4c2a6..1c1eb475f0 100644 --- a/Platform/BroxtonPlatformPkg/PlatformPkg.fdf +++ b/Platform/BroxtonPlatformPkg/PlatformPkg.fdf @@ -242,13 +242,27 @@ INF $(PLATFORM_PACKAGE_COMMON)/SampleCode/IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf INF $(PLATFORM_PACKAGE_COMMON)/PlatformSettings/PlatformPostMemPei/PlatformPostMemPei.inf + !if $(PEI_DISPLAY_ENABLE) == TRUE FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D { SECTION RAW = $(PLATFORM_PACKAGE_COMMON)/Binaries/Logo/Logo.bmp } - + + # VBT For Leaf Hill (File Guid is gPeiLeafHillVbtGuid) + FILE FREEFORM = 6AE80680-5E3F-4E63-A5F5-78E5214F13FE { + SECTION RAW = $(PLATFORM_NAME)/Board/LeafHill/Vbt/VbtBxtMipi.bin + SECTION UI = "IntelGopVbt1" + } + + # VBT For Minnowboard 3 (File Guid is gPeiMinnowBoard3VbtGuid) FILE FREEFORM = E08CA6D5-8D02-43ae-ABB1-952CC787C933 { - SECTION RAW = $(PLATFORM_PACKAGE_COMMON)/Binaries/Vbt/VbtBxtMipi.bin + SECTION RAW = $(PLATFORM_NAME)/Board/MinnowBoard3/Vbt/VbtBxtMipi.bin + SECTION UI = "IntelGopVbt1" + } + + # VBT For Benson Glacier (File Guid is gPeiBensonGlacierVbtGuid) + FILE FREEFORM = BFDE308E-2D5A-4CA7-AA76-19938AAAE4DA { + SECTION RAW = $(PLATFORM_NAME)/Board/BensonGlacier/Vbt/VbtBxtMipi.bin SECTION UI = "IntelGopVbt1" } !endif @@ -561,10 +575,6 @@ APRIORI DXE { !if $(GOP_DRIVER_ENABLE) == TRUE INF $(PLATFORM_PACKAGE_COMMON)/Console/PlatformGopPolicyDxe/PlatformGopPolicyDxe.inf - FILE FREEFORM = E08CA6D5-8D02-43ae-ABB1-952CC787C933 { - SECTION RAW = $(PLATFORM_PACKAGE_COMMON)/Binaries/Vbt/VbtBxtMipi.bin - SECTION UI = "IntelGopVbt1" - } !endif INF $(PLATFORM_PACKAGE_COMMON)/Console/GraphicsOutputDxe/GraphicsOutputDxe.inf -- cgit v1.2.3