Reviewed-by: Chasel Chiu <chasel.c...@intel.com>
> -----Original Message----- > From: Kubacki, Michael A <michael.a.kuba...@intel.com> > Sent: Thursday, November 28, 2019 9:06 AM > To: devel@edk2.groups.io > Cc: Chiu, Chasel <chasel.c...@intel.com>; Desimone, Nathaniel L > <nathaniel.l.desim...@intel.com> > Subject: [edk2-platforms][PATCH V2 32/47] > WhiskeylakeOpenBoardPkg/WhiskeylakeURvp: Add FvAdvancedPreMemory > > This change adds a standalone firmware volume for pre-memory advanced > features called FvAdvancedPreMemory to the flash map. > > Pre-memory advanced feature modules were previously kept in a child > firmware volume of FvAdvanced called FvAdvancedPreMem. This change > simplifies the flash layout and separation of pre-memory and post-memory > modules. > > Cc: Chasel Chiu <chasel.c...@intel.com> > Cc: Nate DeSimone <nathaniel.l.desim...@intel.com> > Signed-off-by: Michael Kubacki <michael.a.kuba...@intel.com> > Reviewed-by: Nate DeSimone <nathaniel.l.desim...@intel.com> > --- > > Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/Fdf/Fla > shMapInclude.fdf | 24 +++++----- > > Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg. > fdf | 46 +++++++------------- > 2 files changed, 28 insertions(+), 42 deletions(-) > > diff --git > a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/Fdf/F > lashMapInclude.fdf > b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/Fdf/ > FlashMapInclude.fdf > index 9209b9e88a..e0db381942 100644 > --- > a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/Fdf/F > lashMapInclude.fdf > +++ > b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Include/Fdf > +++ /FlashMapInclude.fdf > @@ -1,12 +1,10 @@ > ## @file > -# FDF file of Platform. > -# > +# FDF file for the WhiskeylakeURvp board. > # > # Copyright (c) 2019, Intel Corporation. All rights reserved.<BR> # # > SPDX-License-Identifier: BSD-2-Clause-Patent # -# ## > > > #=============================================================== > ==================# > @@ -27,23 +25,25 @@ SET > gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize = > 0x00002000 > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareOffset > = 0x00020000 # Flash addr (0xFF820000) > SET gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize > = 0x00020000 # > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedOffset > = 0x00040000 # Flash addr (0xFF840000) > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedSize > = 0x00060000 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecurityOffset = > 0x000A0000 # Flash addr (0xFF8A0000) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedSize > = 0x00050000 # > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecurityOffset > = 0x00090000 # Flash addr (0xFF890000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecuritySize > = 0x00070000 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootOffset > = 0x00110000 # Flash addr (0xFF910000) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootOffset > = 0x00100000 # Flash addr (0xFF900000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvOsBootSize > = 0x00090000 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootOffset > = 0x001A0000 # Flash addr (0xFF9A0000) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootOffset > = 0x00190000 # Flash addr (0xFF990000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvUefiBootSize > = 0x00190000 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryOffset > = 0x00330000 # Flash addr (0xFFB30000) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryOffset > = 0x00320000 # Flash addr (0xFFB20000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemorySize > = 0x00170000 # > -SET gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset > = 0x004A0000 # Flash addr (0xFFCA0000) > +SET gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvOffset > = 0x00490000 # Flash addr (0xFFC90000) > SET gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize > = 0x000B0000 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSOffset > = 0x00550000 # Flash addr (0xFFD50000) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSOffset > = 0x00540000 # Flash addr (0xFFD40000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSSize > = 0x00070000 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMOffset > = 0x005C0000 # Flash addr (0xFFDC0000) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMOffset > = 0x005B0000 # Flash addr (0xFFDB0000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMSize > = 0x000EC000 # > -SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTOffset > = 0x006AC000 # Flash addr (0xFFEAC000) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTOffset > = 0x0069C000 # Flash addr (0xFFE9C000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTSize > = 0x00014000 # > +SET > gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedPreMemoryOffset = > 0x006B0000 # Flash addr (0xFFEB0000) > +SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedPreMemorySize > = 0x00010000 # > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemoryOffset > = 0x006C0000 # Flash addr (0xFFEC0000) > SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemorySize > = 0x00140000 # > > diff --git > a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP > kg.fdf > b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP > kg.fdf > index 8a4fd973b4..130930ad40 100644 > --- > a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP > kg.fdf > +++ > b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP > k > +++ g.fdf > @@ -175,6 +175,10 @@ > gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTBase|gMinPlatformPkgToke > nSpaceGuid.P > # FSP_T Section > FILE = $(PLATFORM_FSP_BIN_PACKAGE)/Fsp_Rebased_T.fd > > +gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedPreMemoryOffset|g > MinPla > +tformPkgTokenSpaceGuid.PcdFlashFvAdvancedPreMemorySize > +gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedPreMemoryBase|gMi > nPlatf > +ormPkgTokenSpaceGuid.PcdFlashFvAdvancedPreMemorySize > +FV = FvAdvancedPreMemory > + > > gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemoryOffset|gMinPlatform > PkgTokenSpaceGuid.PcdFlashFvPreMemorySize > > gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemoryBase|gMinPlatformP > kgTokenSpaceGuid.PcdFlashFvPreMemorySize > FV = FvPreMemory > @@ -597,7 +601,10 @@ FILE FV_IMAGE = > C83522D9-80A1-4D95-8C25-3F1370497406 { > } > } > > -[FV.FvAdvancedPreMem] > +# > +# Pre-memory Advanced Features > +# > +[FV.FvAdvancedPreMemory] > FvAlignment = 16 > ERASE_POLARITY = 1 > MEMORY_MAPPED = TRUE > @@ -620,7 +627,10 @@ FvNameGuid = > 6053D78A-457E-4490-A237-31D0FBE2F305 > INF $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf > !endif > > -[FV.FvAdvancedPostMem] > +# > +# Post-Memory Advanced Features > +# > +[FV.FvAdvancedUncompact] > FvAlignment = 16 > ERASE_POLARITY = 1 > MEMORY_MAPPED = TRUE > @@ -639,31 +649,15 @@ READ_LOCK_CAP = TRUE > READ_LOCK_STATUS = TRUE > FvNameGuid = BE3DF86F-E464-44A3-83F7-0D27E6B88C27 > > -[FV.FvAdvancedLate] > -FvAlignment = 16 > -ERASE_POLARITY = 1 > -MEMORY_MAPPED = TRUE > -STICKY_WRITE = TRUE > -LOCK_CAP = TRUE > -LOCK_STATUS = TRUE > -WRITE_DISABLED_CAP = TRUE > -WRITE_ENABLED_CAP = TRUE > -WRITE_STATUS = TRUE > -WRITE_LOCK_CAP = TRUE > -WRITE_LOCK_STATUS = TRUE > -READ_DISABLED_CAP = TRUE > -READ_ENABLED_CAP = TRUE > -READ_STATUS = TRUE > -READ_LOCK_CAP = TRUE > -READ_LOCK_STATUS = TRUE > -FvNameGuid = 11F6E304-43F9-4B2F-90AB-B8FFEAD6205D > - > !if gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable == TRUE > INF $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Dxe/TbtDxe.inf > INF $(PLATFORM_BOARD_PACKAGE)/Features/PciHotPlug/PciHotPlug.inf > INF > $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Smm/TbtSmm.inf > !endif > > +# > +# Compressed FV with Post-Memory Advanced Features # > [FV.FvAdvanced] > BlockSize = $(FLASH_BLOCK_SIZE) > FvAlignment = 16 > @@ -684,17 +678,9 @@ READ_LOCK_CAP = TRUE > READ_LOCK_STATUS = TRUE > FvNameGuid = B23E7388-9953-45C7-9201-0473DDE5487A > > -FILE FV_IMAGE = 35E7406A-5842-4F2B-BC62-19022C12AF74 { > - SECTION FV_IMAGE = FvAdvancedPreMem > - } > - > -FILE FV_IMAGE = F5DCB34F-27EA-48AC-9406-C894F6D587CA { > - SECTION FV_IMAGE = FvAdvancedPostMem > - } > - > FILE FV_IMAGE = 5248467B-B87B-4E74-AC02-398AF4BCB712 { > SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF > PROCESSING_REQUIRED = TRUE { > - SECTION FV_IMAGE = FvAdvancedLate > + SECTION FV_IMAGE = FvAdvancedUncompact > } > } > > -- > 2.16.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#51493): https://edk2.groups.io/g/devel/message/51493 Mute This Topic: https://groups.io/mt/63459765/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-