Reviewed-by: Chasel Chiu <chasel.c...@intel.com>
> -----Original Message----- > From: Kubacki, Michael A <michael.a.kuba...@intel.com> > Sent: Thursday, November 28, 2019 10:19 AM > To: devel@edk2.groups.io > Cc: Chiu, Chasel <chasel.c...@intel.com>; Desimone, Nathaniel L > <nathaniel.l.desim...@intel.com>; Gao, Liming <liming....@intel.com> > Subject: [edk2-platforms][PATCH V2 39/47] MinPlatformPkg: Install advanced > feature FVs by stage enabled > > This change updates the FvReportLib instance in MinPlatformPkg to only > install advanced feature firmware volumes if the advanced feature stage > should be active. > > Cc: Chasel Chiu <chasel.c...@intel.com> > Cc: Nate DeSimone <nathaniel.l.desim...@intel.com> > Cc: Liming Gao <liming....@intel.com> > Signed-off-by: Michael Kubacki <michael.a.kuba...@intel.com> > Reviewed-by: Nate DeSimone <nathaniel.l.desim...@intel.com> > --- > Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec > | 1 + > > Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRepo > rtFvLib.inf | 1 + > > Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRepo > rtFvLib.c | 50 +++++++++++--------- > 3 files changed, 29 insertions(+), 23 deletions(-) > > diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec > b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec > index 21013cc87c..7f74ac9380 100644 > --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec > +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec > @@ -272,6 +272,7 @@ SetCacheMtrrLib|Include/Library/SetCacheMtrrLib.h > # Stage 3 - boot to shell only > # Stage 4 - boot to OS > # Stage 5 - boot to OS with security boot enabled > + # Stage 6 - boot with advanced features enabled > # > gMinPlatformPkgTokenSpaceGuid.PcdBootStage|4|UINT8|0xF00000A0 > > diff --git > a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRe > portFvLib.inf > b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRe > portFvLib.inf > index 1ce3034fcc..ef03e110bd 100644 > --- > a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRe > portFvLib.inf > +++ b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/ > +++ PeiReportFvLib.inf > @@ -30,6 +30,7 @@ > PeiReportFvLib.c > > [Pcd] > + gMinPlatformPkgTokenSpaceGuid.PcdBootStage > ## CONSUMES > gMinPlatformPkgTokenSpaceGuid.PcdFspWrapperBootMode > ## CONSUMES > gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaBaseAddress > ## CONSUMES > gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize > ## CONSUMES > diff --git > a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRe > portFvLib.c > b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRe > portFvLib.c > index b61587f6e3..0d805d6fe7 100644 > --- > a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRe > portFvLib.c > +++ b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/ > +++ PeiReportFvLib.c > @@ -40,20 +40,22 @@ ReportPreMemFv ( > NULL, > 0 > ); > - DEBUG (( > - DEBUG_INFO, > - "Install FlashFvAdvancedPreMemory - 0x%x, 0x%x\n", > - PcdGet32 (PcdFlashFvAdvancedPreMemoryBase), > - PcdGet32 (PcdFlashFvAdvancedPreMemorySize) > - )); > - PeiServicesInstallFvInfo2Ppi ( > - &(((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) PcdGet32 > (PcdFlashFvAdvancedPreMemoryBase))->FileSystemGuid), > - (VOID *) (UINTN) PcdGet32 (PcdFlashFvAdvancedPreMemoryBase), > - PcdGet32 (PcdFlashFvAdvancedPreMemorySize), > - NULL, > - NULL, > - 0 > - ); > + if (PcdGet8 (PcdBootStage) >= 6) { > + DEBUG (( > + DEBUG_INFO, > + "Install FlashFvAdvancedPreMemory - 0x%x, 0x%x\n", > + PcdGet32 (PcdFlashFvAdvancedPreMemoryBase), > + PcdGet32 (PcdFlashFvAdvancedPreMemorySize) > + )); > + PeiServicesInstallFvInfo2Ppi ( > + &(((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) PcdGet32 > (PcdFlashFvAdvancedPreMemoryBase))->FileSystemGuid), > + (VOID *) (UINTN) PcdGet32 (PcdFlashFvAdvancedPreMemoryBase), > + PcdGet32 (PcdFlashFvAdvancedPreMemorySize), > + NULL, > + NULL, > + 0 > + ); > + } > } > > VOID > @@ -122,15 +124,17 @@ ReportPostMemFv ( > NULL, > 0 > ); > - DEBUG ((DEBUG_INFO, "Install FlashFvAdvanced - 0x%x, 0x%x\n", > PcdGet32 (PcdFlashFvAdvancedBase), PcdGet32 (PcdFlashFvAdvancedSize))); > - PeiServicesInstallFvInfo2Ppi ( > - &(((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) PcdGet32 > (PcdFlashFvAdvancedBase))->FileSystemGuid), > - (VOID *) (UINTN) PcdGet32 (PcdFlashFvAdvancedBase), > - PcdGet32 (PcdFlashFvAdvancedSize), > - NULL, > - NULL, > - 0 > - ); > + if (PcdGet8 (PcdBootStage) >= 6) { > + DEBUG ((DEBUG_INFO, "Install FlashFvAdvanced - 0x%x, 0x%x\n", > PcdGet32 (PcdFlashFvAdvancedBase), PcdGet32 (PcdFlashFvAdvancedSize))); > + PeiServicesInstallFvInfo2Ppi ( > + &(((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) PcdGet32 > (PcdFlashFvAdvancedBase))->FileSystemGuid), > + (VOID *) (UINTN) PcdGet32 (PcdFlashFvAdvancedBase), > + PcdGet32 (PcdFlashFvAdvancedSize), > + NULL, > + NULL, > + 0 > + ); > + } > } > > // > -- > 2.16.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#51497): https://edk2.groups.io/g/devel/message/51497 Mute This Topic: https://groups.io/mt/63584191/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-