Failed in applying to current master (
apply log)
BaseTools/Source/C/VfrCompile/VfrCompiler.cpp | 35 +----
BaseTools/Source/C/VfrCompile/VfrCompiler.h | 3 +-
BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp | 23 +--
BaseTools/Source/C/VfrCompile/VfrFormPkg.h | 3 +-
BaseTools/Source/C/VfrCompile/VfrSyntax.g | 103 +-------------
.../Source/C/VfrCompile/VfrUtilityLib.cpp | 52 +------
BaseTools/Source/C/VfrCompile/VfrUtilityLib.h | 7 +-
.../VfrCompiler_Utility_Man_Page.rtf | 4 -
FatPkg/FatPei/FatLiteApi.c | 10 +-
FatPkg/FatPei/FatPei.inf | 4 -
.../Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c | 10 +-
.../Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf | 3 +-
MdeModulePkg/Core/Dxe/DxeMain.inf | 6 +-
MdeModulePkg/Core/Dxe/Image/Image.c | 132 +-----------------
MdeModulePkg/Core/Dxe/Image/Image.h | 85 +----------
MdeModulePkg/Core/Pei/FwVol/FwVol.c | 65 ---------
MdeModulePkg/Core/Pei/PeiMain.inf | 1 -
MdeModulePkg/MdeModulePkg.dec | 8 --
MdeModulePkg/MdeModulePkg.uni | 6 -
.../Disk/CdExpressPei/CdExpressPei.inf | 5 +-
.../Disk/CdExpressPei/PeiCdExpress.c | 10 +-
.../Universal/SetupBrowserDxe/IfrParse.c | 86 +-----------
.../SetupBrowserDxe/SetupBrowserDxe.inf | 6 +-
.../Pei/PlatformInit/Generic/Recovery.c | 50 ++-----
.../Pei/PlatformInit/PlatformEarlyInit.inf | 3 +-
.../RecoveryModuleLoadPei.c | 6 +-
.../RecoveryModuleLoadPei.inf | 5 +-
.../Universal/Acpi/S3Resume2Pei/S3Resume.c | 30 ----
.../Acpi/S3Resume2Pei/S3Resume2Pei.inf | 3 +-
Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 3 +-
Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 3 +-
Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 3 +-
32 files changed, 48 insertions(+), 725 deletions(-)