Vlv2TbltDevicePkg: Add ESRT table in OS

1. Add ESRT table in OS. 2. Changed SystemFirmware Descriptor. 3. Remove redundant code.

Contributed-under: TianoCore Contribution Agreement 1.1

Signed-off-by: Guo Mang <mang.guo@intel.com>

10 files changed, 41 insertions, 331 deletions

diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.acpi b/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.acpi
deleted file mode 100644
index b355bb47e8..0000000000
--- a/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.acpi
+++ /dev/null
diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf b/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
index 3cae775ada..b89d326514 100644
--- a/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
+++ b/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
@@ -15,22 +15,21 @@
 [Defines]

   INF_VERSION                    = 0x00010005

   BASE_NAME                      = SystemFirmwareDescriptor

-  FILE_GUID                      = A3E13E7F-9FD9-4057-84FA-37423C789612

+  FILE_GUID                      = 90B2B846-CA6D-4D6E-A8D3-C140A8E110AC

   MODULE_TYPE                    = PEIM

   VERSION_STRING                 = 1.0

   ENTRY_POINT                    = SystemFirmwareDescriptorPeimEntry

 

 [Sources]

   SystemFirmwareDescriptorPei.c

+  SystemFirmwareDescriptor.aslc

 

 [Packages]

   MdePkg/MdePkg.dec

+  MdeModulePkg/MdeModulePkg.dec

   SignedCapsulePkg/SignedCapsulePkg.dec

   Vlv2TbltDevicePkg/PlatformPkg.dec

 

-[Guids]

-  gEdkiiSystemFirmwareImageDescriptorFileGuid

-

 [LibraryClasses]

   PcdLib

   PeiServicesLib

diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c b/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
index 792cbf8266..b5a93238ff 100644
--- a/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
+++ b/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
@@ -19,8 +19,6 @@
 #include <Protocol/FirmwareManagement.h>

 #include <Guid/EdkiiSystemFmpCapsule.h>

 

-

