The integration of the PlatformPayloadPkg breaks the AdvancedFeaturePkg build.
The first patch fixes the build issue with executing
build -a IA32 -a X64 -p AdvancedFeaturePkg/AdvancedFeaturePkg.dsc
The PlatformPayloadPkg doesn't match advanced feature build and naming
conventions. The second patch
simply renames the files and does exact search and replace on the changes.
The third patch fixes token space guid name, feature enable name, and the like
to match the conventions of
other features.
Cc: Sai Chaganty <rangasai.v.chaga...@intel.com>
Cc: Nate DeSimone <nathaniel.l.desim...@intel.com>
Cc: Liming Gao <gaolim...@byosoft.com.cn>
Cc: Ray Ni <ray...@intel.com>
Cc: Guo Dong <guo.d...@intel.com>
Signed-off-by: Isaac Oram <isaac.w.o...@intel.com>
Isaac Oram (3):
PlatformPayloadPkg: Fix AdvancedFeaturePkg build issue
PlatformPayloadPkg: Rename to match other feature conventions
PlatformPayloadFeaturePkg: Update contents to match feature
conventions
.../AdvancedFeaturePkg/AdvancedFeaturePkg.dsc | 2 +-
.../Include/AdvancedFeatures.dsc | 4 +-
.../Include/AdvancedFeaturesPcd.dsc | 4 +-
.../AdvancedFeaturePkg/Include/PostMemory.fdf | 4 +-
.../AdvancedFeaturePkg/Include/PreMemory.fdf | 4 +-
.../Fvb/FvbInfo.c | 0
.../Fvb/FvbService.c | 0
.../Fvb/FvbService.h | 0
.../Fvb/FvbServiceSmm.c | 0
.../Fvb/FvbSmm.inf | 4 +-
.../Fvb/FvbSmmCommon.h | 0
.../Include/Guid/NvVariableInfoGuid.h | 0
.../Include/Guid/SpiFlashInfoGuid.h | 0
.../Include/Library/FlashDeviceLib.h | 0
.../Include/Library/SpiFlashLib.h | 0
.../Include/PlatformPayloadFeature.dsc | 50 +++++------
.../Include/PostMemory.fdf | 4 +-
.../Include/PreMemory.fdf | 0
.../Library/FlashDeviceLib/FlashDeviceLib.c | 0
.../Library/FlashDeviceLib/FlashDeviceLib.inf | 3 +-
.../Library/PcdInitLib/PcdInitLib.c | 0
.../Library/PcdInitLib/PcdInitLib.inf | 3 +-
.../Library/SpiFlashLib/PchSpi.c | 0
.../Library/SpiFlashLib/RegsSpi.h | 0
.../Library/SpiFlashLib/SpiCommon.h | 0
.../Library/SpiFlashLib/SpiFlashLib.c | 0
.../Library/SpiFlashLib/SpiFlashLib.inf | 2 +-
.../PchSmiDispatchSmm/PchSmiDispatchSmm.c | 0
.../PchSmiDispatchSmm/PchSmiDispatchSmm.h | 0
.../PchSmiDispatchSmm/PchSmiDispatchSmm.inf | 0
.../PlatformPayloadFeaturePkg.dec} | 8 +-
.../PlatformPayloadFeaturePkg.dsc} | 30 ++++++-
.../PlatformPayloadFeaturePkg.fdf} | 0
.../PlatformPayloadFeaturePkg.py} | 4 +-
.../Readme.md | 82 ++++++++++---------
35 files changed, 117 insertions(+), 91 deletions(-)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Fvb/FvbInfo.c (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Fvb/FvbService.c (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Fvb/FvbService.h (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Fvb/FvbServiceSmm.c (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Fvb/FvbSmm.inf (89%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Fvb/FvbSmmCommon.h (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/Guid/NvVariableInfoGuid.h (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/Guid/SpiFlashInfoGuid.h (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/Library/FlashDeviceLib.h (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/Library/SpiFlashLib.h (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/PlatformPayloadFeature.dsc (72%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/PostMemory.fdf (77%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Include/PreMemory.fdf (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/FlashDeviceLib/FlashDeviceLib.c (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/FlashDeviceLib/FlashDeviceLib.inf (90%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/PcdInitLib/PcdInitLib.c (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/PcdInitLib/PcdInitLib.inf (92%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/SpiFlashLib/PchSpi.c (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/SpiFlashLib/RegsSpi.h (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/SpiFlashLib/SpiCommon.h (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/SpiFlashLib/SpiFlashLib.c (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Library/SpiFlashLib/SpiFlashLib.inf (90%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/PchSmiDispatchSmm/PchSmiDispatchSmm.c (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/PchSmiDispatchSmm/PchSmiDispatchSmm.h (100%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/PchSmiDispatchSmm/PchSmiDispatchSmm.inf (100%)
rename Features/Intel/{PlatformPayloadPkg/PlatformPayloadPkg.dec =>
PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dec} (73%)
rename Features/Intel/{PlatformPayloadPkg/PlatformPayloadPkg.dsc =>
PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.dsc} (77%)
rename Features/Intel/{PlatformPayloadPkg/PlatformPayloadPkg.fdf =>
PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.fdf} (100%)
rename Features/Intel/{PlatformPayloadPkg/PlatformPayloadPkg.py =>
PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.py} (93%)
rename Features/Intel/{PlatformPayloadPkg =>
PlatformPayloadFeaturePkg}/Readme.md (50%)
--
2.36.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#92321): https://edk2.groups.io/g/devel/message/92321
Mute This Topic: https://groups.io/mt/92947539/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
