diff options
| author | Jiewen Yao <jiewen.yao@intel.com> | 2017-06-28 12:33:46 +0800 |
|---|---|---|
| committer | Jiewen Yao <jiewen.yao@intel.com> | 2017-06-28 15:48:10 +0800 |
| commit | be33539d9953574822b1fcefd30445f6e6e45002 (patch) | |
| tree | 17eefea7e9c167da6463338753f78b19de02e79d | |
| parent | 0879f44765a8a39011b70ec95b654acff04c5767 (diff) | |
| download | edk2-platforms-be33539d9953574822b1fcefd30445f6e6e45002.tar.xz | |
reorg vbt solution.
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiewen Yao <jiewen.yao@intel.com>
6 files changed, 12 insertions, 5 deletions
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyUpdateLib/PeiFspPolicyUpdateLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyUpdateLib/PeiFspPolicyUpdateLib.inf index 77ab84d051..a1e461525e 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyUpdateLib/PeiFspPolicyUpdateLib.inf +++ b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyUpdateLib/PeiFspPolicyUpdateLib.inf @@ -136,9 +136,10 @@ gBoardModuleTokenSpaceGuid.PcdAudioConnector
+ gBoardModuleTokenSpaceGuid.PcdGraphicsVbtGuid
+
[Guids]
gFspNonVolatileStorageHobGuid ## CONSUMES
- gIntelPeiGraphicsVbtGuid ## CONSUMES
gTianoLogoGuid ## CONSUMES
gEfiMemoryOverwriteControlDataGuid
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyUpdateLib/PeiSaPolicyUpdate.c b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyUpdateLib/PeiSaPolicyUpdate.c index af7a81617a..fd54c63a92 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyUpdateLib/PeiSaPolicyUpdate.c +++ b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyUpdateLib/PeiSaPolicyUpdate.c @@ -49,7 +49,7 @@ PeiFspSaPolicyUpdate ( Size = 0;
Buffer = NULL;
- PeiGetSectionFromAnyFv (&gIntelPeiGraphicsVbtGuid, EFI_SECTION_RAW, 0, &Buffer, &Size);
+ PeiGetSectionFromAnyFv (PcdGetPtr (PcdGraphicsVbtGuid), EFI_SECTION_RAW, 0, &Buffer, &Size);
if (Buffer == NULL) {
DEBUG((DEBUG_WARN, "Could not locate VBT\n"));
} else {
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyUpdateLib/PeiSaPolicyUpdate.h b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyUpdateLib/PeiSaPolicyUpdate.h index 3c5f6e30b0..da6f746772 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyUpdateLib/PeiSaPolicyUpdate.h +++ b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyUpdateLib/PeiSaPolicyUpdate.h @@ -30,7 +30,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <FspmUpd.h>
#include <FspsUpd.h>
-extern EFI_GUID gIntelPeiGraphicsVbtGuid;
extern EFI_GUID gTianoLogoGuid;
#endif
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec b/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec index 273a408ceb..280632269c 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec +++ b/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec @@ -32,6 +32,8 @@ KabylakeRvp3\Include gBoardModuleTokenSpaceGuid = {0x72d1fff7, 0xa42a, 0x4219, {0xb9, 0x95, 0x5a, 0x67, 0x53, 0x6e, 0xa4, 0x2a}}
+gTianoLogoGuid = {0x7BB28B99, 0x61BB, 0x11D5, {0x9A, 0x5D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D}}
+
[Protocols]
[Ppis]
@@ -250,6 +252,9 @@ gBoardModuleTokenSpaceGuid.PcdPs2KbMsEnable|1|UINT8|0x40000009 gBoardModuleTokenSpaceGuid.PcdAcpiGnvsAddress|0|UINT64|0x40000013
+ # gIntelPeiGraphicsVbtGuid = {0x4ad46122, 0xffeb, 0x4a52, {0xbf, 0xb0, 0x51, 0x8c, 0xfc, 0xa0, 0x2d, 0xb0}}
+ gBoardModuleTokenSpaceGuid.PcdGraphicsVbtGuid|{0x22, 0x61, 0xd4, 0x4a, 0xeb, 0xff, 0x52, 0x4a, 0xbf, 0xb0, 0x51, 0x8c, 0xfc, 0xa0, 0x2d, 0xb0}|VOID*|0x40000014
+
[PcdsDynamicEx]
[PcdsDynamic, PcdsDynamicEx]
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Policy/PolicyInitDxe/GopPolicyInitDxe.c b/Platform/Intel/KabylakeOpenBoardPkg/Policy/PolicyInitDxe/GopPolicyInitDxe.c index cc56cfed33..ff7cb3660b 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/Policy/PolicyInitDxe/GopPolicyInitDxe.c +++ b/Platform/Intel/KabylakeOpenBoardPkg/Policy/PolicyInitDxe/GopPolicyInitDxe.c @@ -103,7 +103,7 @@ GetVbtData ( VbtBufferSize = 0;
Status = Fv->ReadSection (
Fv,
- &gIntelPeiGraphicsVbtGuid,
+ PcdGetPtr (PcdGraphicsVbtGuid),
EFI_SECTION_RAW,
0,
(VOID **) &Buffer,
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Policy/PolicyInitDxe/PolicyInitDxe.inf b/Platform/Intel/KabylakeOpenBoardPkg/Policy/PolicyInitDxe/PolicyInitDxe.inf index 652c5d614c..5f9ed1ee82 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/Policy/PolicyInitDxe/PolicyInitDxe.inf +++ b/Platform/Intel/KabylakeOpenBoardPkg/Policy/PolicyInitDxe/PolicyInitDxe.inf @@ -64,9 +64,11 @@ gGopPolicyProtocolGuid ## PRODUCES
[Guids]
- gIntelPeiGraphicsVbtGuid ## CONSUMES
gMiscDxeConfigGuid
+[Pcd]
+ gBoardModuleTokenSpaceGuid.PcdGraphicsVbtGuid
+
[Depex]
gEfiVariableArchProtocolGuid
|