-

 /**

   Entrypoint for SystemFirmwareDescriptor PEIM.

 

@@ -32,7 +30,7 @@
 EFI_STATUS

 EFIAPI

 SystemFirmwareDescriptorPeimEntry (

-  IN EFI_PEI_FILE_HANDLE     PeiFileHandle,

+  IN EFI_PEI_FILE_HANDLE     FileHandle,

   IN CONST EFI_PEI_SERVICES  **PeiServices

   )

 {

@@ -41,34 +39,22 @@ SystemFirmwareDescriptorPeimEntry (
   UINTN                                   Size;

   UINTN                                   Index;

   UINT32                                  AuthenticationStatus;

-  EFI_PEI_FV_HANDLE                       VolumeHandle;

-  EFI_PEI_FILE_HANDLE                     FileHandle;

 

+  //

+  // Search RAW section.

+  //

   Index = 0;

   while (TRUE) {

-    Status = PeiServicesFfsFindNextVolume (Index++, &VolumeHandle);

-    if (EFI_ERROR (Status)) {

-      return Status;

+    Status = PeiServicesFfsFindSectionData3(EFI_SECTION_RAW, Index, FileHandle, (VOID **)&Descriptor, &AuthenticationStatus);

+    if (EFI_ERROR(Status)) {

+      // Should not happen, must something wrong in FDF.

+      ASSERT(FALSE);

+      return EFI_NOT_FOUND;

     }

-    Status = PeiServicesFfsFindFileByName (&gEdkiiSystemFirmwareImageDescriptorFileGuid, VolumeHandle, &FileHandle);

-    if (!EFI_ERROR (Status)) {

-      //

-      // Search RAW section.

-      //

-      Index = 0;

-      while (TRUE) {

-        Status = PeiServicesFfsFindSectionData3(EFI_SECTION_RAW, Index++, FileHandle, (VOID **)&Descriptor, &AuthenticationStatus);

-        if (EFI_ERROR(Status)) {

-          // Should not happen, must something wrong in FDF.

-          ASSERT(FALSE);

-          return EFI_NOT_FOUND;

-        }

-        if (Descriptor->Signature == EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR_SIGNATURE) {

-          break;

-        }

-      }

+    if (Descriptor->Signature == EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR_SIGNATURE) {

       break;

     }

+    Index++;

   }

 

   DEBUG((DEBUG_INFO, "EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR size - 0x%x\n", Descriptor->Length));

diff --git a/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptorTable.inf b/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptorTable.inf
deleted file mode 100644
index 5f491efbed..0000000000
--- a/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptorTable.inf
+++ /dev/null
@@ -1,28 +0,0 @@
-## @file

-#  System Firmware descriptor.

-#

-#  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>

-#  This program and the accompanying materials

-#  are licensed and made available under the terms and conditions of the BSD License

-#  which accompanies this distribution.  The full text of the license may be found at

-#  http://opensource.org/licenses/bsd-license.php

-#

-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-#

-##

-

-[Defines]

-  INF_VERSION                    = 0x00010017

-  BASE_NAME                      = SystemFirmwareDescriptorTable

-  FILE_GUID                      = 90B2B846-CA6D-4D6E-A8D3-C140A8E110AC

-  MODULE_TYPE                    = USER_DEFINED

-  VERSION_STRING                 = 1.0

-

-[Binaries]

-  BIN|SystemFirmwareDescriptor.acpi

-

-[Packages]

-  MdeModulePkg/MdeModulePkg.dec

-  SignedCapsulePkg/SignedCapsulePkg.dec

-

diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
index e9c356560b..697ad67a30 100644
--- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
+++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
@@ -2083,6 +2083,9 @@ FULL_CONFIGURATION:
    #ifdef FTPM_ENABLE

    TrEEPhysicalPresenceLibProcessRequest(NULL);

    #endif

+    if (EsrtManagement != NULL) {

+      EsrtManagement->SyncEsrtFmp();

+    }

     //

     // Close boot script and install ready to lock

     //

diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index e767cb5a17..6278a35905 100644
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -333,10 +333,6 @@ INF IntelFspWrapperPkg/FspWrapperSecCore/FspWrapperSecCore.inf
 INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/SecCore.inf
 !endif
 
-!if $(CAPSULE_GENERATE_ENABLE)
-INF Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
-INF USE=IA32 Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptorTable.inf
-!endif
 INF MdeModulePkg/Core/Pei/PeiMain.inf
 !if $(MINNOW2_FSP_BUILD) == TRUE
 INF Vlv2TbltDevicePkg/FspSupport/BootModePei/BootModePei.inf
@@ -379,6 +375,10 @@ INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET
 INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/MemoryInit.inf
 !endif
 
+!if $(CAPSULE_GENERATE_ENABLE)
+  # FMP image decriptor
+INF RuleOverride = FMP_IMAGE_DESC Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
+!endif
 
 [FV.FVMAIN]
 BlockSize          = $(FLASH_BLOCK_SIZE)
@@ -817,86 +817,6 @@ READ_LOCK_CAP      = TRUE
 READ_LOCK_STATUS   = TRUE
 
 
-[FV.Bios_Update_Data]
-BlockSize          = $(FLASH_BLOCK_SIZE)
-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
-
-FILE FV_IMAGE = 4A538818-5AE0-4eb2-B2EB-488B23657022 {
-       SECTION FV_IMAGE = FVMAIN_COMPACT
-     }
-
-[FV.BiosUpdateCargo]
-BlockSize          = $(FLASH_BLOCK_SIZE)
-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
-
-!if $(ESRT_ENABLE) == TRUE
-  INF   $(PLATFORM_PACKAGE)/UpdateDriverDxe/UpdateDriverDxe.inf
-!else
-  INF  IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.inf
-!endif
-FILE RAW = 283FA2EE-532C-484d-9383-9F93B36F0B7E {
-       FV = Bios_Update_Data
-     }
-FILE RAW = 98B8D59B-E8BA-48EE-98DD-C295392F1EDB {
-   Vlv2TbltDevicePkg/BiosUpdateConfig/BiosUpdateConfig.ini
-   }
-
-
-[FV.BiosUpdate]
-BlockSize          = $(FLASH_BLOCK_SIZE)
-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
-
-FILE FV_IMAGE = EDBEDF47-6EA3-4512-83C1-70F4769D4BDE {
-       SECTION GUIDED {
-          SECTION FV_IMAGE = BiosUpdateCargo
-       }
-     }
-
 !if $(CAPSULE_GENERATE_ENABLE)
 [FV.CapsuleDispatchFv]
 FvAlignment        = 16
@@ -1197,18 +1117,10 @@ FMP_PAYLOAD = FmpPayloadSystemFirmwareRsa2048
   }
 
 [Rule.Common.PEIM.FMP_IMAGE_DESC]
-
   FILE PEIM = $(NAMED_GUID) {
      RAW BIN                  |.acpi
-
      PEI_DEPEX PEI_DEPEX Optional        $(INF_OUTPUT)/$(MODULE_NAME).depex
      PE32      PE32                      $(INF_OUTPUT)/$(MODULE_NAME).efi
      UI       STRING="$(MODULE_NAME)" Optional
      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
   }
-
-[Rule.Common.USER_DEFINED.BINARY]
-  FILE FREEFORM = $(NAMED_GUID) {
-     UI  STRING="$(MODULE_NAME)" Optional
-     RAW BIN |.bin
-     }
\ No newline at end of file
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index 59165034aa..1ce5529780 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -290,10 +290,6 @@ INF IntelFspWrapperPkg/FspWrapperSecCore/FspWrapperSecCore.inf
 INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/SecCore.inf
 !endif
 
-!if $(CAPSULE_GENERATE_ENABLE)
-INF Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
-INF USE=IA32 Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptorTable.inf
-!endif
 INF MdeModulePkg/Core/Pei/PeiMain.inf
 !if $(MINNOW2_FSP_BUILD) == TRUE
 INF Vlv2TbltDevicePkg/FspSupport/BootModePei/BootModePei.inf
@@ -332,6 +328,10 @@ INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET
 INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/MemoryInit.inf
 !endif
 
+!if $(CAPSULE_GENERATE_ENABLE)
+  # FMP image decriptor
+INF RuleOverride = FMP_IMAGE_DESC Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
+!endif
 
 [FV.FVMAIN]
 BlockSize          = $(FLASH_BLOCK_SIZE)
@@ -772,86 +772,6 @@ READ_LOCK_CAP      = TRUE
 READ_LOCK_STATUS   = TRUE
 
 
-[FV.Bios_Update_Data]
-BlockSize          = $(FLASH_BLOCK_SIZE)
-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
-
-FILE FV_IMAGE = 4A538818-5AE0-4eb2-B2EB-488B23657022 {
-       SECTION FV_IMAGE = FVMAIN_COMPACT
-     }
-
-[FV.BiosUpdateCargo]
-BlockSize          = $(FLASH_BLOCK_SIZE)
-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
-
-!if $(ESRT_ENABLE) == TRUE
-  INF   $(PLATFORM_PACKAGE)/UpdateDriverDxe/UpdateDriverDxe.inf
-!else
-  INF  IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.inf
-!endif
-FILE RAW = 283FA2EE-532C-484d-9383-9F93B36F0B7E {
-       FV = Bios_Update_Data
-     }
-FILE RAW = 98B8D59B-E8BA-48EE-98DD-C295392F1EDB {
-   Vlv2TbltDevicePkg/BiosUpdateConfig/BiosUpdateConfig.ini
-   }
-
-
-[FV.BiosUpdate]
-BlockSize          = $(FLASH_BLOCK_SIZE)
-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
-
-FILE FV_IMAGE = EDBEDF47-6EA3-4512-83C1-70F4769D4BDE {
-       SECTION GUIDED {
-          SECTION FV_IMAGE = BiosUpdateCargo
-       }
-     }
-
 !if $(CAPSULE_GENERATE_ENABLE)
 [FV.CapsuleDispatchFv]
 FvAlignment        = 16
@@ -1165,9 +1085,3 @@ FMP_PAYLOAD = FmpPayloadSystemFirmwareRsa2048
      UI       STRING="$(MODULE_NAME)" Optional
      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
   }
-
-[Rule.Common.USER_DEFINED.BINARY]
-  FILE FREEFORM = $(NAMED_GUID) {
-     UI  STRING="$(MODULE_NAME)" Optional
-     RAW BIN |.bin
-     }
\ No newline at end of file
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index 98d510a8c5..19176de4d6 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -858,14 +858,6 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSystemRebootAfterCapsuleProcessFlag|0x0001
   gEfiMdePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSupport"|gEfiGlobalVariableGuid|0x0|1 # Variable: L"HwErrRecSupport"
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState|L"BootState"|gEfiBootStateGuid|0x0|TRUE
   
-  #
-  #  Indicator to sync ESRT repository from FMP instance. Set to TRUE on first boot
-  #
-!if $(ESRT_ENABLE) == TRUE
-  gPlatformModuleTokenSpaceGuid.PcdEsrtSyncFmp|L"EsrtSyncFmp"|gPlatformModuleTokenSpaceGuid|0x0|TRUE|NV,BS
-!else
-  gPlatformModuleTokenSpaceGuid.PcdEsrtSyncFmp|L"EsrtSyncFmp"|gPlatformModuleTokenSpaceGuid|0x0|FALSE|NV,BS
-!endif
 
 [PcdsDynamicDefault.common.DEFAULT]
   gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0x0
@@ -1253,17 +1245,13 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf {
     <LibraryClasses>
       FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.inf
-    !if $(TARGET) != RELEASE
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-    !endif
+      DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
   }
 
   SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf {
     <LibraryClasses>
       FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.inf
-    !if $(TARGET) != RELEASE
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-    !endif
+      DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
   }
 
   MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf {
@@ -1611,22 +1599,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
 # capsule related drivers
 #
 IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDxe.inf
-!if $(ESRT_ENABLE) == TRUE
-  $(PLATFORM_PACKAGE)/UpdateDriverDxe/UpdateDriverDxe.inf{
-     !if $(TARGET) == DEBUG
-    <LibraryClasses>
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-	  SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf
-    !endif
-  }
-!else
-  IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.inf
-!endif
 MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf
-!if $(ESRT_ENABLE) == TRUE
-  $(PLATFORM_PACKAGE)/PlatformEsrt/PlatformEsrtDxe.inf
-  $(PLATFORM_PACKAGE)/FmpSample/FmpSample.inf
-!endif
 
   Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.inf
   Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.inf
diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index a1c2540ee3..c6134777d7 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -857,14 +857,6 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSystemRebootAfterCapsuleProcessFlag|0x0001
   gEfiMdePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSupport"|gEfiGlobalVariableGuid|0x0|1 # Variable: L"HwErrRecSupport"
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState|L"BootState"|gEfiBootStateGuid|0x0|TRUE
   
-  #
-  #  Indicator to sync ESRT repository from FMP instance. Set to TRUE on first boot
-  #
-!if $(ESRT_ENABLE) == TRUE
-  gPlatformModuleTokenSpaceGuid.PcdEsrtSyncFmp|L"EsrtSyncFmp"|gPlatformModuleTokenSpaceGuid|0x0|TRUE|NV,BS
-!else
-  gPlatformModuleTokenSpaceGuid.PcdEsrtSyncFmp|L"EsrtSyncFmp"|gPlatformModuleTokenSpaceGuid|0x0|FALSE|NV,BS
-!endif
 
 [PcdsDynamicDefault.common.DEFAULT]
   gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0x0
@@ -1249,19 +1241,14 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf {
     <LibraryClasses>
       FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.inf
-    !if $(TARGET) != RELEASE
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-    !endif
+      DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
   }
 
   SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf {
     <LibraryClasses>
 
       FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.inf
-
-    !if $(TARGET) != RELEASE
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-    !endif
+      DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
   }
 
   MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf {
@@ -1614,22 +1601,8 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
 # capsule related drivers
 #
 IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDxe.inf
-!if $(ESRT_ENABLE) == TRUE
-  $(PLATFORM_PACKAGE)/UpdateDriverDxe/UpdateDriverDxe.inf{
-     !if $(TARGET) == DEBUG
-    <LibraryClasses>
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-	  SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf
-    !endif
-  }
-!else
-  IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.inf
-!endif
+
 MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf
-!if $(ESRT_ENABLE) == TRUE
-  $(PLATFORM_PACKAGE)/PlatformEsrt/PlatformEsrtDxe.inf
-  $(PLATFORM_PACKAGE)/FmpSample/FmpSample.inf
-!endif
 
   Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.inf
   Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.inf
diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index f9b9faa3ac..8937088337 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -1,7 +1,7 @@
 #/** @file
 # Platform description.
 #
-# Copyright (c) 2012  - 2017, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2012  - 2017, Intel Corporation. All rights reserved.<BR>
 #                                                                                  
 # This program and the accompanying materials are licensed and made available under
 # the terms and conditions of the BSD License that accompanies this distribution.  
@@ -858,14 +858,6 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSystemRebootAfterCapsuleProcessFlag|0x0001
   gEfiMdePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSupport"|gEfiGlobalVariableGuid|0x0|1 # Variable: L"HwErrRecSupport"
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState|L"BootState"|gEfiBootStateGuid|0x0|TRUE
   
-  #
-  #  Indicator to sync ESRT repository from FMP instance. Set to TRUE on first boot
-  #
-!if $(ESRT_ENABLE) == TRUE
-  gPlatformModuleTokenSpaceGuid.PcdEsrtSyncFmp|L"EsrtSyncFmp"|gPlatformModuleTokenSpaceGuid|0x0|TRUE|NV,BS
-!else
-  gPlatformModuleTokenSpaceGuid.PcdEsrtSyncFmp|L"EsrtSyncFmp"|gPlatformModuleTokenSpaceGuid|0x0|FALSE|NV,BS
-!endif
 
 [PcdsDynamicDefault.common.DEFAULT]
   gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0x0
@@ -906,8 +898,8 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSystemRebootAfterCapsuleProcessFlag|0x0001
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmScrtmPolicy|1
 !endif
 
-  gPlatformModuleTokenSpaceGuid.PcdRtcPowerFailure|FALSE

-

+  gPlatformModuleTokenSpaceGuid.PcdRtcPowerFailure|FALSE
+
 [PcdsDynamicExDefault.common.DEFAULT]
   gEfiVLVTokenSpaceGuid.PcdTCSmbaIoBaseAddress|0x1040
   gEfiVLVTokenSpaceGuid.PcdEmmcManufacturerId|0
@@ -1006,8 +998,8 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
       <PcdsFixedAtBuild>
         gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
   !endif
-   <LibraryClasses>

-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf

+   <LibraryClasses>
+      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
   }
 !endif
 
@@ -1087,7 +1079,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046
     <LibraryClasses>
       DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-      NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf

+      NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
       PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
   }
@@ -1359,7 +1351,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
     <LibraryClasses>
       NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
-      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

+      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
       Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCDxe/Tpm2DeviceLibSeC.inf
   }
   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/FtpmSmm.inf
@@ -1400,8 +1392,8 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   $(PLATFORM_PACKAGE)/PlatformInfoDxe/PlatformInfoDxe.inf
   $(PLATFORM_PACKAGE)/PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf
   $(PLATFORM_PACKAGE)/PlatformDxe/PlatformDxe.inf
-  $(PLATFORM_PACKAGE)/PlatformRtcRuntimeDxe/PlatformRtcRuntimeDxe.inf

-  

+  $(PLATFORM_PACKAGE)/PlatformRtcRuntimeDxe/PlatformRtcRuntimeDxe.inf
+  
 
   $(PLATFORM_PACKAGE)/PciPlatform/PciPlatform.inf
   $(PLATFORM_PACKAGE)/SaveMemoryConfig/SaveMemoryConfig.inf
@@ -1484,7 +1476,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
     <LibraryClasses>
       TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf
   }
-  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf

+  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
 !endif
 
 #
@@ -1611,22 +1603,8 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
 # capsule related drivers
 #
 IntelFrameworkModulePkg/Universal/FirmwareVolume/FwVolDxe/FwVolDxe.inf
-!if $(ESRT_ENABLE) == TRUE
-  $(PLATFORM_PACKAGE)/UpdateDriverDxe/UpdateDriverDxe.inf{
-     !if $(TARGET) == DEBUG
-    <LibraryClasses>
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-	  SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf
-    !endif
-  }
-!else
-  IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.inf
-!endif
+
 MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf
-!if $(ESRT_ENABLE) == TRUE
-  $(PLATFORM_PACKAGE)/PlatformEsrt/PlatformEsrtDxe.inf
-  $(PLATFORM_PACKAGE)/FmpSample/FmpSample.inf
-!endif
 
   Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.inf
   Vlv2TbltDevicePkg/Application/SsdtUpdate/SsdtUpdate.inf