BaseTools/Source/C/GNUmakefile                | 1 -

 MdeModulePkg/MdeModulePkg.dec                 | 1 -

 OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c | 3 +++

 OvmfPkg/OvmfPkgIa32.dsc                       | 9 +++++++--

 OvmfPkg/OvmfPkgIa32X64.dsc                    | 9 +++++++--

 OvmfPkg/OvmfPkgX64.dsc                        | 9 +++++++--

 6 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/BaseTools/Source/C/GNUmakefile b/BaseTools/Source/C/GNUmakefile

index 5275f657ef..39d7199753 100644

--- a/BaseTools/Source/C/GNUmakefile

+++ b/BaseTools/Source/C/GNUmakefile

@@ -51,7 +51,6 @@ all: makerootdir subdirs

 LIBRARIES = Common

 VFRAUTOGEN = VfrCompile/VfrLexer.h

 APPLICATIONS = \

-  BrotliCompress \

   VfrCompile \

   EfiRom \

   GenFfs \

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec

index 58e6ab0048..73efddcd2d 100644

--- a/MdeModulePkg/MdeModulePkg.dec

+++ b/MdeModulePkg/MdeModulePkg.dec

@@ -25,7 +25,6 @@

   Include

 [Includes.Common.Private]

-  Library/BrotliCustomDecompressLib/brotli/c/include

 [LibraryClasses]

   ##  @libraryclass  Defines a set of methods to reset whole system.

diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c

index 094e4c821b..817653dee4 100644

--- a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c

+++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c

@@ -696,6 +696,9 @@ ShellAppMain (

                EFI_IMAGE_SECURITY_DATABASE,

                &gEfiImageSecurityDatabaseGuid,

                &gEfiCertX509Guid,

+               PkKek1,

+               SizeOfPkKek1,

+               &gEfiCallerIdGuid,

                mMicrosoftPca,

                mSizeOfMicrosoftPca,

                &gMicrosoftVendorGuid,

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc

index 6f774baf90..7d1be5c9dd 100644

--- a/OvmfPkg/OvmfPkgIa32.dsc

+++ b/OvmfPkg/OvmfPkgIa32.dsc

@@ -541,7 +541,7 @@

   # DEBUG_VERBOSE   0x00400000  // Detailed debug messages that may

   #                             // significantly impact boot performance

   # DEBUG_ERROR     0x80000000  // Error

-  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F

+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F

 !if $(SOURCE_DEBUG_ENABLE) == TRUE

   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17

@@ -730,6 +730,8 @@

     <LibraryClasses>

       NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf

       DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

+    <PcdsFixedAtBuild>

+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F

   }

   MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf

@@ -838,7 +840,10 @@

   OvmfPkg/SataControllerDxe/SataControllerDxe.inf

   MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf

   MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf

-  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf

+  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf {

+    <PcdsFixedAtBuild>

+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F

+  }

   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

   MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

   MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc

index c851764dec..0069d01d1c 100644

--- a/OvmfPkg/OvmfPkgIa32X64.dsc

+++ b/OvmfPkg/OvmfPkgIa32X64.dsc

@@ -547,7 +547,7 @@

   # DEBUG_VERBOSE   0x00400000  // Detailed debug messages that may

   #                             // significantly impact boot performance

   # DEBUG_ERROR     0x80000000  // Error

-  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F

+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F

 !if $(SOURCE_DEBUG_ENABLE) == TRUE

   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17

@@ -744,6 +744,8 @@

     <LibraryClasses>

       NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf

       DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

+    <PcdsFixedAtBuild>

+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F

   }

   MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf

@@ -852,7 +854,10 @@

   OvmfPkg/SataControllerDxe/SataControllerDxe.inf

   MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf

   MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf

-  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf

+  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf {

+    <PcdsFixedAtBuild>

+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F

+  }

   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

   MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

   MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc

index 63c3a47aea..1a32de9b24 100644

--- a/OvmfPkg/OvmfPkgX64.dsc

+++ b/OvmfPkg/OvmfPkgX64.dsc

@@ -567,7 +567,7 @@

   # DEBUG_VERBOSE   0x00400000  // Detailed debug messages that may

   #                             // significantly impact boot performance

   # DEBUG_ERROR     0x80000000  // Error

-  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F

+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F

 !if $(SOURCE_DEBUG_ENABLE) == TRUE

   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17

@@ -789,6 +789,8 @@

     <LibraryClasses>

       NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf

       DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

+    <PcdsFixedAtBuild>

+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F

   }

   MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf

@@ -920,7 +922,10 @@

   OvmfPkg/SataControllerDxe/SataControllerDxe.inf

   MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf

   MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf

-  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf

+  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf {

+    <PcdsFixedAtBuild>

+      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F

+  }

   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

   MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

   MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf