Failed in applying to current master (
apply log)
.../N1xxWU/OpenBoardPkgBuildOption.dsc | 2 +
Platform/Intel/ClevoOpenBoardPkg/OpenBoardPkg.dec | 4 +-
.../KabylakeRvp3/OpenBoardPkgBuildOption.dsc | 12 +-
.../Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec | 14 +-
.../Ia32/PeiCoreEntry.S | 123 --------
.../Ia32/{PeiCoreEntry.asm => PeiCoreEntry.nasm} | 52 ++-
.../SecFspWrapperPlatformSecLib/Ia32/SecEntry.S | 348 ---------------------
.../Ia32/{SecEntry.asm => SecEntry.nasm} | 138 ++++----
.../SecFspWrapperPlatformSecLib/Ia32/Stack.S | 73 -----
.../Ia32/{Stack.asm => Stack.nasm} | 45 ++-
.../SecFspWrapperPlatformSecLib.inf | 18 +-
.../MinPlatformPkg/Include/Fdf/RuleInclude.fdf | 19 +-
.../Tools/Fsp/RebaseAndPatchFspBinBaseAddress.py | 2 +-
.../MinPlatformPkg/Tools/PatchFv/PatchBinFv.py | 16 +-
.../MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py | 23 +-
Platform/Intel/Readme.md | 31 +-
Platform/Intel/build_bios.py | 25 +-
.../Pch/PchInit/Smm/PchInitSmm.h | 11 +-
.../Pch/PchInit/Smm/PchPcieSmm.c | 11 +-
.../Pch/PchSmiDispatcher/Smm/PchSmm.h | 12 +-
.../Pch/PchSmiDispatcher/Smm/PchSmmCore.c | 12 +-
21 files changed, 197 insertions(+), 794 deletions(-)
delete mode 100644 Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/PeiCoreEntry.S
rename Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/{PeiCoreEntry.asm => PeiCoreEntry.nasm} (59%)
delete mode 100644 Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/SecEntry.S
rename Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/{SecEntry.asm => SecEntry.nasm} (69%)
delete mode 100644 Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/Stack.S
rename Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatformSecLib/Ia32/{Stack.asm => Stack.nasm} (50%)