public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Michael D Kinney" <michael.d.kinney@intel.com>
To: devel@edk2.groups.io
Cc: Zailiang Sun <zailiang.sun@intel.com>,
	Yi Qian <yi.qian@intel.com>, Gary Lin <glin@suse.com>
Subject: [edk2-platforms Patch V2 3/5] Vlv2TbltDevicePkg: Remove Linux/GCC specific DSC/FDF files
Date: Thu, 18 Jul 2019 23:02:45 -0700	[thread overview]
Message-ID: <20190719060247.10132-4-michael.d.kinney@intel.com> (raw)
In-Reply-To: <20190719060247.10132-1-michael.d.kinney@intel.com>

* Consolidate DSC/FDF files to remove Linux/GCC specific
  ones.  Since the FCE tool is no longer required, the
  FDF files for building under all supported Host OS
  environments are now the same.

* Update the IA32 and X64 build output directories to use
  a consistent naming convention.

* Make small adjustment to FV layout so everything still
  fits when SOURCE_DEBUG_ENABLE is TRUE.

* Remove unused directories that are not referenced by
  any DSC/FDF files.

Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Gary Lin <glin@suse.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Zailiang Sun <zailiang.sun@intel.com>
---
 .../SystemFirmwareDescriptor.aslc             |   83 --
 .../SystemFirmwareDescriptor.inf              |   40 -
 .../SystemFirmwareDescriptorPei.c             |   60 -
 .../SystemFirmwareUpdateConfig.ini            |   66 -
 .../SystemFirmwareUpdateConfigGcc.ini         |   66 -
 .../Vlv2TbltDevicePkg/PlatformCapsule.fdf     |    6 +-
 .../Vlv2TbltDevicePkg/PlatformCapsuleGcc.fdf  |   52 -
 ...CapsuleGcc.dsc => PlatformCapsuleIA32.dsc} |    7 +-
 ...formCapsule.dsc => PlatformCapsuleX64.dsc} |    4 +-
 .../Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf   |    8 +-
 .../Vlv2TbltDevicePkg/PlatformPkgGcc.fdf      |  971 ------------
 .../Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc  | 1286 ----------------
 .../Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc   | 1301 -----------------
 .../Vlv2TbltDevicePkg/PlatformPkgIA32.dsc     |   60 +-
 .../Vlv2TbltDevicePkg/PlatformPkgX64.dsc      |   62 +-
 Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat  |   20 +-
 Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh   |   24 +-
 17 files changed, 89 insertions(+), 4027 deletions(-)
 delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
 delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
 delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
 delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
 delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfigGcc.ini
 delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsuleGcc.fdf
 rename Platform/Intel/Vlv2TbltDevicePkg/{PlatformCapsuleGcc.dsc => PlatformCapsuleIA32.dsc} (90%)
 rename Platform/Intel/Vlv2TbltDevicePkg/{PlatformCapsule.dsc => PlatformCapsuleX64.dsc} (91%)
 delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
 delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
 delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
deleted file mode 100644
index 884da36b97..0000000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.aslc
+++ /dev/null
@@ -1,83 +0,0 @@
-/** @file
-  System Firmware descriptor.
-
-  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
-  SPDX-License-Identifier: BSD-2-Clause-Patent
-
-**/
-
-#include <PiPei.h>
-#include <Protocol/FirmwareManagement.h>
-#include <Guid/EdkiiSystemFmpCapsule.h>
-
-#define PACKAGE_VERSION                     0xFFFFFFFF
-#define PACKAGE_VERSION_STRING              L"Unknown"
-
-#define CURRENT_FIRMWARE_VERSION            0x00000002
-#define CURRENT_FIRMWARE_VERSION_STRING     L"0x00000002"
-#define LOWEST_SUPPORTED_FIRMWARE_VERSION   0x00000001
-
-#define IMAGE_ID                            SIGNATURE_64('V', 'L', 'V', '2', '_', '_', 'F', 'd')
-#define IMAGE_ID_STRING                     L"Vlv2Fd"
-
-// PcdSystemFmpCapsuleImageTypeIdGuid
-#define IMAGE_TYPE_ID_GUID                  { 0x4096267b, 0xda0a, 0x42eb, { 0xb5, 0xeb, 0xfe, 0xf3, 0x1d, 0x20, 0x7c, 0xb4 } }
-
-typedef struct {
-  EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR  Descriptor;
-  // real string data
-  CHAR16                                  ImageIdNameStr[sizeof(IMAGE_ID_STRING)/sizeof(CHAR16)];
-  CHAR16                                  VersionNameStr[sizeof(CURRENT_FIRMWARE_VERSION_STRING)/sizeof(CHAR16)];
-  CHAR16                                  PackageVersionNameStr[sizeof(PACKAGE_VERSION_STRING)/sizeof(CHAR16)];
-} IMAGE_DESCRIPTOR;
-
-IMAGE_DESCRIPTOR mImageDescriptor =
-{
-  {
-    EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR_SIGNATURE,
-    sizeof(EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR),
-    sizeof(IMAGE_DESCRIPTOR),
-    PACKAGE_VERSION,                                       // PackageVersion
-    OFFSET_OF (IMAGE_DESCRIPTOR, PackageVersionNameStr),   // PackageVersionName
-    1,                                                     // ImageIndex;
-    {0x0},                                                 // Reserved
-    IMAGE_TYPE_ID_GUID,                                    // ImageTypeId;
-    IMAGE_ID,                                              // ImageId;
-    OFFSET_OF (IMAGE_DESCRIPTOR, ImageIdNameStr),          // ImageIdName;
-    CURRENT_FIRMWARE_VERSION,                              // Version;
-    OFFSET_OF (IMAGE_DESCRIPTOR, VersionNameStr),          // VersionName;
-    {0x0},                                                 // Reserved2
-    FixedPcdGet32(PcdFlashAreaSize),                       // Size;
-    IMAGE_ATTRIBUTE_IMAGE_UPDATABLE |
-      IMAGE_ATTRIBUTE_RESET_REQUIRED |
-      IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED |
-      IMAGE_ATTRIBUTE_IN_USE,                              // AttributesSupported;
-    IMAGE_ATTRIBUTE_IMAGE_UPDATABLE |
-      IMAGE_ATTRIBUTE_RESET_REQUIRED |
-      IMAGE_ATTRIBUTE_AUTHENTICATION_REQUIRED |
-      IMAGE_ATTRIBUTE_IN_USE,                              // AttributesSetting;
-    0x0,                                                   // Compatibilities;
-    LOWEST_SUPPORTED_FIRMWARE_VERSION,                     // LowestSupportedImageVersion;
-    0x00000000,                                            // LastAttemptVersion;
-    0,                                                     // LastAttemptStatus;
-    {0x0},                                                 // Reserved3
-    0,                                                     // HardwareInstance;
-  },
-  // real string data
-  {IMAGE_ID_STRING},
-  {CURRENT_FIRMWARE_VERSION_STRING},
-  {PACKAGE_VERSION_STRING},
-};
-
-
-VOID*
-ReferenceAcpiTable (
-  VOID
-  )
-{
-  //
-  // Reference the table being generated to prevent the optimizer from
-  // removing the data structure from the executable
-  //
-  return (VOID*)&mImageDescriptor;
-}
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
deleted file mode 100644
index dd85c86d95..0000000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf
+++ /dev/null
@@ -1,40 +0,0 @@
-## @file
-#  System Firmware descriptor.
-#
-#  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
-#  SPDX-License-Identifier: BSD-2-Clause-Patent
-#
-##
-
-[Defines]
-  INF_VERSION                    = 0x00010005
-  BASE_NAME                      = SystemFirmwareDescriptor
-  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
-
-[LibraryClasses]
-  PcdLib
-  PeiServicesLib
-  DebugLib
-  PeimEntryPoint
-
-[FixedPcd]
-  gPlatformModuleTokenSpaceGuid.PcdFlashAreaSize
-
-[Pcd]
-  gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareImageDescriptor
-
-[Depex]
-  TRUE
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
deleted file mode 100644
index d21ee52184..0000000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptorPei.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/** @file
-  System Firmware descriptor producer.
-
-  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
-  SPDX-License-Identifier: BSD-2-Clause-Patent
-
-**/
-
-#include <PiPei.h>
-#include <Library/PcdLib.h>
-#include <Library/PeiServicesLib.h>
-#include <Library/DebugLib.h>
-#include <Protocol/FirmwareManagement.h>
-#include <Guid/EdkiiSystemFmpCapsule.h>
-
-/**
-  Entrypoint for SystemFirmwareDescriptor PEIM.
-
-  @param[in]  FileHandle  Handle of the file being invoked.
-  @param[in]  PeiServices Describes the list of possible PEI Services.
-
-  @retval EFI_SUCCESS            PPI successfully installed.
-**/
-EFI_STATUS
-EFIAPI
-SystemFirmwareDescriptorPeimEntry (
-  IN EFI_PEI_FILE_HANDLE     FileHandle,
-  IN CONST EFI_PEI_SERVICES  **PeiServices
-  )
-{
-  EFI_STATUS                              Status;
-  EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR  *Descriptor;
-  UINTN                                   Size;
-  UINTN                                   Index;
-  UINT32                                  AuthenticationStatus;
-
-  //
-  // 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;
-    }
-    Index++;
-  }
-
-  DEBUG((DEBUG_INFO, "EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR size - 0x%x\n", Descriptor->Length));
-
-  Size = Descriptor->Length;
-  PcdSetPtrS (PcdEdkiiSystemFirmwareImageDescriptor, &Size, Descriptor);
-
-  return EFI_SUCCESS;
-}
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
deleted file mode 100644
index 126cd123b1..0000000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
+++ /dev/null
@@ -1,66 +0,0 @@
-## @file
-#
-#  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
-#  SPDX-License-Identifier: BSD-2-Clause-Patent
-#
-##
-
-[Head]
-NumOfUpdate = 6
-NumOfRecovery = 1
-Update0 = Vlv2FvMicrocode
-Update1 = Vlv2FvBinary
-Update2 = Vlv2FvMain
-Update3 = Vlv2FvRecovery2
-Update4 = Vlv2FvRecovery
-Update5 = Vlv2FvNvRam
-Recovery0 = Vlv2FvMain
-
-[Vlv2FvMicrocode]
-FirmwareType = 0            # SystemFirmware
-AddressType = 0             # 0 - relative address, 1 - absolute address.
-BaseAddress = 0x00000000    # Base address offset on flash
-Length      = 0x00040000    # Length
-ImageOffset = 0x00000000    # Image offset of this SystemFirmware image
-FileGuid    = AF9C9EB2-12AD-4D3E-A4D4-96F6C9966215  # PcdEdkiiSystemFirmwareFileGuid
-
-[Vlv2FvNvRam]
-FirmwareType = 1            # NvRam
-AddressType = 0             # 0 - relative address, 1 - absolute address.
-BaseAddress = 0x00040000    # Base address offset on flash
-Length      = 0x00080000    # Length
-ImageOffset = 0x00040000    # Image offset of this SystemFirmware image
-FileGuid    = AF9C9EB2-12AD-4D3E-A4D4-96F6C9966215  # PcdEdkiiSystemFirmwareFileGuid
-
-[Vlv2FvBinary]
-FirmwareType = 0            # SystemFirmware
-AddressType = 0             # 0 - relative address, 1 - absolute address.
-BaseAddress = 0x000C0000    # Base address offset on flash
-Length      = 0x00050000    # Length
-ImageOffset = 0x000C0000    # Image offset of this SystemFirmware image
-FileGuid    = AF9C9EB2-12AD-4D3E-A4D4-96F6C9966215  # PcdEdkiiSystemFirmwareFileGuid
-
-[Vlv2FvMain]
-FirmwareType = 0            # SystemFirmware
-AddressType = 0             # 0 - relative address, 1 - absolute address.
-BaseAddress = 0x00110000    # Base address offset on flash
-Length      = 0x00210000    # Length
-ImageOffset = 0x00110000    # Image offset of this SystemFirmware image
-FileGuid    = AF9C9EB2-12AD-4D3E-A4D4-96F6C9966215  # PcdEdkiiSystemFirmwareFileGuid
-
-[Vlv2FvRecovery2]
-FirmwareType = 0            # SystemFirmware
-AddressType = 0             # 0 - relative address, 1 - absolute address.
-BaseAddress = 0x00320000    # Base address offset on flash
-Length      = 0x00070000    # Length
-ImageOffset = 0x00320000    # Image offset of this SystemFirmware image
-FileGuid    = AF9C9EB2-12AD-4D3E-A4D4-96F6C9966215  # PcdEdkiiSystemFirmwareFileGuid
-
-[Vlv2FvRecovery]
-FirmwareType = 0            # SystemFirmware
-AddressType = 0             # 0 - relative address, 1 - absolute address.
-BaseAddress = 0x00390000    # Base address offset on flash
-Length      = 0x00070000    # Length
-ImageOffset = 0x00390000    # Image offset of this SystemFirmware image
-FileGuid    = AF9C9EB2-12AD-4D3E-A4D4-96F6C9966215  # PcdEdkiiSystemFirmwareFileGuid
-
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfigGcc.ini b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfigGcc.ini
deleted file mode 100644
index e22f136f8e..0000000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfigGcc.ini
+++ /dev/null
@@ -1,66 +0,0 @@
-## @file
-#
-#  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
-#  SPDX-License-Identifier: BSD-2-Clause-Patent
-#
-##
-
-[Head]
-NumOfUpdate = 6
-NumOfRecovery = 1
-Update0 = Vlv2FvMicrocode
-Update1 = Vlv2FvBinary
-Update2 = Vlv2FvMain
-Update3 = Vlv2FvRecovery2
-Update4 = Vlv2FvRecovery
-Update5 = Vlv2FvNvRam
-Recovery0 = Vlv2FvMain
-
-[Vlv2FvMicrocode]
-FirmwareType = 0            # SystemFirmware
-AddressType = 0             # 0 - relative address, 1 - absolute address.
-BaseAddress = 0x00000000    # Base address offset on flash
-Length      = 0x00040000    # Length
-ImageOffset = 0x00000000    # Image offset of this SystemFirmware image
-FileGuid    = AF9C9EB2-12AD-4D3E-A4D4-96F6C9966215  # PcdEdkiiSystemFirmwareFileGuid
-
-[Vlv2FvNvRam]
-FirmwareType = 1            # NvRam
-AddressType = 0             # 0 - relative address, 1 - absolute address.
-BaseAddress = 0x00040000    # Base address offset on flash
-Length      = 0x00080000    # Length
-ImageOffset = 0x00040000    # Image offset of this SystemFirmware image
-FileGuid    = AF9C9EB2-12AD-4D3E-A4D4-96F6C9966215  # PcdEdkiiSystemFirmwareFileGuid
-
-[Vlv2FvBinary]
-FirmwareType = 0            # SystemFirmware
-AddressType = 0             # 0 - relative address, 1 - absolute address.
-BaseAddress = 0x000C0000    # Base address offset on flash
-Length      = 0x00050000    # Length
-ImageOffset = 0x000C0000    # Image offset of this SystemFirmware image
-FileGuid    = AF9C9EB2-12AD-4D3E-A4D4-96F6C9966215  # PcdEdkiiSystemFirmwareFileGuid
-
-[Vlv2FvMain]
-FirmwareType = 0            # SystemFirmware
-AddressType = 0             # 0 - relative address, 1 - absolute address.
-BaseAddress = 0x00110000    # Base address offset on flash
-Length      = 0x00215000    # Length
-ImageOffset = 0x00110000    # Image offset of this SystemFirmware image
-FileGuid    = AF9C9EB2-12AD-4D3E-A4D4-96F6C9966215  # PcdEdkiiSystemFirmwareFileGuid
-
-[Vlv2FvRecovery2]
-FirmwareType = 0            # SystemFirmware
-AddressType = 0             # 0 - relative address, 1 - absolute address.
-BaseAddress = 0x00325000    # Base address offset on flash
-Length      = 0x0006B000    # Length
-ImageOffset = 0x00325000    # Image offset of this SystemFirmware image
-FileGuid    = AF9C9EB2-12AD-4D3E-A4D4-96F6C9966215  # PcdEdkiiSystemFirmwareFileGuid
-
-[Vlv2FvRecovery]
-FirmwareType = 0            # SystemFirmware
-AddressType = 0             # 0 - relative address, 1 - absolute address.
-BaseAddress = 0x00390000    # Base address offset on flash
-Length      = 0x00070000    # Length
-ImageOffset = 0x00390000    # Image offset of this SystemFirmware image
-FileGuid    = AF9C9EB2-12AD-4D3E-A4D4-96F6C9966215  # PcdEdkiiSystemFirmwareFileGuid
-
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsule.fdf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsule.fdf
index 43dd987eaf..d8b0074d6a 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsule.fdf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsule.fdf
@@ -1,7 +1,7 @@
 ## @file
 # FDF file of Platform capsule.
 #
-# Copyright (c) 2016 Intel Corporation.
+# Copyright (c) 2016 - 2019, Intel Corporation.
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -29,10 +29,6 @@ [FV.SystemFirmwareUpdateCargo]
     $(WORKSPACE)/$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/FV/Vlv.ROM
   }
 
-FILE RAW = 812136D3-4D3A-433A-9418-29BB9BF78F6E { # gEdkiiSystemFmpCapsuleConfigFileGuid
-    Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini
-  }
-
 [FmpPayload.FmpPayloadSystemFirmwareRsa2048]
 IMAGE_HEADER_INIT_VERSION = 0x02
 IMAGE_TYPE_ID             = 4096267b-da0a-42eb-b5eb-fef31d207cb4 # PcdSystemFmpCapsuleImageTypeIdGuid
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsuleGcc.fdf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsuleGcc.fdf
deleted file mode 100644
index 7917be3d68..0000000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsuleGcc.fdf
+++ /dev/null
@@ -1,52 +0,0 @@
-## @file
-# FDF file of Platform capsule.
-#
-# Copyright (c) 2016 Intel Corporation.
-#
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-#
-##
-
-[FV.SystemFirmwareUpdateCargo]
-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 RAW = AF9C9EB2-12AD-4D3E-A4D4-96F6C9966215 { # PcdEdkiiSystemFirmwareFileGuid
-    $(WORKSPACE)/$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/FV/Vlv.ROM
-  }
-
-FILE RAW = 812136D3-4D3A-433A-9418-29BB9BF78F6E { # gEdkiiSystemFmpCapsuleConfigFileGuid
-    Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfigGcc.ini
-  }
-
-[FmpPayload.FmpPayloadSystemFirmwareRsa2048]
-IMAGE_HEADER_INIT_VERSION = 0x02
-IMAGE_TYPE_ID             = 4096267b-da0a-42eb-b5eb-fef31d207cb4 # PcdSystemFmpCapsuleImageTypeIdGuid
-IMAGE_INDEX               = 0x1
-HARDWARE_INSTANCE         = 0x0
-MONOTONIC_COUNT           = 0x2
-CERTIFICATE_GUID          = A7717414-C616-4977-9420-844712A735BF # RSA2048SHA256
-
-FILE DATA = $(WORKSPACE)/$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/FV/SYSTEMFIRMWAREUPDATECARGO.Fv
-
-[Capsule.Vlv2Rec]
-CAPSULE_GUID                = 6dcbd5ed-e82d-4c44-bda1-7194199ad92a # gEfiFmpCapsuleGuid
-CAPSULE_FLAGS               = PersistAcrossReset,InitiateReset
-CAPSULE_HEADER_SIZE         = 0x20
-CAPSULE_HEADER_INIT_VERSION = 0x1
-
-FMP_PAYLOAD = FmpPayloadSystemFirmwareRsa2048
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsuleGcc.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsuleIA32.dsc
similarity index 90%
rename from Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsuleGcc.dsc
rename to Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsuleIA32.dsc
index 1856ac349b..bcac59f00a 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsuleGcc.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsuleIA32.dsc
@@ -1,18 +1,19 @@
 #/** @file
 # Platform capsule description.
 #
-# Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
+#
 #**/
 
 [Defines]
   PLATFORM_NAME                  = Vlv2TbltDevicePkg
   PLATFORM_GUID                  = EE87F258-6ECC-4415-B1D8-23771BEE26E7
   PLATFORM_VERSION               = 0.1
-  FLASH_DEFINITION               = Vlv2TbltDevicePkg/PlatformCapsuleGcc.fdf
-  OUTPUT_DIRECTORY               = Build/Vlv2TbltDevicePkg
+  FLASH_DEFINITION               = Vlv2TbltDevicePkg/PlatformCapsule.fdf
+  OUTPUT_DIRECTORY               = Build/Vlv2TbltDevicePkgIA32
   SUPPORTED_ARCHITECTURES        = IA32|X64
   BUILD_TARGETS                  = DEBUG|RELEASE
   SKUID_IDENTIFIER               = DEFAULT
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsule.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsuleX64.dsc
similarity index 91%
rename from Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsule.dsc
rename to Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsuleX64.dsc
index 524bb74e2a..11d50666c0 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsule.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsuleX64.dsc
@@ -1,7 +1,7 @@
 #/** @file
 # Platform capsule description.
 #
-# Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -13,7 +13,7 @@ [Defines]
   PLATFORM_GUID                  = EE87F258-6ECC-4415-B1D8-23771BEE26E7
   PLATFORM_VERSION               = 0.1
   FLASH_DEFINITION               = Vlv2TbltDevicePkg/PlatformCapsule.fdf
-  OUTPUT_DIRECTORY               = Build/Vlv2TbltDevicePkg
+  OUTPUT_DIRECTORY               = Build/Vlv2TbltDevicePkgX64
   SUPPORTED_ARCHITECTURES        = IA32|X64
   BUILD_TARGETS                  = DEBUG|RELEASE
   SKUID_IDENTIFIER               = DEFAULT
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
index c59973cbe9..e958c1ebf2 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -28,13 +28,13 @@ [Defines]
 DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE     = 0x00040000
 
 DEFINE FLASH_REGION_FVMAIN_OFFSET                             = 0x00510000
-DEFINE FLASH_REGION_FVMAIN_SIZE                               = 0x00210000
+DEFINE FLASH_REGION_FVMAIN_SIZE                               = 0x00220000
 
-DEFINE FLASH_REGION_VPD_OFFSET                                = 0x00720000
+DEFINE FLASH_REGION_VPD_OFFSET                                = 0x00730000
 DEFINE FLASH_REGION_VPD_SIZE                                  = 0x00010000
 
-DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET                       = 0x00730000
-DEFINE FLASH_REGION_FV_RECOVERY2_SIZE                         = 0x00060000
+DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET                       = 0x00740000
+DEFINE FLASH_REGION_FV_RECOVERY2_SIZE                         = 0x00050000
 
 DEFINE FLASH_REGION_FV_RECOVERY_OFFSET                        = 0x00790000
 DEFINE FLASH_REGION_FV_RECOVERY_SIZE                          = 0x00070000
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
deleted file mode 100644
index c59973cbe9..0000000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ /dev/null
@@ -1,971 +0,0 @@
-#/** @file
-# FDF file of Platform.
-#
-# Copyright (c) 2008 - 2019, Intel Corporation. All rights reserved.<BR>
-#
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-#
-#
-#**/
-
-[Defines]
-DEFINE FLASH_BASE       = 0xFF800000     #The base address of the 8Mb FLASH Device.
-DEFINE FLASH_SIZE       = 0x00800000     #The flash size in bytes of the 8Mb FLASH Device.
-DEFINE FLASH_BLOCK_SIZE = 0x1000         #The block size in bytes of the 8Mb FLASH Device.
-DEFINE FLASH_NUM_BLOCKS = 0x800          #The number of blocks in 8Mb FLASH Device.
-
-DEFINE FLASH_REGION_VLVMICROCODE_OFFSET                       = 0x00400000
-DEFINE FLASH_REGION_VLVMICROCODE_SIZE                         = 0x00040000
-DEFINE FLASH_REGION_VLVMICROCODE_BASE                         = 0xFFC00000
-
-DEFINE FLASH_REGION_NV_STORAGE_VARIABLE_OFFSET                = 0x00440000
-DEFINE FLASH_REGION_NV_STORAGE_VARIABLE_SIZE                  = 0x0003E000
-
-DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_OFFSET = 0x0047E000
-DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_SIZE   = 0x00002000
-
-DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET   = 0x00480000
-DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE     = 0x00040000
-
-DEFINE FLASH_REGION_FVMAIN_OFFSET                             = 0x00510000
-DEFINE FLASH_REGION_FVMAIN_SIZE                               = 0x00210000
-
-DEFINE FLASH_REGION_VPD_OFFSET                                = 0x00720000
-DEFINE FLASH_REGION_VPD_SIZE                                  = 0x00010000
-
-DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET                       = 0x00730000
-DEFINE FLASH_REGION_FV_RECOVERY2_SIZE                         = 0x00060000
-
-DEFINE FLASH_REGION_FV_RECOVERY_OFFSET                        = 0x00790000
-DEFINE FLASH_REGION_FV_RECOVERY_SIZE                          = 0x00070000
-
-################################################################################
-#
-# FD Section
-# The [FD] Section is made up of the definition statements and a
-# description of what goes into  the Flash Device Image.  Each FD section
-# defines one flash "device" image.  A flash device image may be one of
-# the following: Removable media bootable image (like a boot floppy
-# image,) an Option ROM image (that would be "flashed" into an add-in
-# card,) a System "Flash"  image (that would be burned into a system's
-# flash) or an Update ("Capsule") image that will be used to update and
-# existing system flash.
-#
-################################################################################
-[FD.Vlv]
-BaseAddress   = $(FLASH_BASE)|gPlatformModuleTokenSpaceGuid.PcdFlashAreaBaseAddress #The base address of the 3Mb FLASH Device.
-Size          = $(FLASH_SIZE)|gPlatformModuleTokenSpaceGuid.PcdFlashAreaSize        #The flash size in bytes of the 3Mb FLASH Device.
-ErasePolarity = 1
-BlockSize     = $(FLASH_BLOCK_SIZE)          #The block size in bytes of the 3Mb FLASH Device.
-NumBlocks     = $(FLASH_NUM_BLOCKS)          #The number of blocks in 3Mb FLASH Device.
-
-#
-#Flash location override based on actual flash map
-#
-SET gPlatformModuleTokenSpaceGuid.PcdFlashAreaBaseAddress            = $(FLASH_BASE)
-SET gPlatformModuleTokenSpaceGuid.PcdFlashAreaSize                   = $(FLASH_SIZE)
-
-SET gPlatformModuleTokenSpaceGuid.PcdBiosRomBase                     = $(FLASH_BASE)
-SET gPlatformModuleTokenSpaceGuid.PcdBiosRomSize                     = $(FLASH_SIZE)
-
-SET gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchAddress = $(FLASH_REGION_VLVMICROCODE_BASE) + 0x60
-SET gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize = $(FLASH_REGION_VLVMICROCODE_SIZE) - 0x60
-
-################################################################################
-#
-# Following are lists of FD Region layout which correspond to the locations of different
-# images within the flash device.
-#
-# Regions must be defined in ascending order and may not overlap.
-#
-# A Layout Region start with a eight digit hex offset (leading "0x" required) followed by
-# the pipe "|" character, followed by the size of the region, also in hex with the leading
-# "0x" characters. Like:
-# Offset|Size
-# PcdOffsetCName|PcdSizeCName
-# RegionType <FV, DATA, or FILE>
-# Fv Size can be adjusted; FVMAIN_COMPACT can be reduced to 0x120000, and FV_RECOVERY can be enlarged to 0x80000
-#
-################################################################################
-
-  #
-  # IFWI Header
-  #
-0x0000|0x1000
-FILE=Vlv2TbltDevicePkg/Stitch/IFWIHeader/IFWI_HEADER.bin
-
-  #
-  # CPU Microcodes
-  #
-
-$(FLASH_REGION_VLVMICROCODE_OFFSET)|$(FLASH_REGION_VLVMICROCODE_SIZE)
-gPlatformModuleTokenSpaceGuid.PcdFlashMicroCodeAddress|gPlatformModuleTokenSpaceGuid.PcdFlashMicroCodeSize
-FV = MICROCODE_FV
-$(FLASH_REGION_NV_STORAGE_VARIABLE_OFFSET)|$(FLASH_REGION_NV_STORAGE_VARIABLE_SIZE)
-gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
-#NV_VARIABLE_STORE
-DATA = {
-  ## This is the EFI_FIRMWARE_VOLUME_HEADER
-  # ZeroVector []
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  # FileSystemGuid: gEfiSystemNvDataFvGuid         =
-  #  { 0xFFF12B8D, 0x7696, 0x4C8B, { 0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50 }}
-  0x8D, 0x2B, 0xF1, 0xFF, 0x96, 0x76, 0x8B, 0x4C,
-  0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50,
-  # FvLength: 0x80000
-  0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
-  #Signature "_FVH"       #Attributes
-  0x5f, 0x46, 0x56, 0x48, 0xff, 0xfe, 0x04, 0x00,
-  #HeaderLength #CheckSum #ExtHeaderOffset #Reserved #Revision
-  0x48, 0x00, 0x2A, 0x09, 0x00, 0x00, 0x00, 0x02,
-  #Blockmap[0]: 7 Blocks * 0x10000 Bytes / Block
-  0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
-  #Blockmap[1]: End
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  ## This is the VARIABLE_STORE_HEADER
-!if $(SECURE_BOOT_ENABLE) == TRUE
-  #Signature: gEfiAuthenticatedVariableGuid =
-  #  { 0xaaf32c78, 0x947b, 0x439a, { 0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92 }}
-  0x78, 0x2c, 0xf3, 0xaa, 0x7b, 0x94, 0x9a, 0x43,
-  0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92,
-!else
-  #Signature: gEfiVariableGuid =
-  #  { 0xddcf3616, 0x3275, 0x4164, { 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d }}
-  0x16, 0x36, 0xcf, 0xdd, 0x75, 0x32, 0x64, 0x41,
-  0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d,
-!endif
-  #Size: 0x3E000 (gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize) - 0x48 (size of EFI_FIRMWARE_VOLUME_HEADER) = 0x03DFB8
-  # This can speed up the Variable Dispatch a bit.
-  0xB8, 0xDF, 0x03, 0x00,
-  #FORMATTED: 0x5A #HEALTHY: 0xFE #Reserved: UINT16 #Reserved1: UINT32
-  0x5A, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-}
-
-
-$(FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_OFFSET)|$(FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_SIZE)
-gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
-#NV_FTW_WORKING
-DATA = {
-  # EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER->Signature = gEdkiiWorkingBlockSignatureGuid         =
-  #  { 0x9e58292b, 0x7c68, 0x497d, { 0xa0, 0xce, 0x65,  0x0, 0xfd, 0x9f, 0x1b, 0x95 }}
-  0x2B, 0x29, 0x58, 0x9E, 0x68, 0x7C, 0x7D, 0x49,
-  0xA0, 0xCE, 0x65, 0x0,  0xFD, 0x9F, 0x1B, 0x95,
-
-  # Crc:UINT32            #WorkingBlockValid:1, WorkingBlockInvalid:1, Reserved
-  0xE2, 0x33, 0xF2, 0x3,  0xFE, 0xFF, 0xFF, 0xFF,
-  # WriteQueueSize: UINT64 #Size: 0x2000 - 0x20 (FTW_WORKING_HEADER) = 0x1FE0
-  0xE0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-}
-
-$(FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET)|$(FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE)
-gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
-
-  #
-  # Main Block
-  #
-$(FLASH_REGION_FVMAIN_OFFSET)|$(FLASH_REGION_FVMAIN_SIZE)
-gPlatformModuleTokenSpaceGuid.PcdFlashFvMainBase|gPlatformModuleTokenSpaceGuid.PcdFlashFvMainSize
-FV = FVMAIN_COMPACT
-
-$(FLASH_REGION_VPD_OFFSET)|$(FLASH_REGION_VPD_SIZE)
-gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress
-FILE = $(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/FV/8C3D856A-9BE6-468E-850A-24F7A8D38E08.bin
-
-  #
-  # FV Recovery#2
-  #
-$(FLASH_REGION_FV_RECOVERY2_OFFSET)|$(FLASH_REGION_FV_RECOVERY2_SIZE)
-gPlatformModuleTokenSpaceGuid.PcdFlashFvRecovery2Base|gPlatformModuleTokenSpaceGuid.PcdFlashFvRecovery2Size
-FV = FVRECOVERY2
-
-  #
-  # FV Recovery
-  #
-$(FLASH_REGION_FV_RECOVERY_OFFSET)|$(FLASH_REGION_FV_RECOVERY_SIZE)
-gPlatformModuleTokenSpaceGuid.PcdFlashFvRecoveryBase|gPlatformModuleTokenSpaceGuid.PcdFlashFvRecoverySize
-FV = FVRECOVERY
-
-################################################################################
-#
-# FV Section
-#
-# [FV] section is used to define what components or modules are placed within a flash
-# device file.  This section also defines order the components and modules are positioned
-# within the image.  The [FV] section consists of define statements, set statements and
-# module statements.
-#
-################################################################################
-[FV.MICROCODE_FV]
-BlockSize          = $(FLASH_BLOCK_SIZE)
-FvAlignment        = 16
-ERASE_POLARITY     = 1
-MEMORY_MAPPED      = TRUE
-STICKY_WRITE       = TRUE
-LOCK_CAP           = TRUE
-LOCK_STATUS        = FALSE
-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 RAW = 197DB236-F856-4924-90F8-CDF12FB875F3 {
-  $(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/$(DXE_ARCHITECTURE)/MicrocodeUpdates.bin
-}
-
-!if $(RECOVERY_ENABLE)
-[FV.FVRECOVERY_COMPONENTS]
-FvAlignment        = 16         #FV alignment and FV attributes setting.
-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
-
-INF  RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchUsb.inf
-INF  MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf
-INF  MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf
-INF  MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.inf
-INF  FatPkg/FatPei/FatPei.inf
-INF  MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf
-INF  SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.inf
-!endif
-
-################################################################################
-#
-# FV Section
-#
-# [FV] section is used to define what components or modules are placed within a flash
-# device file.  This section also defines order the components and modules are positioned
-# within the image.  The [FV] section consists of define statements, set statements and
-# module statements.
-#
-################################################################################
-[FV.FVRECOVERY2]
-BlockSize          = $(FLASH_BLOCK_SIZE)
-FvAlignment        = 16         #FV alignment and FV attributes setting.
-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
-FvNameGuid         = B73FE497-B92E-416e-8326-45AD0D270092
-
-
-
-INF Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf
-
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchSmbusArpDisabled.inf
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/VlvInitPeim.inf
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchInitPeim.inf
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchSpiPeim.inf
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PeiSmmAccess.inf
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PeiSmmControl.inf
-INF UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
-INF UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.inf
-
-!if $(TPM_ENABLED) == TRUE
-INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
-INF SecurityPkg/Tcg/TcgPei/TcgPei.inf
-INF SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf
-!endif
-INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
-
-!if $(ACPI50_ENABLE) == TRUE
- INF MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.inf
-!endif
-!if $(PERFORMANCE_ENABLE) == TRUE
-INF MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
-!endif
-
-!if $(RECOVERY_ENABLE)
-FILE FV_IMAGE = 1E9D7604-EF45-46a0-BD8A-71AC78C17AC1 {
-  SECTION PEI_DEPEX_EXP = {gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid}
-  SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF {    # LZMA COMPRESS GUID
-    SECTION FV_IMAGE = FVRECOVERY_COMPONENTS
-  }
-}
-!endif
-
-[FV.FVRECOVERY]
-BlockSize          = $(FLASH_BLOCK_SIZE)
-FvAlignment        = 16         #FV alignment and FV attributes setting.
-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
-FvNameGuid         = B73FE497-B92E-416e-8326-45AD0D270091
-
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/SecCore.inf
-INF MdeModulePkg/Core/Pei/PeiMain.inf
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/CpuPeim.inf
-INF MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf
-INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
-
-INF Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf
-
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/SeCUma.inf
-
-!if $(SOURCE_DEBUG_ENABLE) == TRUE
-  INF  SourceLevelDebugPkg/DebugAgentPei/DebugAgentPei.inf
-!endif
-
-
-!if $(CAPSULE_ENABLE) == TRUE
-INF  MdeModulePkg/Universal/CapsulePei/CapsulePei.inf
-!if $(DXE_ARCHITECTURE) == "X64"
-INF  MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf
-!endif
-!endif
-
-!if $(PCIESC_ENABLE) == TRUE
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchEarlyInitPeim.inf
-!endif
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/MemoryInit.inf
-
-INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
-
-[FV.FVMAIN]
-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
-FvNameGuid         = A881D567-6CB0-4eee-8435-2E72D33E45B5
-
-APRIORI DXE {
-  INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
-  INF  MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
-  INF  MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
-  }
-
-#
-# gBiosIdGuid
-#
-FILE FREEFORM = C3E36D09-8294-4b97-A857-D5288FE33E28 {
-    SECTION RAW = $(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/BiosId.bin
-  }
-
-  #
-  # EDK II Related Platform codes
-  #
-
-INF MdeModulePkg/Core/Dxe/DxeMain.inf
-INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
-!if $(ACPI50_ENABLE) == TRUE
-INF  MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
-INF  MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
-!endif
-
-
-INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
-INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
-INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
-INF MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
-INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
-INF UefiCpuPkg/CpuDxe/CpuDxe.inf
-INF UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf
-INF MdeModulePkg/Universal/Metronome/Metronome.inf
-INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
-INF MdeModulePkg/Logo/LogoDxe.inf
-INF MdeModulePkg/Application/UiApp/UiApp.inf
-INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
-INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
-INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
-
-INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
-INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf
-INF Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmm.inf
-INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSpiSmm.inf
-!if $(SECURE_BOOT_ENABLE)
-INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
-!endif
-
-INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
-
-INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
-INF PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
-INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
-INF Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbRuntimeDxe.inf
-
-
-INF Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf
-
-INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
-
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/Dptf.inf
-
-  #
-  # EDK II Related Silicon codes
-  #
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchS3SupportDxe.inf
-
-INF PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SmmControl.inf
-
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSmbusDxe.inf
-
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchReset.inf
-
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchInitDxe.inf
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchInitSmm.inf
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSmiDispatcher.inf
-!if $(PCIESC_ENABLE) == TRUE
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchPcieSmm.inf
-!endif
-
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSpiRuntime.inf
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchPolicyInitDxe.inf
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchBiosWriteProtect.inf
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SmmAccess.inf
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PciHostBridge.inf
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/VlvInitDxe.inf
-!if $(TPM_ENABLED) == TRUE
-INF SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf
-INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
-INF RuleOverride = DRIVER_ACPITABLE SecurityPkg/Tcg/TcgSmm/TcgSmm.inf
-!endif
-
-#
-# EDK II Related Platform codes
-#
-INF Vlv2TbltDevicePkg/PlatformSmm/PlatformSmm.inf
-INF Vlv2TbltDevicePkg/PlatformInfoDxe/PlatformInfoDxe.inf
-INF Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf
-INF Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf
-INF Vlv2TbltDevicePkg/PciPlatform/PciPlatform.inf
-INF Vlv2TbltDevicePkg/SaveMemoryConfig/SaveMemoryConfig.inf
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PlatformCpuPolicy.inf
-INF Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf
-!if $(GOP_DRIVER_ENABLE) == TRUE
- INF Vlv2TbltDevicePkg/PlatformGopPolicy/PlatformGopPolicy.inf
- FILE DRIVER = FF0C8745-3270-4439-B74F-3E45F8C77064 {
-  SECTION DXE_DEPEX_EXP = {gPlatformGOPPolicyGuid}
-  SECTION PE32 = Vlv2SocBinPkg/GOP/7.2.1011/RELEASE_VS2008x86/$(DXE_ARCHITECTURE)/IntelGopDriver.efi
-  SECTION UI = "IntelGopDriver"
-}
-!endif
-
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PnpDxe.inf
-  #
-  # SMM
-  #
-INF MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
-INF MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
-INF UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
-
-INF UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
-INF MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf
-INF UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf
-
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PowerManagement2.inf
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/DigitalThermalSensor.inf
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/GraphicDxeInitSmm.inf
-
-  #
-  # ACPI
-  #
-INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
-INF MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
-INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
-INF RuleOverride = ACPITABLE2 Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/PowerManagement/AcpiTables/PowerManagementAcpiTables.inf
-
-INF RuleOverride = ACPITABLE Vlv2DeviceRefCodePkg/AcpiTablesPCAT/AcpiTables.inf
-
-INF Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf
-
-INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
-
-  #
-  # PCI
-  #
-INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
-
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/ISPDxe.inf
-
-
-#
-# ISA
-#
-INF Vlv2TbltDevicePkg/PcuSio/PcuSio.inf
-!if $(SOURCE_DEBUG_ENABLE) != TRUE
-INF  MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf
-!endif
-
-#
-# eMMC/SD Card
-#
-INF MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
-INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
-INF MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
-
-#
-# IDE/SCSI/AHCI
-#
-INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
-
-INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
-
-INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
-!if $(SATA_ENABLE) == TRUE
-INF RuleOverride = BINARY Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SataController.inf
-#
-
-#
-INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
-INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
-!if $(SCSI_ENABLE) == TRUE
-INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
-INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
-!endif
-#
-!endif
-# Console
-#
-INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
-INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
-INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
-INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
-INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
-INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
-INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
-  #
-  # USB
-  #
-!if $(USB_ENABLE) == TRUE
-INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
-INF MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
-INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
-INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
-INF MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
-INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
-INF MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
-!endif
-
-
-  #
-  # SMBIOS
-  #
-INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
-INF Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf
-
-#
-# FAT file system
-#
-INF FatPkg/EnhancedFatDxe/Fat.inf
-
-#
-# UEFI Shell
-#
-INF  ShellPkg/Application/Shell/Shell.inf
-
-#
-# dp command
-#
-!if $(PERFORMANCE_ENABLE) == TRUE
-INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf
-!endif
-
-!if $(GOP_DRIVER_ENABLE) == TRUE
-FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
-  SECTION RAW = Vlv2SocBinPkg/GOP/7.2.1011/VBT/MNW2/Vbt.bin
-  SECTION UI = "IntelGopVbt"
-}
-!endif
-
-#
-# Network Modules
-#
-!include NetworkPkg/Network.fdf.inc
-
-!if $(NETWORK_ENABLE) == TRUE
-  FILE DRIVER = 22DE1691-D65D-456a-993E-A253DD1F308C {
-    SECTION PE32 = Vlv2SocBinPkg/UNDI/RtkUndiDxe/$(DXE_ARCHITECTURE)/RtkUndiDxe.efi
-    SECTION UI = "RtkUndiDxe"
-  }
-  !if $(DXE_ARCHITECTURE) == "X64"
-    FILE DRIVER = 7C7467E9-8BB3-4BF1-8694-6FED7D25D13E {
-      SECTION PE32 = Vlv2SocBinPkg/UNDI/I211PcieUndiDxe/$(DXE_ARCHITECTURE)/E7006X3.EFI
-      SECTION UI = "E7006X3"
-    }
-  !endif
-!endif
-
-!if $(CAPSULE_ENABLE)
-INF  MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf
-
-#
-# Minnow Max System Firmware FMP
-#
-INF  FILE_GUID = $(FMP_MINNOW_MAX_SYSTEM) FmpDevicePkg/FmpDxe/FmpDxe.inf
-
-#
-# Sample Device FMP
-#
-INF  FILE_GUID = $(FMP_GREEN_SAMPLE_DEVICE) FmpDevicePkg/FmpDxe/FmpDxe.inf
-INF  FILE_GUID = $(FMP_BLUE_SAMPLE_DEVICE)  FmpDevicePkg/FmpDxe/FmpDxe.inf
-INF  FILE_GUID = $(FMP_RED_SAMPLE_DEVICE)   FmpDevicePkg/FmpDxe/FmpDxe.inf
-
-!endif
-
-!if $(MICOCODE_CAPSULE_ENABLE)
-INF  IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.inf
-!endif
-
-!if $(RECOVERY_ENABLE)
-FILE FREEFORM = PCD(gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiRsa2048Sha256TestPublicKeyFileGuid) {
-     SECTION RAW = BaseTools/Source/Python/Rsa2048Sha256Sign/TestSigningPublicKey.bin
-     SECTION UI = "Rsa2048Sha256TestSigningPublicKey"
-     }
-!endif
-
-[FV.FVMAIN_COMPACT]
-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 = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
-!if $(LZMA_ENABLE) == TRUE
-# LZMA Compress
-       SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE {
-          SECTION FV_IMAGE = FVMAIN
-       }
-!else
-!if $(DXE_COMPRESS_ENABLE) == TRUE
-# Tiano Compress
-       SECTION GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {
-          SECTION FV_IMAGE = FVMAIN
-       }
-!else
-# No Compress
-       SECTION COMPRESS PI_NONE {
-          SECTION FV_IMAGE = FVMAIN
-       }
-!endif
-!endif
-     }
-
-[FV.SETUP_DATA]
-BlockSize          = $(FLASH_BLOCK_SIZE)
-#NumBlocks         = 0x10
-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
-
-################################################################################
-#
-# Rules are use with the [FV] section's module INF type to define
-# how an FFS file is created for a given INF file. The following Rule are the default
-# rules for the different module type. User can add the customized rules to define the
-# content of the FFS file.
-#
-################################################################################
-[Rule.Common.SEC]
-  FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED {
-    PE32  PE32    Align = 8       $(INF_OUTPUT)/$(MODULE_NAME).efi
-    RAW BIN       Align = 16      |.com
-  }
-
-[Rule.Common.SEC.BINARY]
-  FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED {
-    PE32  PE32    Align = 8       |.efi
-    RAW   BIN     Align = 16      |.com
-  }
-
-[Rule.Common.PEI_CORE]
-  FILE PEI_CORE = $(NAMED_GUID)            {
-    PE32       PE32    Align = Auto      $(INF_OUTPUT)/$(MODULE_NAME).efi
-    UI       STRING="$(MODULE_NAME)" Optional
-    VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.PEIM]
-  FILE PEIM = $(NAMED_GUID) {
-     PEI_DEPEX PEI_DEPEX Optional        $(INF_OUTPUT)/$(MODULE_NAME).depex
-     PE32        PE32   Align = Auto     $(INF_OUTPUT)/$(MODULE_NAME).efi
-     UI        STRING="$(MODULE_NAME)" Optional
-     VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.PEIM.BINARY]
-  FILE PEIM = $(NAMED_GUID) {
-     PEI_DEPEX PEI_DEPEX Optional        |.depex
-     PE32        PE32   Align = Auto     |.efi
-     UI        STRING="$(MODULE_NAME)" Optional
-     VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.PEIM.BIOSID]
-  FILE PEIM = $(NAMED_GUID) {
-     RAW       BIN                       BiosId.bin
-     PEI_DEPEX PEI_DEPEX Optional        $(INF_OUTPUT)/$(MODULE_NAME).depex
-     PE32        PE32   Align = Auto     $(INF_OUTPUT)/$(MODULE_NAME).efi
-     UI        STRING="$(MODULE_NAME)" Optional
-     VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.USER_DEFINED.APINIT]
-  FILE RAW = $(NAMED_GUID) Fixed Align=4K {
-     RAW SEC_BIN |.com
-     }
-#cjia 2011-07-21
-[Rule.Common.USER_DEFINED.LEGACY16]
-  FILE FREEFORM = $(NAMED_GUID) {
-     UI  STRING="$(MODULE_NAME)" Optional
-     RAW BIN |.bin
-     }
-#cjia
-
-[Rule.Common.USER_DEFINED.ASM16]
-  FILE FREEFORM = $(NAMED_GUID) {
-     UI  STRING="$(MODULE_NAME)" Optional
-     RAW BIN |.com
-   }
-
-[Rule.Common.DXE_CORE]
-  FILE DXE_CORE = $(NAMED_GUID) {
-    PE32      PE32                     $(INF_OUTPUT)/$(MODULE_NAME).efi
-    UI        STRING="$(MODULE_NAME)" Optional
-    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.UEFI_DRIVER]
-  FILE DRIVER = $(NAMED_GUID) {
-    DXE_DEPEX DXE_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.UEFI_DRIVER.BINARY]
-  FILE DRIVER = $(NAMED_GUID) {
-    DXE_DEPEX DXE_DEPEX Optional       |.depex
-    PE32      PE32                     |.efi
-    UI        STRING="$(MODULE_NAME)" Optional
-    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.UEFI_DRIVER.NATIVE_BINARY]
-  FILE DRIVER = $(NAMED_GUID) {
-    DXE_DEPEX DXE_DEPEX Optional      $(WORKSPACE)/Vlv2TbltDevicePkg/IntelGopDepex/IntelGopDriver.depex
-    PE32      PE32                    |.efi
-    UI        STRING="$(MODULE_NAME)" Optional
-    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.DXE_DRIVER]
-  FILE DRIVER = $(NAMED_GUID) {
-    DXE_DEPEX DXE_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.DXE_DRIVER.BINARY]
-  FILE DRIVER = $(NAMED_GUID) {
-    DXE_DEPEX DXE_DEPEX Optional       |.depex
-    PE32      PE32                     |.efi
-    UI        STRING="$(MODULE_NAME)" Optional
-    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.DXE_DRIVER.DRIVER_ACPITABLE]
-  FILE DRIVER = $(NAMED_GUID) {
-    DXE_DEPEX DXE_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)
-    RAW ACPI  Optional                |.acpi
-    RAW ASL   Optional                |.aml
-  }
-
-[Rule.Common.DXE_RUNTIME_DRIVER]
-  FILE DRIVER = $(NAMED_GUID) {
-    DXE_DEPEX DXE_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.DXE_RUNTIME_DRIVER.BINARY]
-  FILE DRIVER = $(NAMED_GUID) {
-    DXE_DEPEX DXE_DEPEX Optional       |.depex
-    PE32      PE32                     |.efi
-    UI        STRING="$(MODULE_NAME)" Optional
-    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.DXE_SMM_DRIVER]
-  FILE SMM = $(NAMED_GUID) {
-    DXE_DEPEX DXE_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.DXE_SMM_DRIVER.BINARY]
-  FILE SMM = $(NAMED_GUID) {
-    SMM_DEPEX SMM_DEPEX                |.depex
-    PE32      PE32                     |.efi
-    RAW       BIN  Optional            |.aml
-    UI        STRING="$(MODULE_NAME)" Optional
-    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.DXE_SMM_DRIVER.DRIVER_ACPITABLE]
-  FILE SMM = $(NAMED_GUID) {
-    DXE_DEPEX DXE_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)
-    RAW ACPI  Optional                |.acpi
-    RAW ASL   Optional                |.aml
-  }
-
-[Rule.Common.SMM_CORE]
-  FILE SMM_CORE = $(NAMED_GUID) {
-    DXE_DEPEX DXE_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.SMM_CORE.BINARY]
-  FILE SMM_CORE = $(NAMED_GUID) {
-    DXE_DEPEX DXE_DEPEX Optional       |.depex
-    PE32      PE32                     |.efi
-    UI        STRING="$(MODULE_NAME)" Optional
-    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.UEFI_APPLICATION]
-  FILE APPLICATION = $(NAMED_GUID) {
-    DXE_DEPEX DXE_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.UEFI_APPLICATION.UI]
-  FILE APPLICATION = $(NAMED_GUID) {
-    PE32      PE32                     $(INF_OUTPUT)/$(MODULE_NAME).efi
-    UI        STRING="Enter Setup"
-    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
-
-[Rule.Common.USER_DEFINED]
-  FILE FREEFORM = $(NAMED_GUID) {
-    UI  STRING="$(MODULE_NAME)" Optional
-    RAW BIN                |.bin
-  }
-
-[Rule.Common.USER_DEFINED.BINARY]
-  FILE FREEFORM = $(NAMED_GUID) {
-    UI  STRING="$(MODULE_NAME)" Optional
-    RAW BIN                |.bin
-  }
-
-[Rule.Common.USER_DEFINED.ACPITABLE]
-  FILE FREEFORM = $(NAMED_GUID) {
-    RAW ACPI  Optional            |.acpi
-    RAW ASL   Optional            |.aml
-  }
-
-[Rule.Common.USER_DEFINED.ACPITABLE2]
-  FILE FREEFORM = $(NAMED_GUID) {
-    RAW ASL   Optional            |.aml
-  }
-
-[Rule.Common.ACPITABLE]
-  FILE FREEFORM = $(NAMED_GUID) {
-    RAW ACPI  Optional            |.acpi
-    RAW ASL   Optional            |.aml
-  }
-
-[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    Align=4K          $(INF_OUTPUT)/$(MODULE_NAME).efi
-     UI       STRING="$(MODULE_NAME)" Optional
-     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
-  }
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
deleted file mode 100644
index 43b340fdee..0000000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
+++ /dev/null
@@ -1,1286 +0,0 @@
-#/** @file
-# Platform description.
-#
-# Copyright (c) 2012  - 2019, Intel Corporation. All rights reserved.<BR>
-#
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-#
-#
-#**/
-
-################################################################################
-#
-# Defines Section - statements that will be processed to create a Makefile.
-#
-################################################################################
-[Defines]
-  PLATFORM_NAME                       = Vlv2TbltDevicePkg
-  PLATFORM_GUID                       = 465B0A0B-7AC1-443b-8F67-7B8DEC145F90
-  PLATFORM_VERSION                    = 0.1
-  DSC_SPECIFICATION                   = 0x00010005
-  OUTPUT_DIRECTORY                    = Build/Vlv2TbltDevicePkgIA32
-  SUPPORTED_ARCHITECTURES             = IA32
-  BUILD_TARGETS                       = DEBUG|RELEASE
-  SKUID_IDENTIFIER                    = DEFAULT
-  VPD_TOOL_GUID                       = 8C3D856A-9BE6-468E-850A-24F7A8D38E08
-
-  DEFINE RC_BINARY_RELEASE        = TRUE
-  #
-  # Platform On/Off features are defined here
-  #
-  !include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
-
-  DEFINE      DXE_ARCHITECTURE        = IA32
-
-  FLASH_DEFINITION                    = Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
-!if $(LFMA_ENABLE) == TRUE
-  FIX_LOAD_TOP_MEMORY_ADDRESS         = 0xFFFFFFFFFFFFFFFF
-  DEFINE   TOP_MEMORY_ADDRESS         = 0xFFFFFFFFFFFFFFFF
-!else
-  FIX_LOAD_TOP_MEMORY_ADDRESS         = 0x0
-  DEFINE   TOP_MEMORY_ADDRESS         = 0x0
-!endif
-
-  DEFINE   PLATFORM_PCIEXPRESS_BASE   = 0E0000000
-
-################################################################################
-#
-# SKU Identification section - list of all SKU IDs supported by this
-#                              Platform.
-#
-################################################################################
-[SkuIds]
-  0|DEFAULT              # The entry: 0|DEFAULT is reserved and always required.
-
-[DefaultStores]
-  0|STANDARD             # UEFI Standard default  0|STANDARD is reserved.
-  1|MANUFACTURING        # UEFI Manufacturing default 1|MANUFACTURING is reserved.
-
-################################################################################
-#
-# Library Class section - list of all Library Classes needed by this Platform.
-#
-################################################################################
-[LibraryClasses.common]
-  #
-  # Entry point
-  #
-  PeiCoreEntryPoint|MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
-  PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
-  DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
-  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
-  UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
-
-  #
-  # Basic
-  #
-  BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
-!if $(SSE2_ENABLE) == TRUE
-  BaseMemoryLib|MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf
-!else
-  BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
-!endif
-  PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
-  CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
-  IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
-  PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf
-  PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
-  PciCf8Lib|MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf
-  PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf
-  CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
-  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
-  PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
-!if $(RC_BINARY_RELEASE) == TRUE
-  PchPlatformLib|Vlv2TbltDevicePkg/Library/PchPlatformLib/PchPlatformLib.inf
-!endif
-  #
-  # UEFI & PI
-  #
-  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
-  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
-  UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
-  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
-  HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
-  UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
-  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
-  UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiTianoCustomDecompressLib.inf
-  PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
-  PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
-  DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
-  DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
-  UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
-  BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupportLib.inf
-  SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
-  FlashDeviceLib|Vlv2TbltDevicePkg/Library/FlashDeviceLib/FlashDeviceLib.inf
-  UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
-  #
-  # Framework
-  #
-!if $(S3_ENABLE) == TRUE
-  S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
-!else
-  S3BootScriptLib|MdePkg/Library/BaseS3BootScriptLibNull/BaseS3BootScriptLibNull.inf
-!endif
-  S3IoLib|MdePkg/Library/BaseS3IoLib/BaseS3IoLib.inf
-  S3PciLib|MdePkg/Library/BaseS3PciLib/BaseS3PciLib.inf
-
-  #
-  # Generic Modules
-  #
-!if $(USB_ENABLE) == TRUE
-  UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
-!endif
-!if $(SCSI_ENABLE) == TRUE
-  UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
-!endif
-
-  OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
-!if $(CAPSULE_ENABLE) == TRUE
-  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf
-!else
-  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
-!endif
-  FmpAuthenticationLib|MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAuthenticationLibNull.inf
-  IniParsingLib|SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.inf
-  PlatformFlashAccessLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/PlatformFlashAccessLib/PlatformFlashAccessLib.inf
-  MicrocodeFlashAccessLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/PlatformFlashAccessLib/PlatformFlashAccessLib.inf
-  DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdateProgressLibGraphics.inf
-  SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
-  SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
-  IoApicLib|PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.inf
-  DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
-
-  #
-  # CPU
-  #
-  MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf
-  LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
-  CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf
-  MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf
-
-  #
-  # ICH
-  #
-  SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
-  SmmLib|Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.inf
-
-  #
-  # Platform
-  #
-  TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf
-  ResetSystemLib|Vlv2TbltDevicePkg/Library/ResetSystemLib/ResetSystemLib.inf
-
-  PlatformCmosLib|Vlv2TbltDevicePkg/Library/PlatformCmosLib/PlatformCmosLib.inf
-
-  #
-  # Misc
-  #
-  MonoStatusCodeLib|Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf
-!if $(TARGET) == RELEASE
-  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
-  SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
-!else
-  DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-  SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
-!endif
-
-  PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-!if $(TPM_ENABLED) == TRUE
-  TpmCommLib|SecurityPkg/Library/TpmCommLib/TpmCommLib.inf
-  Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf
-  Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
-!endif
-
-  PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf
-
-!if $(SOURCE_DEBUG_ENABLE) == TRUE
-  PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf
-  DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf
-  SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
-!else
-  PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf
-  DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
-!endif
-
-  #
-  # CryptLib
-  #
-!if $(TPM_ENABLED) == TRUE
-  TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
-!else
-  TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
-!endif
-
- BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf
-
-  StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
-
-!if $(SECURE_BOOT_ENABLE) == TRUE
-  PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
-  AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf
-!else
-  AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
-!endif
-
-  FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
-
-  VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
-  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
-  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
-  SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
-  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
-  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-!if $(NETWORK_TLS_ENABLE) == TRUE
-  TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
-!endif
-  Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
-  Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
-  Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf
-
-  BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
-
-[LibraryClasses.IA32.SEC]
-!if $(PERFORMANCE_ENABLE) == TRUE
-  PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
-!endif
-  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-
-[LibraryClasses.IA32.PEIM, LibraryClasses.IA32.PEI_CORE, LibraryClasses.IA32.SEC]
-  #
-  # PEI phase common
-  #
-
-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-  HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
-  MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
-  ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
-  ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
-  MultiPlatformLib|Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatformLib.inf
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
-  CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
-  MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf
-
-!if $(PERFORMANCE_ENABLE) == TRUE
-  PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
-  TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf
-!endif
-
-!if $(TARGET) == RELEASE
-  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
-  SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
-!else
-  DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
-  SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
-!endif
-
-  LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf
-  HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf
-!if $(SOURCE_DEBUG_ENABLE) == TRUE
-  DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf
-!endif
-
-[LibraryClasses.IA32]
-  #
-  # DXE phase common
-  #
-  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
-  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
-  ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
-  ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
-
-  Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf
-!if $(TPM_ENABLED) == TRUE
-  TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf
-!endif
-
-  LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
-  EfiRegTableLib|Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.inf
-  HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf
-
-[LibraryClasses.IA32.DXE_DRIVER]
-  DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-  PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
-  CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
-!if $(PERFORMANCE_ENABLE) == TRUE
-  PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
-  TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf
-!endif
-
-!if $(SOURCE_DEBUG_ENABLE) == TRUE
-  DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf
-!endif
-
-  FlashDeviceLib|Vlv2TbltDevicePkg/Library/FlashDeviceLib/FlashDeviceLibDxe.inf
-
-[LibraryClasses.IA32.DXE_CORE]
-  HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
-  MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-!if $(PERFORMANCE_ENABLE) == TRUE
-  PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
-  TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf
-!endif
-
-!if $(SOURCE_DEBUG_ENABLE) == TRUE
-  DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf
-!endif
-
-[LibraryClasses.IA32.DXE_SMM_DRIVER]
-  MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.inf
-  SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf
-  ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf
-  MemoryAllocationLib|MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAllocationLib.inf
-  LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.inf
-  PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
-  SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf
-  SmmCpuPlatformHookLib|UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.inf
-  SmmCpuFeaturesLib|UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf
-
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
-  !if $(TARGET) != RELEASE
-  DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-  !endif
-
-!if $(SOURCE_DEBUG_ENABLE) == TRUE
-  DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.inf
-  TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf
-!endif
-  CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf
-
-!if $(TPM_ENABLED) == TRUE
-  TcgPpVendorLib|SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.inf
-!endif
-
-[LibraryClasses.IA32.SMM_CORE]
-  MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf
-  SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf
-  ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf
-  SmmCorePlatformHookLib|MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.inf
-  SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf
-
-!if $(TPM_ENABLED) == TRUE
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
-!endif
-
-  PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
-
-!if $(TARGET) != RELEASE
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-!endif
-
-[LibraryClasses.IA32.DXE_RUNTIME_DRIVER]
-  ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
-!if $(SECURE_BOOT_ENABLE) == TRUE || $(TPM_ENABLED) == TRUE
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
-!endif
-
-!if $(SOURCE_DEBUG_ENABLE) == TRUE
-  DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf
-!endif
-
-!if $(CAPSULE_ENABLE) == TRUE
-  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf
-!endif
-
-[LibraryClasses.common.UEFI_DRIVER]
-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-
-!if $(SOURCE_DEBUG_ENABLE) == TRUE
-  DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf
-!endif
-
-[LibraryClasses.IA32.UEFI_APPLICATION]
-  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-
-!if $(SOURCE_DEBUG_ENABLE) == TRUE
-  DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf
-!endif
-
-################################################################################
-#
-# Pcd Section - list of all EDK II PCD Entries defined by this Platform
-#
-################################################################################
-[PcdsFeatureFlag.common]
-!if $(MINI_BIOS_ENABLE) == FALSE
-  gPlatformModuleTokenSpaceGuid.PcdBdsDispatchAdditionalOprom|TRUE
-!else
-  gPlatformModuleTokenSpaceGuid.PcdBdsDispatchAdditionalOprom|FALSE
-!endif
-#
-# If PcdDxeIplSwitchToLongMode is TRUE, DxeIpl will load a 64-bit DxeCore and switch to long mode to hand over to DxeCore.
-#
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE
-
-  gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserGrayOutTextStatement|TRUE
-
-!if $(CAPSULE_RESET_ENABLE) == TRUE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|TRUE
-!else
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|FALSE
-!endif
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst|FALSE
-!if $(TARGET) == RELEASE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
-!else
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
-!endif
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE
-!if $(ISA_SERIAL_STATUS_CODE_ENABLE) == TRUE
-  gEfiSerialPortTokenSpaceGuid.PcdStatusCodeUseIsaSerial|TRUE
-!else
-  gEfiSerialPortTokenSpaceGuid.PcdStatusCodeUseIsaSerial|FALSE
-!endif
-!if $(USB_SERIAL_STATUS_CODE_ENABLE) == TRUE
-  gEfiSerialPortTokenSpaceGuid.PcdStatusCodeUseUsbSerial|TRUE
-!else
-  gEfiSerialPortTokenSpaceGuid.PcdStatusCodeUseUsbSerial|FALSE
-!endif
-!if $(RAM_SERIAL_STATUS_CODE_ENABLE) == TRUE
-  gEfiSerialPortTokenSpaceGuid.PcdStatusCodeUseRam|TRUE
-!else
-  gEfiSerialPortTokenSpaceGuid.PcdStatusCodeUseRam|FALSE
-!endif
-
-
-!if $(VARIABLE_INFO_ENABLE) == TRUE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics|TRUE
-!else
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics|FALSE
-!endif
-
-!if $(SOURCE_DEBUG_ENABLE)
-  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmDebug|TRUE
-!endif
-
-  gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE
-  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp|TRUE
-
-[PcdsFixedAtBuild.common]
-!if $(SECURE_BOOT_ENABLE) == TRUE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x22000
-!else
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x4000
-!endif
-  gEfiMdeModulePkgTokenSpaceGuid.PcdHwErrStorageSize|0x00000800
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize|0x400
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport|FALSE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAriSupport|FALSE
-!if $(S4_ENABLE) == TRUE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|TRUE
-!else
-  gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE
-!endif
-!if $(TARGET) == RELEASE
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0
-  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x3
-!else
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F
-  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07
-!endif
-!if $(PERFORMANCE_ENABLE) == TRUE
-  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask|0x1
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPerformanceLogEntries|60
-!endif
-
-  gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable|$(TOP_MEMORY_ADDRESS)
-  gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserSubtitleTextColor|0x0
-  gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserFieldTextColor|0x01
-
-!if $(SOURCE_DEBUG_ENABLE) == TRUE
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
-  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl|FALSE
-  gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|2
-!endif
-
-  #
-  # Set SMM stack size to 16 KB.
-  #
-  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000
-
-  gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }
-
-  #
-  # Clear unused single certificate PCD
-  #
-  gEfiSecurityPkgTokenSpaceGuid.PcdPkcs7CertBuffer|{0}
-
-  #
-  # Lock all updatable firmware devices at End of DXE
-  #
-  gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceLockEventGuid|{GUID(gEfiEndOfDxeEventGroupGuid)}
-#  gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceLockEventGuid|{GUID(gEfiEventReadyToBootGuid)}
-
-  #
-  # Set PcdFmpDeviceTestKeySha256Digest to {0} to disable test key detection
-  #
-#  gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceTestKeySha256Digest|{0}
-
-[PcdsFixedAtBuild.IA32]
-!if $(TARGET) == RELEASE
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0
-  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x3
-!else
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
-  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07
-!endif
-
-!if $(RECOVERY_ENABLE)
-  gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryFileName|L"VLV2REC.Cap"
-!endif
-
-[PcdsPatchableInModule.common]
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x803805c6
-  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x$(PLATFORM_PCIEXPRESS_BASE)
-
-  #######################################################################################################
-  #
-  # Begin of MRC parameters
-  #
-
-  ## Memory Parameter Patchable.
-  #  FALSE - MRC Parameters are fixed for MinnowBoard Max<BR>
-  #  TRUE  - MRC Parameters are patchable by following PCDs<BR>
-  # @Prompt Memory Parameter Patchable.
-  # @ValidList 0x80000001 | 0, 1
-  gVlvRefCodePkgTokenSpaceGuid.PcdMemoryParameterPatchable|FALSE
-
-  ## Memory Down or DIMM slot.
-  #  0 - DIMM<BR>
-  #  1 - Memory Down<BR>
-  # @Prompt Enable Memory Down
-  # @ValidList 0x80000001 | 0, 1
-  gVlvRefCodePkgTokenSpaceGuid.PcdEnableMemoryDown|1
-
-  ## The speed of DRAM.
-  #  0 - 800 MHz<BR>
-  #  1 - 1066 MHz<BR>
-  #  2 - 1333 MHz<BR>
-  #  3 - 1600 MHz<BR>
-  # @Prompt DRAM Speed
-  # @ValidList 0x80000001 | 0, 1, 2, 3
-  gVlvRefCodePkgTokenSpaceGuid.PcdDramSpeed|1
-
-  ## DRAM Type.
-  #  0 - DDR3<BR>
-  #  1 - DDR3L<BR>
-  #  2 - DDR3U<BR>
-  #  3 - DDR3All<BR>
-  #  4 - LPDDR2<BR>
-  #  5 - LPDDR3<BR>
-  #  6 - DDR4<BR>
-  # @Prompt DRAM Type
-  # @ValidList 0x80000001 | 0, 1, 2, 3, 4, 5, 6
-  gVlvRefCodePkgTokenSpaceGuid.PcdDramType|1
-
-  ## Please populate DIMM slot 0 if only one DIMM is supported.
-  #  0 - Disable<BR>
-  #  1 - Enable<BR>
-  # @Prompt DIMM 0 Enable
-  # @ValidList 0x80000001 | 0, 1
-  gVlvRefCodePkgTokenSpaceGuid.PcdEnableDimm0|1
-
-  ## DIMM 1 has to be identical to DIMM 0.
-  #  0 - Disable<BR>
-  #  1 - Enable<BR>
-  # @Prompt DIMM 1 Enable Type
-  # @ValidList 0x80000001 | 0, 1
-  gVlvRefCodePkgTokenSpaceGuid.PcdEnableDimm1|0
-
-  ## DRAM device data width.
-  #  0 - x8<BR>
-  #  1 - x16<BR>
-  #  2 - x32<BR>
-  # @Prompt DIMM_DWIDTH
-  # @ValidList 0x80000001 | 0, 1, 2
-  gVlvRefCodePkgTokenSpaceGuid.PcdDimmDataWidth|1
-
-  ## DRAM device data density.
-  #  0 - 1 Gbit<BR>
-  #  1 - 2 Gbit<BR>
-  #  2 - 4 Gbit<BR>
-  #  3 - 8 Gbit<BR>
-  # @Prompt DIMM_Density
-  # @ValidList 0x80000001 | 0, 1, 2, 3
-  gVlvRefCodePkgTokenSpaceGuid.PcdDimmDensity|2
-
-  ## DRAM device data bus width.
-  #  0 - 8 bits<BR>
-  #  1 - 16 bits<BR>
-  #  2 - 32 bits<BR>
-  #  3 - 64 bits<BR>
-  # @Prompt DIMM_BusWidth
-  # @ValidList 0x80000001 | 0, 1, 2, 3
-  gVlvRefCodePkgTokenSpaceGuid.PcdDimmBusWidth|3
-
-  ## Ranks Per DIMM or Sides Per DIMM.
-  #  0 - 1 Rank<BR>
-  #  1 - 2 Ranks<BR>
-  # @Prompt DIMM_Sides
-  # @ValidList 0x80000001 | 0, 1
-  gVlvRefCodePkgTokenSpaceGuid.PcdRankPerDimm|0
-
-  ## tCL.<BR><BR>
-  # @Prompt tCL
-  gVlvRefCodePkgTokenSpaceGuid.PcdTcl|11
-
-  ## tRP and tRCD in DRAM clk - 5:12.5ns, 6:15ns, etc.
-  # @Prompt tRP_tRCD
-  gVlvRefCodePkgTokenSpaceGuid.PcdTrpTrcd|11
-
-  ## tWR in DRAM clk.
-  # @Prompt tWR
-  gVlvRefCodePkgTokenSpaceGuid.PcdTwr|12
-
-  ## tWTR in DRAM clk.
-  # @Prompt tWTR
-  gVlvRefCodePkgTokenSpaceGuid.PcdTwtr|6
-
-  ## tRRD in DRAM clk.
-  # @Prompt tRRD
-  gVlvRefCodePkgTokenSpaceGuid.PcdTrrd|6
-
-  ## tRTP in DRAM clk.
-  # @Prompt tRTP
-  gVlvRefCodePkgTokenSpaceGuid.PcdTrtp|6
-
-  ## tFAW in DRAM clk.
-  # @Prompt tFAW
-  gVlvRefCodePkgTokenSpaceGuid.PcdTfaw|32
-
-  #
-  # End of MRC parameters.
-  #
-  ###############################################################################################
-
-[PcdsDynamicHii.common.DEFAULT]
-  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5 # Variable: L"Timeout"
-  gEfiMdePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSupport"|gEfiGlobalVariableGuid|0x0|1 # Variable: L"HwErrRecSupport"
-  gPlatformModuleTokenSpaceGuid.PcdBootState|L"BootState"|gPlatformModuleTokenSpaceGuid|0x0|TRUE
-
-[PcdsDynamicDefault.common.DEFAULT]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0x0
-  !if $(TPM_ENABLED) == TRUE
-    gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x7b, 0x3a, 0xcd, 0x72, 0xA5, 0xFE, 0x5e, 0x4f, 0x91, 0x65, 0x4d, 0xd1, 0x21, 0x87, 0xbb, 0x13}
-  !endif
-
-  ## This PCD defines the video horizontal resolution.
-  #  This PCD could be set to 0 then video resolution could be at highest resolution.
-  #gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|0
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|800
-  ## This PCD defines the video vertical resolution.
-  #  This PCD could be set to 0 then video resolution could be at highest resolution.
-  #gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|0
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|600
-
-  ## This PCD defines the Console output column and the default value is 25 according to UEFI spec.
-  #  This PCD could be set to 0 then console output could be at max column and max row.
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|31
-  ## This PCD defines the Console output row and the default value is 80 according to UEFI spec.
-  #  This PCD could be set to 0 then console output could be at max column and max row.
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|100
-
-  ## The PCD is used to specify the video horizontal resolution of text setup.
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|800
-  ## The PCD is used to specify the video vertical resolution of text setup.
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|600
-  ## The PCD is used to specify the console output column of text setup.
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutColumn|100
-  ## The PCD is used to specify the console output column of text setup.
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutRow|31
-
-!if $(TPM_ENABLED) == TRUE
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInitializationPolicy|1
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmScrtmPolicy|1
-!endif
-
-[PcdsDynamicExDefault.common.DEFAULT]
-  gEfiVLVTokenSpaceGuid.PcdTCSmbaIoBaseAddress|0x1040
-  gEfiVLVTokenSpaceGuid.PcdEmmcManufacturerId|0
-  gEfiVLVTokenSpaceGuid.PcdProductSerialNumber|0
-  gEfiVLVTokenSpaceGuid.PcdMeasuredBootEnable|TRUE
-  gEfiVLVTokenSpaceGuid.PcdFTPMErrorOccur|FALSE
-  gEfiVLVTokenSpaceGuid.PcdFTPMErrorSkip|FALSE
-  gEfiVLVTokenSpaceGuid.PcdFTPMCommand|0
-  gEfiVLVTokenSpaceGuid.PcdFTPMResponse|0
-  gEfiVLVTokenSpaceGuid.PcdFTPMNotRespond|FALSE
-  gEfiVLVTokenSpaceGuid.PcdFTPMStatus|0
-  gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateSmmDataPtr|0
-  gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0
-  gEfiVLVTokenSpaceGuid.PcdCpuLockBoxDataAddress|0
-  gEfiVLVTokenSpaceGuid.PcdCpuSmramCpuDataAddress|0
-  gEfiVLVTokenSpaceGuid.PcdCpuLockBoxSize|0
-  gEfiSecurityPkgTokenSpaceGuid.PcdUserPhysicalPresence|TRUE
-
-[PcdsDynamicExDefault.X64.DEFAULT]
-!if $(RECOVERY_ENABLE)
-  gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareFileGuid|{GUID("AF9C9EB2-12AD-4D3E-A4D4-96F6C9966215")}|VOID*|0x10
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid|{GUID("4096267b-da0a-42eb-b5eb-fef31d207cb4")}|VOID*|0x10
-!endif
-
-[PcdsDynamicExVpd.common.DEFAULT]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdNvStoreDefaultValueBuffer|*
-
-[PcdsDynamicExHii.common.DEFAULT.STANDARD]
-  !include Vlv2TbltDevicePkg/PlatformSetupDefaults.dsc
-
-[PcdsDynamicExHii.common.DEFAULT.MANUFACTURING]
-  !include Vlv2TbltDevicePkg/PlatformSetupDefaults.dsc
-
-[Components.IA32]
-
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/SecCore.inf
-
-  MdeModulePkg/Core/Pei/PeiMain.inf {
-!if $(TARGET) == DEBUG
-    <PcdsFixedAtBuild>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
-!endif
-    <PcdsPatchableInModule>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046
-  }
-
-  Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf {
-!if $(TARGET) == DEBUG
-    <PcdsFixedAtBuild>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
-!endif
-  }
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/MemoryInit.inf {
-    <PcdsPatchableInModule>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046
-  }
-
-!if $(RC_BINARY_RELEASE) == TRUE
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/SeCUma.inf
-!endif
-
-!if $(RC_BINARY_RELEASE) == TRUE
-  Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf {
-  !if $(TARGET) == DEBUG
-      <PcdsFixedAtBuild>
-        gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
-  !endif
-  }
-!endif
-
-!if $(SOURCE_DEBUG_ENABLE) == TRUE
-  SourceLevelDebugPkg/DebugAgentPei/DebugAgentPei.inf{
-    <LibraryClasses>
-      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-      DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf
-      PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf
-      SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
-    }
-!endif
-
-!if $(TPM_ENABLED) == TRUE
-  SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf
-  SecurityPkg/Tcg/TcgPei/TcgPei.inf {
-    <LibraryClasses>
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
-  }
-!endif
-
- Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf {
-    <PcdsPatchableInModule>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x803805c6
-    <LibraryClasses>
-!if $(TARGET) != RELEASE
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-!endif
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
-  }
-  Vlv2TbltDevicePkg/FvInfoPei/FvInfoPei.inf
-
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/VlvInitPeim.inf
-!if $(PCIESC_ENABLE) == TRUE
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchEarlyInitPeim.inf {
-    <PcdsPatchableInModule>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046
-  }
-!endif
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchInitPeim.inf
-
-
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchSmbusArpDisabled.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchSpiPeim.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PeiSmmAccess.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PeiSmmControl.inf
-  MdeModulePkg/Universal/PCD/Pei/Pcd.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/CpuPeim.inf
-  UefiCpuPkg/CpuIoPei/CpuIoPei.inf
-  UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
-  UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.inf
-
-!if $(RECOVERY_ENABLE)
-  #
-  # Recovery
-  #
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchUsb.inf
-  MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf
-  MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf
-  MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.inf
-  FatPkg/FatPei/FatPei.inf
-  MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf
-  SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.inf {
-    <LibraryClasses>
-      FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.inf
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
-  }
-!endif
-
-!if $(CAPSULE_ENABLE) == TRUE
-  MdeModulePkg/Universal/CapsulePei/CapsulePei.inf
-!endif
-  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf {
-    <LibraryClasses>
-!if $(LZMA_ENABLE) == TRUE
-    NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
-!endif
-  }
-
- MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
- MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf
-
-!if $(TPM_ENABLED) == TRUE
-  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf {
-    <LibraryClasses>
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
-  }
-!endif
-!if $(ACPI50_ENABLE) == TRUE
-  MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.inf{
-    <LibraryClasses>
-      TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf
-  }
-
-!endif
-!if $(PERFORMANCE_ENABLE) == TRUE
-  MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
-!endif
-[Components.IA32]
-  #
-  # EDK II Related Platform codes
-  #
-  MdeModulePkg/Core/Dxe/DxeMain.inf {
-    <PcdsPatchableInModule>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046
-    <LibraryClasses>
-!if $(DXE_CRC32_SECTION_ENABLE) == TRUE
-      NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf
-!endif
-!if $(LZMA_ENABLE) == TRUE
-      NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
-!endif
-!if $(TARGET) != RELEASE
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-!endif
-  }
-  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf {
-    <LibraryClasses>
-      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-  }
-  UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
-
-  MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
-  MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf  {
-    <LibraryClasses>
-!if $(TARGET) != RELEASE
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-!endif
-  }
-
-  MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
-  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf{
-    <LibraryClasses>
-!if $(SECURE_BOOT_ENABLE) == TRUE
-      NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
-!endif
-
-!if $(TPM_ENABLED) == TRUE
-      NULL|SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf
-!endif
-  }
-  MdeModulePkg/Universal/Metronome/Metronome.inf
-
-  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf {
-    <LibraryClasses>
-      PlatformBootManagerLib|Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf
-  }
-  MdeModulePkg/Logo/LogoDxe.inf
-  MdeModulePkg/Application/UiApp/UiApp.inf {
-    <LibraryClasses>
-      NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
-      NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf
-      NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
-  }
-
-  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
-  MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
-  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
-  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
-  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf {
-    <LibraryClasses>
-      NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
-      SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
-  }
-  Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmm.inf
-  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSpiSmm.inf
-!if $(SECURE_BOOT_ENABLE) == TRUE
-  SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf {
-    <LibraryClasses>
-      PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
-    <BuildOptions>
-      #
-      # Specify GUID gEfiIfrBootMaintenanceGuid, to install Secure Boot Configuration menu
-      # into Boot Maintenance Manager menu
-      #
-      *_*_*_VFR_FLAGS   = -g b2dedc91-d59f-48d2-898a-12490c74a4e0
-  }
-!endif
-   MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf {
-    <LibraryClasses>
-      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
-  }
-
-  MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
-  PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
-  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
-
-  Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbRuntimeDxe.inf
-
-  Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf
-
-  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchS3SupportDxe.inf
-  PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SmmControl.inf
-
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSmbusDxe.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchReset.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchInitDxe.inf{
-    <PcdsPatchableInModule>
-        gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043
-  }
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchInitSmm.inf
-
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSmiDispatcher.inf
-
-!if $(PCIESC_ENABLE) == TRUE
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchPcieSmm.inf
-!endif
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSpiRuntime.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchPolicyInitDxe.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchBiosWriteProtect.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SmmAccess.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PciHostBridge.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/VlvInitDxe.inf
-
-  #
-  # Performance Application; Set PERFORMANCE_ENABLE=TRUE for normal boot performance and smm performance data
-  #
-!if $(PERFORMANCE_ENABLE) == TRUE
-  ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf {
-    <PcdsFixedAtBuild>
-      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
-  }
-!endif
-
-  Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf{
-    <LibraryClasses>
-!if $(TARGET) != RELEASE
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-!endif
-      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-  }
-
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/Dptf.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PnpDxe.inf
-
-!if $(TPM_ENABLED) == TRUE
-  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf {
-    <LibraryClasses>
-      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-  }
-
-  SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf {
-    <LibraryClasses>
-      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-    <BuildOptions>
-      #
-      # specify GUID gEfiIfrNotInTPVPageGuid, this page will not
-      # be showed in TPV page.
-      #
-      *_*_*_VFR_FLAGS   = -g e58809f8-fbc1-48e2-883a-a30fdc4b441e
-  }
-
-  SecurityPkg/Tcg/TcgDxe/TcgDxe.inf {
-    <LibraryClasses>
-      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-  }
-  SecurityPkg/Tcg/TcgSmm/TcgSmm.inf
-!endif
-  #
-  # EDK II Related Platform codes
-  #
-  Vlv2TbltDevicePkg/PlatformSmm/PlatformSmm.inf{
-    <LibraryClasses>
-    !if $(TARGET) != RELEASE
-          DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-    !endif
-          PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-  }
-  Vlv2TbltDevicePkg/PlatformInfoDxe/PlatformInfoDxe.inf
-  Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf
-  Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf
-
-  Vlv2TbltDevicePkg/PciPlatform/PciPlatform.inf
-  Vlv2TbltDevicePkg/SaveMemoryConfig/SaveMemoryConfig.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PlatformCpuPolicy.inf
-  Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf
-!if $(GOP_DRIVER_ENABLE) == TRUE
-  Vlv2TbltDevicePkg/PlatformGopPolicy/PlatformGopPolicy.inf
-
-!endif
-
-
-  #
-  # SMM
-  #
-  MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
-  MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
-  UefiCpuPkg/CpuDxe/CpuDxe.inf
-  UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf
-  UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
-  UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
-  MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf
-  UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf
-
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PowerManagement2.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/DigitalThermalSensor.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/GraphicDxeInitSmm.inf
-
-  #
-  # ACPI
-  #
-   MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf {
-    <PcdsPatchableInModule>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043
-    <PcdsFixedAtBuild>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x27
-    <LibraryClasses>
-      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-  }
-  MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
-
-  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
-  Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/PowerManagement/AcpiTables/PowerManagementAcpiTables.inf
-
-  Vlv2DeviceRefCodePkg/AcpiTablesPCAT/AcpiTables.inf
-
-  Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf
-
-  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
-
-  #
-  # PCI
-  #
-  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
-
-
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/ISPDxe.inf
-
-
-  #
-  # ISA
-  #
-  Vlv2TbltDevicePkg/PcuSio/PcuSio.inf
-  MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf
-
-!if $(ACPI50_ENABLE) == TRUE
-  MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf {
-    <LibraryClasses>
-      TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf
-  }
-  MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf {
-    <LibraryClasses>
-      TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf
-  }
-!endif
-
-#
-# eMMC/SD Card
-#
-  MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
-  MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
-  MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
-
-#
-# IDE/SCSI/AHCI
-#
-  MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
-  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
-  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
-  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
-  FatPkg/EnhancedFatDxe/Fat.inf
-  ShellPkg/Application/Shell/Shell.inf {
-    <LibraryClasses>
-      ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
-      NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
-      NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
-      NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
-      NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
-      NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
-      NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
-      NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
-      HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
-      PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
-      BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
-    <PcdsFixedAtBuild>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF
-      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
-      gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000
-  }
-!if $(SATA_ENABLE) == TRUE
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SataController.inf
-!endif
-  MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
-!if $(SCSI_ENABLE) == TRUE
-  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
-  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
-!endif
-#
-# Console
-#
-  MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
-  MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
-  MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
-  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
-  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
-  MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
-  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
-
-  #
-  # USB
-  #
-!if $(USB_ENABLE) == TRUE
-  MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
-  MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
-  MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
-  MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
-  MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
-  MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
-  MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
-
-!endif
-
-  #
-  # SMBIOS
-  #
-  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
-  Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf
-
-  #
-  # CPU/FW Microde
-  #
-  Vlv2SocBinPkg/Microcode/MicrocodeUpdates.inf {
-    <BuildOptions>
-      *_*_*_GENFW_FLAGS = -a 0x800 -p 0xFF
-  }
-
-
-  #
-  # Network Stacks
-  #
-!include NetworkPkg/Network.dsc.inc
-
-!if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE)
-  MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf
-  MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf
-!endif
-
-!if $(CAPSULE_ENABLE)
-  !include Vlv2TbltDevicePkg/FmpMinnowMaxSystem.dsc
-  !include Vlv2TbltDevicePkg/FmpGreenSampleDevice.dsc
-  !include Vlv2TbltDevicePkg/FmpBlueSampleDevice.dsc
-  !include Vlv2TbltDevicePkg/FmpRedSampleDevice.dsc
-!endif
-
-!if $(MICOCODE_CAPSULE_ENABLE)
-  IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.inf {
-    <LibraryClasses>
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-      SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
-  }
-!endif
-
-[BuildOptions]
-#
-# Define Build Options both for EDK and EDKII drivers.
-#
-
-#
-# Define token for different Platform
-#
-!if $(CLKGEN_CONFIG_EXTRA_ENABLE) == TRUE
-  DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION = -DCLKGEN_CONFIG_EXTRA=1
-!else
-  DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =
-!endif
-
-!if $(PCIESC_ENABLE) == TRUE
-  DEFINE PCIESC_SUPPORT_BUILD_OPTION = -DPCIESC_SUPPORT=1
-!else
-  DEFINE PCIESC_SUPPORT_BUILD_OPTION =
-!endif
-
-  DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION)
-
-  GCC:*_*_*_CC_FLAGS = -Wno-missing-braces
-!if $(SOURCE_DEBUG_ENABLE) == TRUE
-  MSFT:*_*_X64_GENFW_FLAGS  = --keepexceptiontable
-  GCC:*_*_X64_GENFW_FLAGS   = --keepexceptiontable
-  INTEL:*_*_X64_GENFW_FLAGS = --keepexceptiontable
-  DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
-!else
-  DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
-!endif
-
-#
-# Force PE/COFF sections to be aligned at 4KB boundaries to support page level
-# protection of DXE_RUNTIME_DRIVER modules
-#
-[BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]
-  MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096
-  GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
-
-#
-# Force PE/COFF sections to be aligned at 4KB boundaries to support page level
-# protection of DXE_SMM_DRIVER/SMM_CORE modules
-#
-[BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE]
-  MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096
-  GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
-
-[BuildOptions.Common.EDKII]
-  *_*_IA32_CC_FLAGS      = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_IA32_VFRPP_FLAGS   = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_IA32_APP_FLAGS     = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_IA32_PP_FLAGS      = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_IA32_ASLPP_FLAGS   = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-
-  *_*_X64_CC_FLAGS       = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) $(SOURCE_LEVEL_DEBUG_BUILD_OPTIONS)
-  *_*_X64_VFRPP_FLAGS    = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_X64_APP_FLAGS      = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_X64_PP_FLAGS       = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_X64_ASLPP_FLAGS    = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
deleted file mode 100644
index 76146c7e19..0000000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ /dev/null
@@ -1,1301 +0,0 @@
-#/** @file
-# Platform description.
-#
-# Copyright (c) 2012  - 2019, Intel Corporation. All rights reserved.<BR>
-#
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-#
-#
-#**/
-
-################################################################################
-#
-# Defines Section - statements that will be processed to create a Makefile.
-#
-################################################################################
-[Defines]
-  PLATFORM_NAME                       = Vlv2TbltDevicePkg
-  PLATFORM_GUID                       = 465B0A0B-7AC1-443b-8F67-7B8DEC145F90
-  PLATFORM_VERSION                    = 0.1
-  DSC_SPECIFICATION                   = 0x00010005
-  OUTPUT_DIRECTORY                    = Build/Vlv2TbltDevicePkg
-  SUPPORTED_ARCHITECTURES             = IA32|X64
-  BUILD_TARGETS                       = DEBUG|RELEASE
-  SKUID_IDENTIFIER                    = DEFAULT
-  VPD_TOOL_GUID                       = 8C3D856A-9BE6-468E-850A-24F7A8D38E08
-
-  DEFINE RC_BINARY_RELEASE        = TRUE
-  #
-  # Platform On/Off features are defined here
-  #
-  !include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
-
-  DEFINE PLATFORMX64_ENABLE = TRUE
-
-  DEFINE      DXE_ARCHITECTURE        = X64
-
-  FLASH_DEFINITION                    = Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
-!if $(LFMA_ENABLE) == TRUE
-  FIX_LOAD_TOP_MEMORY_ADDRESS         = 0xFFFFFFFFFFFFFFFF
-  DEFINE   TOP_MEMORY_ADDRESS         = 0xFFFFFFFFFFFFFFFF
-!else
-  FIX_LOAD_TOP_MEMORY_ADDRESS         = 0x0
-  DEFINE   TOP_MEMORY_ADDRESS         = 0x0
-!endif
-
-  DEFINE   PLATFORM_PCIEXPRESS_BASE   = 0E0000000
-
-################################################################################
-#
-# SKU Identification section - list of all SKU IDs supported by this
-#                              Platform.
-#
-################################################################################
-[SkuIds]
-  0|DEFAULT              # The entry: 0|DEFAULT is reserved and always required.
-
-[DefaultStores]
-  0|STANDARD             # UEFI Standard default  0|STANDARD is reserved.
-  1|MANUFACTURING        # UEFI Manufacturing default 1|MANUFACTURING is reserved.
-
-################################################################################
-#
-# Library Class section - list of all Library Classes needed by this Platform.
-#
-################################################################################
-[LibraryClasses.common]
-  #
-  # Entry point
-  #
-  PeiCoreEntryPoint|MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
-  PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
-  DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
-  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
-  UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
-
-  #
-  # Basic
-  #
-  BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
-!if $(SSE2_ENABLE) == TRUE
-  BaseMemoryLib|MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf
-!else
-  BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
-!endif
-  PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
-  CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
-  IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
-  PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf
-  PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
-  PciCf8Lib|MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf
-  PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf
-  CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
-  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
-  PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
-!if $(RC_BINARY_RELEASE) == TRUE
-  PchPlatformLib|Vlv2TbltDevicePkg/Library/PchPlatformLib/PchPlatformLib.inf
-!endif
-  #
-  # UEFI & PI
-  #
-  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
-  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
-  UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
-  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
-  HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
-  UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
-  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
-  UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiTianoCustomDecompressLib.inf
-  PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
-  PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
-  DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
-  DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
-  UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
-  BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupportLib.inf
-  SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
-  FlashDeviceLib|Vlv2TbltDevicePkg/Library/FlashDeviceLib/FlashDeviceLib.inf
-  UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
-  #
-  # Framework
-  #
-!if $(S3_ENABLE) == TRUE
-  S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
-!else
-  S3BootScriptLib|MdePkg/Library/BaseS3BootScriptLibNull/BaseS3BootScriptLibNull.inf
-!endif
-  S3IoLib|MdePkg/Library/BaseS3IoLib/BaseS3IoLib.inf
-  S3PciLib|MdePkg/Library/BaseS3PciLib/BaseS3PciLib.inf
-
-  #
-  # Generic Modules
-  #
-!if $(USB_ENABLE) == TRUE
-  UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
-!endif
-!if $(SCSI_ENABLE) == TRUE
-  UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
-!endif
-
-  OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
-!if $(CAPSULE_ENABLE) == TRUE
-  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf
-!else
-  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
-!endif
-  FmpAuthenticationLib|MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAuthenticationLibNull.inf
-  IniParsingLib|SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.inf
-  PlatformFlashAccessLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/PlatformFlashAccessLib/PlatformFlashAccessLib.inf
-  MicrocodeFlashAccessLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/PlatformFlashAccessLib/PlatformFlashAccessLib.inf
-  DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdateProgressLibGraphics.inf
-  SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
-  SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
-  IoApicLib|PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.inf
-  DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
-
-  #
-  # CPU
-  #
-  MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf
-  LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
-  CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf
-  MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf
-
-  #
-  # ICH
-  #
-  SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
-  SmmLib|Vlv2TbltDevicePkg/Library/PchSmmLib/PchSmmLib.inf
-
-  #
-  # Platform
-  #
-  TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf
-  ResetSystemLib|Vlv2TbltDevicePkg/Library/ResetSystemLib/ResetSystemLib.inf
-
-  PlatformCmosLib|Vlv2TbltDevicePkg/Library/PlatformCmosLib/PlatformCmosLib.inf
-
-  #
-  # Misc
-  #
-  MonoStatusCodeLib|Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf
-!if $(TARGET) == RELEASE
-  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
-  SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
-!else
-  DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-  SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
-!endif
-
-  PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-!if $(TPM_ENABLED) == TRUE
-  TpmCommLib|SecurityPkg/Library/TpmCommLib/TpmCommLib.inf
-  Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf
-  Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
-!endif
-
-  PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf
-
-!if $(SOURCE_DEBUG_ENABLE) == TRUE
-  PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf
-  DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf
-  SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
-!else
-  PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf
-  DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
-!endif
-
-  #
-  # CryptLib
-  #
-!if $(TPM_ENABLED) == TRUE
-  TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
-!else
-  TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
-!endif
-
- BiosIdLib|BoardModulePkg/Library/BiosIdLib/DxeBiosIdLib.inf
-
-  StallSmmLib|Vlv2TbltDevicePkg/Library/StallSmmLib/StallSmmLib.inf
-
-!if $(SECURE_BOOT_ENABLE) == TRUE
-  PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
-  AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf
-!else
-  AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
-!endif
-
-  FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
-
-  VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
-  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
-  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
-  SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
-  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
-  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-!if $(NETWORK_TLS_ENABLE) == TRUE
-  TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
-!endif
-  Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
-  Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf
-  Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf
-
-  BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
-
-[LibraryClasses.IA32.SEC]
-!if $(PERFORMANCE_ENABLE) == TRUE
-  PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
-!endif
-  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-
-[LibraryClasses.IA32.PEIM, LibraryClasses.IA32.PEI_CORE, LibraryClasses.IA32.SEC]
-  #
-  # PEI phase common
-  #
-
-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-  HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
-  MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
-  ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
-  ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
-  MultiPlatformLib|Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatformLib.inf
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
-  CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
-  MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf
-
-!if $(PERFORMANCE_ENABLE) == TRUE
-  PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
-  TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf
-!endif
-
-!if $(TARGET) == RELEASE
-  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
-  SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
-!else
-  DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
-  SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
-!endif
-
-  LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf
-  HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf
-!if $(SOURCE_DEBUG_ENABLE) == TRUE
-  DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf
-!endif
-
-[LibraryClasses.X64]
-  #
-  # DXE phase common
-  #
-  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
-  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
-  ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
-  ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
-
-  Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf
-!if $(TPM_ENABLED) == TRUE
-  TcgPhysicalPresenceLib|SecurityPkg/Library/DxeTcgPhysicalPresenceLib/DxeTcgPhysicalPresenceLib.inf
-!endif
-
-  LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
-  EfiRegTableLib|Vlv2TbltDevicePkg/Library/EfiRegTableLib/EfiRegTableLib.inf
-  HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf
-
-[LibraryClasses.X64.DXE_DRIVER]
-  DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-  PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
-  CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
-!if $(PERFORMANCE_ENABLE) == TRUE
-  PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
-  TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf
-!endif
-
-!if $(SOURCE_DEBUG_ENABLE) == TRUE
-  DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf
-!endif
-
-  FlashDeviceLib|Vlv2TbltDevicePkg/Library/FlashDeviceLib/FlashDeviceLibDxe.inf
-
-[LibraryClasses.X64.DXE_CORE]
-  HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
-  MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-!if $(PERFORMANCE_ENABLE) == TRUE
-  PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
-  TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf
-!endif
-
-!if $(SOURCE_DEBUG_ENABLE) == TRUE
-  DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf
-!endif
-
-[LibraryClasses.X64.DXE_SMM_DRIVER]
-  MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.inf
-  SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf
-  ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf
-  MemoryAllocationLib|MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAllocationLib.inf
-  LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.inf
-  PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
-  SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf
-  SmmCpuPlatformHookLib|UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.inf
-  SmmCpuFeaturesLib|UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf
-
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
-  !if $(TARGET) != RELEASE
-  DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-  !endif
-
-!if $(SOURCE_DEBUG_ENABLE) == TRUE
-  DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.inf
-  TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf
-!endif
-  CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf
-
-!if $(TPM_ENABLED) == TRUE
-  TcgPpVendorLib|SecurityPkg/Library/TcgPpVendorLibNull/TcgPpVendorLibNull.inf
-!endif
-
-[LibraryClasses.X64.SMM_CORE]
-  MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf
-  SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf
-  ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf
-  SmmCorePlatformHookLib|MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.inf
-  SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf
-
-!if $(TPM_ENABLED) == TRUE
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
-!endif
-
-  PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
-
-!if $(TARGET) != RELEASE
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-!endif
-
-[LibraryClasses.X64.DXE_RUNTIME_DRIVER]
-  ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
-!if $(SECURE_BOOT_ENABLE) == TRUE || $(TPM_ENABLED) == TRUE
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
-!endif
-
-!if $(SOURCE_DEBUG_ENABLE) == TRUE
-  DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf
-!endif
-
-!if $(CAPSULE_ENABLE) == TRUE
-  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf
-!endif
-
-[LibraryClasses.common.UEFI_DRIVER]
-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-
-!if $(SOURCE_DEBUG_ENABLE) == TRUE
-  DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf
-!endif
-
-[LibraryClasses.X64.UEFI_APPLICATION]
-  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-
-!if $(SOURCE_DEBUG_ENABLE) == TRUE
-  DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf
-!endif
-
-################################################################################
-#
-# Pcd Section - list of all EDK II PCD Entries defined by this Platform
-#
-################################################################################
-[PcdsFeatureFlag.common]
-!if $(MINI_BIOS_ENABLE) == FALSE
-  gPlatformModuleTokenSpaceGuid.PcdBdsDispatchAdditionalOprom|TRUE
-!else
-  gPlatformModuleTokenSpaceGuid.PcdBdsDispatchAdditionalOprom|FALSE
-!endif
-#
-# If PcdDxeIplSwitchToLongMode is TRUE, DxeIpl will load a 64-bit DxeCore and switch to long mode to hand over to DxeCore.
-#
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|TRUE
-
-  gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserGrayOutTextStatement|TRUE
-
-!if $(CAPSULE_RESET_ENABLE) == TRUE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|TRUE
-!else
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|FALSE
-!endif
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst|FALSE
-!if $(TARGET) == RELEASE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
-!else
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE
-!endif
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE
-!if $(ISA_SERIAL_STATUS_CODE_ENABLE) == TRUE
-  gEfiSerialPortTokenSpaceGuid.PcdStatusCodeUseIsaSerial|TRUE
-!else
-  gEfiSerialPortTokenSpaceGuid.PcdStatusCodeUseIsaSerial|FALSE
-!endif
-!if $(USB_SERIAL_STATUS_CODE_ENABLE) == TRUE
-  gEfiSerialPortTokenSpaceGuid.PcdStatusCodeUseUsbSerial|TRUE
-!else
-  gEfiSerialPortTokenSpaceGuid.PcdStatusCodeUseUsbSerial|FALSE
-!endif
-!if $(RAM_SERIAL_STATUS_CODE_ENABLE) == TRUE
-  gEfiSerialPortTokenSpaceGuid.PcdStatusCodeUseRam|TRUE
-!else
-  gEfiSerialPortTokenSpaceGuid.PcdStatusCodeUseRam|FALSE
-!endif
-
-
-!if $(VARIABLE_INFO_ENABLE) == TRUE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics|TRUE
-!else
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics|FALSE
-!endif
-
-!if $(SOURCE_DEBUG_ENABLE)
-  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmDebug|TRUE
-!endif
-
-  gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE
-  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp|TRUE
-
-[PcdsFixedAtBuild.common]
-!if $(SECURE_BOOT_ENABLE) == TRUE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x22000
-!else
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x4000
-!endif
-  gEfiMdeModulePkgTokenSpaceGuid.PcdHwErrStorageSize|0x00000800
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize|0x400
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport|FALSE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAriSupport|FALSE
-!if $(S4_ENABLE) == TRUE
-  gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|TRUE
-!else
-  gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE
-!endif
-!if $(TARGET) == RELEASE
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0
-  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x3
-!else
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F
-  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07
-!endif
-!if $(PERFORMANCE_ENABLE) == TRUE
-  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask|0x1
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPerformanceLogEntries|60
-!endif
-
-  gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable|$(TOP_MEMORY_ADDRESS)
-  gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserSubtitleTextColor|0x0
-  gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserFieldTextColor|0x01
-
-!if $(SOURCE_DEBUG_ENABLE) == TRUE
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
-  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl|FALSE
-  gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|2
-!endif
-
-  #
-  # Set SMM stack size to 16 KB.
-  #
-  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000
-
-  gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }
-
-  #
-  # Clear unused single certificate PCD
-  #
-  gEfiSecurityPkgTokenSpaceGuid.PcdPkcs7CertBuffer|{0}
-
-  #
-  # Lock all updatable firmware devices at End of DXE
-  #
-  gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceLockEventGuid|{GUID(gEfiEndOfDxeEventGroupGuid)}
-#  gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceLockEventGuid|{GUID(gEfiEventReadyToBootGuid)}
-
-  #
-  # Set PcdFmpDeviceTestKeySha256Digest to {0} to disable test key detection
-  #
-#  gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceTestKeySha256Digest|{0}
-
-[PcdsFixedAtBuild.IA32]
-!if $(TARGET) == RELEASE
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0
-  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x3
-!else
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
-  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07
-!endif
-
-!if $(RECOVERY_ENABLE)
-  gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryFileName|L"VLV2REC.Cap"
-!endif
-
-[PcdsPatchableInModule.common]
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x803805c6
-  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x$(PLATFORM_PCIEXPRESS_BASE)
-
-  #######################################################################################################
-  #
-  # Begin of MRC parameters
-  #
-
-  ## Memory Parameter Patchable.
-  #  FALSE - MRC Parameters are fixed for MinnowBoard Max<BR>
-  #  TRUE  - MRC Parameters are patchable by following PCDs<BR>
-  # @Prompt Memory Parameter Patchable.
-  # @ValidList 0x80000001 | 0, 1
-  gVlvRefCodePkgTokenSpaceGuid.PcdMemoryParameterPatchable|FALSE
-
-  ## Memory Down or DIMM slot.
-  #  0 - DIMM<BR>
-  #  1 - Memory Down<BR>
-  # @Prompt Enable Memory Down
-  # @ValidList 0x80000001 | 0, 1
-  gVlvRefCodePkgTokenSpaceGuid.PcdEnableMemoryDown|1
-
-  ## The speed of DRAM.
-  #  0 - 800 MHz<BR>
-  #  1 - 1066 MHz<BR>
-  #  2 - 1333 MHz<BR>
-  #  3 - 1600 MHz<BR>
-  # @Prompt DRAM Speed
-  # @ValidList 0x80000001 | 0, 1, 2, 3
-  gVlvRefCodePkgTokenSpaceGuid.PcdDramSpeed|1
-
-  ## DRAM Type.
-  #  0 - DDR3<BR>
-  #  1 - DDR3L<BR>
-  #  2 - DDR3U<BR>
-  #  3 - DDR3All<BR>
-  #  4 - LPDDR2<BR>
-  #  5 - LPDDR3<BR>
-  #  6 - DDR4<BR>
-  # @Prompt DRAM Type
-  # @ValidList 0x80000001 | 0, 1, 2, 3, 4, 5, 6
-  gVlvRefCodePkgTokenSpaceGuid.PcdDramType|1
-
-  ## Please populate DIMM slot 0 if only one DIMM is supported.
-  #  0 - Disable<BR>
-  #  1 - Enable<BR>
-  # @Prompt DIMM 0 Enable
-  # @ValidList 0x80000001 | 0, 1
-  gVlvRefCodePkgTokenSpaceGuid.PcdEnableDimm0|1
-
-  ## DIMM 1 has to be identical to DIMM 0.
-  #  0 - Disable<BR>
-  #  1 - Enable<BR>
-  # @Prompt DIMM 1 Enable Type
-  # @ValidList 0x80000001 | 0, 1
-  gVlvRefCodePkgTokenSpaceGuid.PcdEnableDimm1|0
-
-  ## DRAM device data width.
-  #  0 - x8<BR>
-  #  1 - x16<BR>
-  #  2 - x32<BR>
-  # @Prompt DIMM_DWIDTH
-  # @ValidList 0x80000001 | 0, 1, 2
-  gVlvRefCodePkgTokenSpaceGuid.PcdDimmDataWidth|1
-
-  ## DRAM device data density.
-  #  0 - 1 Gbit<BR>
-  #  1 - 2 Gbit<BR>
-  #  2 - 4 Gbit<BR>
-  #  3 - 8 Gbit<BR>
-  # @Prompt DIMM_Density
-  # @ValidList 0x80000001 | 0, 1, 2, 3
-  gVlvRefCodePkgTokenSpaceGuid.PcdDimmDensity|2
-
-  ## DRAM device data bus width.
-  #  0 - 8 bits<BR>
-  #  1 - 16 bits<BR>
-  #  2 - 32 bits<BR>
-  #  3 - 64 bits<BR>
-  # @Prompt DIMM_BusWidth
-  # @ValidList 0x80000001 | 0, 1, 2, 3
-  gVlvRefCodePkgTokenSpaceGuid.PcdDimmBusWidth|3
-
-  ## Ranks Per DIMM or Sides Per DIMM.
-  #  0 - 1 Rank<BR>
-  #  1 - 2 Ranks<BR>
-  # @Prompt DIMM_Sides
-  # @ValidList 0x80000001 | 0, 1
-  gVlvRefCodePkgTokenSpaceGuid.PcdRankPerDimm|0
-
-  ## tCL.<BR><BR>
-  # @Prompt tCL
-  gVlvRefCodePkgTokenSpaceGuid.PcdTcl|11
-
-  ## tRP and tRCD in DRAM clk - 5:12.5ns, 6:15ns, etc.
-  # @Prompt tRP_tRCD
-  gVlvRefCodePkgTokenSpaceGuid.PcdTrpTrcd|11
-
-  ## tWR in DRAM clk.
-  # @Prompt tWR
-  gVlvRefCodePkgTokenSpaceGuid.PcdTwr|12
-
-  ## tWTR in DRAM clk.
-  # @Prompt tWTR
-  gVlvRefCodePkgTokenSpaceGuid.PcdTwtr|6
-
-  ## tRRD in DRAM clk.
-  # @Prompt tRRD
-  gVlvRefCodePkgTokenSpaceGuid.PcdTrrd|6
-
-  ## tRTP in DRAM clk.
-  # @Prompt tRTP
-  gVlvRefCodePkgTokenSpaceGuid.PcdTrtp|6
-
-  ## tFAW in DRAM clk.
-  # @Prompt tFAW
-  gVlvRefCodePkgTokenSpaceGuid.PcdTfaw|32
-
-  #
-  # End of MRC parameters.
-  #
-  ###############################################################################################
-
-[PcdsDynamicHii.common.DEFAULT]
-  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5 # Variable: L"Timeout"
-  gEfiMdePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSupport"|gEfiGlobalVariableGuid|0x0|1 # Variable: L"HwErrRecSupport"
-  gPlatformModuleTokenSpaceGuid.PcdBootState|L"BootState"|gPlatformModuleTokenSpaceGuid|0x0|TRUE
-
-[PcdsDynamicDefault.common.DEFAULT]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0x0
-  !if $(TPM_ENABLED) == TRUE
-    gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x7b, 0x3a, 0xcd, 0x72, 0xA5, 0xFE, 0x5e, 0x4f, 0x91, 0x65, 0x4d, 0xd1, 0x21, 0x87, 0xbb, 0x13}
-  !endif
-
-  ## This PCD defines the video horizontal resolution.
-  #  This PCD could be set to 0 then video resolution could be at highest resolution.
-  #gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|0
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|800
-  ## This PCD defines the video vertical resolution.
-  #  This PCD could be set to 0 then video resolution could be at highest resolution.
-  #gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|0
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|600
-
-  ## This PCD defines the Console output column and the default value is 25 according to UEFI spec.
-  #  This PCD could be set to 0 then console output could be at max column and max row.
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|31
-  ## This PCD defines the Console output row and the default value is 80 according to UEFI spec.
-  #  This PCD could be set to 0 then console output could be at max column and max row.
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|100
-
-  ## The PCD is used to specify the video horizontal resolution of text setup.
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|800
-  ## The PCD is used to specify the video vertical resolution of text setup.
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|600
-  ## The PCD is used to specify the console output column of text setup.
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutColumn|100
-  ## The PCD is used to specify the console output column of text setup.
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutRow|31
-
-!if $(TPM_ENABLED) == TRUE
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInitializationPolicy|1
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpmScrtmPolicy|1
-!endif
-
-[PcdsDynamicExDefault.common.DEFAULT]
-  gEfiVLVTokenSpaceGuid.PcdTCSmbaIoBaseAddress|0x1040
-  gEfiVLVTokenSpaceGuid.PcdEmmcManufacturerId|0
-  gEfiVLVTokenSpaceGuid.PcdProductSerialNumber|0
-  gEfiVLVTokenSpaceGuid.PcdMeasuredBootEnable|TRUE
-  gEfiVLVTokenSpaceGuid.PcdFTPMErrorOccur|FALSE
-  gEfiVLVTokenSpaceGuid.PcdFTPMErrorSkip|FALSE
-  gEfiVLVTokenSpaceGuid.PcdFTPMCommand|0
-  gEfiVLVTokenSpaceGuid.PcdFTPMResponse|0
-  gEfiVLVTokenSpaceGuid.PcdFTPMNotRespond|FALSE
-  gEfiVLVTokenSpaceGuid.PcdFTPMStatus|0
-  gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateSmmDataPtr|0
-  gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr|0
-  gEfiVLVTokenSpaceGuid.PcdCpuLockBoxDataAddress|0
-  gEfiVLVTokenSpaceGuid.PcdCpuSmramCpuDataAddress|0
-  gEfiVLVTokenSpaceGuid.PcdCpuLockBoxSize|0
-  gEfiSecurityPkgTokenSpaceGuid.PcdUserPhysicalPresence|TRUE
-
-[PcdsDynamicExDefault.X64.DEFAULT]
-!if $(RECOVERY_ENABLE)
-  gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareFileGuid|{GUID("AF9C9EB2-12AD-4D3E-A4D4-96F6C9966215")}|VOID*|0x10
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid|{GUID("4096267b-da0a-42eb-b5eb-fef31d207cb4")}|VOID*|0x10
-!endif
-
-[PcdsDynamicExVpd.common.DEFAULT]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdNvStoreDefaultValueBuffer|*
-
-[PcdsDynamicExHii.common.DEFAULT.STANDARD]
-  !include Vlv2TbltDevicePkg/PlatformSetupDefaults.dsc
-
-[PcdsDynamicExHii.common.DEFAULT.MANUFACTURING]
-  !include Vlv2TbltDevicePkg/PlatformSetupDefaults.dsc
-
-[Components.IA32]
-
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/SecCore.inf
-
-  MdeModulePkg/Core/Pei/PeiMain.inf {
-!if $(TARGET) == DEBUG
-    <PcdsFixedAtBuild>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
-!endif
-    <PcdsPatchableInModule>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046
-  }
-
-  Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf {
-!if $(TARGET) == DEBUG
-    <PcdsFixedAtBuild>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
-!endif
-  }
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/MemoryInit.inf {
-    <PcdsPatchableInModule>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046
-  }
-
-!if $(RC_BINARY_RELEASE) == TRUE
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/SeCUma.inf
-!endif
-
-!if $(RC_BINARY_RELEASE) == TRUE
-  Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf {
-  !if $(TARGET) == DEBUG
-      <PcdsFixedAtBuild>
-        gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
-  !endif
-  }
-!endif
-
-!if $(SOURCE_DEBUG_ENABLE) == TRUE
-  SourceLevelDebugPkg/DebugAgentPei/DebugAgentPei.inf{
-    <LibraryClasses>
-      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-      DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf
-      PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf
-      SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
-    }
-!endif
-
-!if $(TPM_ENABLED) == TRUE
-  SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf
-  SecurityPkg/Tcg/TcgPei/TcgPei.inf {
-    <LibraryClasses>
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
-  }
-!endif
-
- Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf {
-    <PcdsPatchableInModule>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x803805c6
-    <LibraryClasses>
-!if $(TARGET) != RELEASE
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-!endif
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
-  }
-  Vlv2TbltDevicePkg/FvInfoPei/FvInfoPei.inf
-
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/VlvInitPeim.inf
-!if $(PCIESC_ENABLE) == TRUE
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchEarlyInitPeim.inf {
-    <PcdsPatchableInModule>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046
-  }
-!endif
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchInitPeim.inf
-
-
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchSmbusArpDisabled.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchSpiPeim.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PeiSmmAccess.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PeiSmmControl.inf
-  MdeModulePkg/Universal/PCD/Pei/Pcd.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/CpuPeim.inf
-  UefiCpuPkg/CpuIoPei/CpuIoPei.inf
-  UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
-  UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.inf
-
-!if $(RECOVERY_ENABLE)
-  #
-  # Recovery
-  #
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PchUsb.inf
-  MdeModulePkg/Bus/Pci/EhciPei/EhciPei.inf
-  MdeModulePkg/Bus/Usb/UsbBusPei/UsbBusPei.inf
-  MdeModulePkg/Bus/Usb/UsbBotPei/UsbBotPei.inf
-  FatPkg/FatPei/FatPei.inf
-  MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf
-  SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.inf {
-    <LibraryClasses>
-      FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.inf
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
-  }
-!endif
-
-!if $(CAPSULE_ENABLE) == TRUE
-  MdeModulePkg/Universal/CapsulePei/CapsulePei.inf
-!endif
-  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf {
-    <LibraryClasses>
-!if $(LZMA_ENABLE) == TRUE
-    NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
-!endif
-  }
-
- MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
- MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf
-
-!if $(TPM_ENABLED) == TRUE
-  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf {
-    <LibraryClasses>
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
-  }
-!endif
-!if $(ACPI50_ENABLE) == TRUE
-  MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.inf{
-    <LibraryClasses>
-      TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf
-  }
-
-!endif
-!if $(PERFORMANCE_ENABLE) == TRUE
-  MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
-!endif
-[Components.X64]
-  #
-  # EDK II Related Platform codes
-  #
-  MdeModulePkg/Core/Dxe/DxeMain.inf {
-    <PcdsPatchableInModule>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046
-    <LibraryClasses>
-!if $(DXE_CRC32_SECTION_ENABLE) == TRUE
-      NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf
-!endif
-!if $(LZMA_ENABLE) == TRUE
-      NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
-!endif
-!if $(TARGET) != RELEASE
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-!endif
-  }
-  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf {
-    <LibraryClasses>
-      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-  }
-  UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
-
-  MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
-  MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf  {
-    <LibraryClasses>
-!if $(TARGET) != RELEASE
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-!endif
-  }
-
-!if $(CAPSULE_ENABLE) == TRUE
-  MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf {
-    <LibraryClasses>
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
-      MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
-      HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
-      CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
-!if $(SOURCE_DEBUG_ENABLE) == TRUE
-      DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf
-!endif
-  }
-!endif
-
-  MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
-  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf{
-    <LibraryClasses>
-!if $(SECURE_BOOT_ENABLE) == TRUE
-      NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
-!endif
-
-!if $(TPM_ENABLED) == TRUE
-      NULL|SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf
-!endif
-  }
-  MdeModulePkg/Universal/Metronome/Metronome.inf
-
-  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf {
-    <LibraryClasses>
-      PlatformBootManagerLib|Vlv2TbltDevicePkg/Library/DxePlatformBootManagerLib/DxePlatformBootManagerLib.inf
-  }
-  MdeModulePkg/Logo/LogoDxe.inf
-  MdeModulePkg/Application/UiApp/UiApp.inf {
-    <LibraryClasses>
-      NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
-      NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf
-      NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
-  }
-
-  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
-  MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
-  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
-  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
-  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf {
-    <LibraryClasses>
-      NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
-      SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
-  }
-  Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbSmm.inf
-  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSpiSmm.inf
-!if $(SECURE_BOOT_ENABLE) == TRUE
-  SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf {
-    <LibraryClasses>
-      PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf
-    <BuildOptions>
-      #
-      # Specify GUID gEfiIfrBootMaintenanceGuid, to install Secure Boot Configuration menu
-      # into Boot Maintenance Manager menu
-      #
-      *_*_*_VFR_FLAGS   = -g b2dedc91-d59f-48d2-898a-12490c74a4e0
-  }
-!endif
-   MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf {
-    <LibraryClasses>
-      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
-  }
-
-  MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
-  PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
-  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
-
-  Vlv2TbltDevicePkg/FvbRuntimeDxe/FvbRuntimeDxe.inf
-
-  Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf
-
-  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchS3SupportDxe.inf
-  PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SmmControl.inf
-
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSmbusDxe.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchReset.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchInitDxe.inf{
-    <PcdsPatchableInModule>
-        gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043
-  }
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchInitSmm.inf
-
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSmiDispatcher.inf
-
-!if $(PCIESC_ENABLE) == TRUE
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchPcieSmm.inf
-!endif
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchSpiRuntime.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchPolicyInitDxe.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PchBiosWriteProtect.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SmmAccess.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PciHostBridge.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/VlvInitDxe.inf
-
-  #
-  # Performance Application; Set PERFORMANCE_ENABLE=TRUE for normal boot performance and smm performance data
-  #
-!if $(PERFORMANCE_ENABLE) == TRUE
-  ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf {
-    <PcdsFixedAtBuild>
-      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
-  }
-!endif
-
-  Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf{
-    <LibraryClasses>
-!if $(TARGET) != RELEASE
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-!endif
-      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-  }
-
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/Dptf.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PnpDxe.inf
-
-!if $(TPM_ENABLED) == TRUE
-  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf {
-    <LibraryClasses>
-      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-  }
-
-  SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf {
-    <LibraryClasses>
-      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-    <BuildOptions>
-      #
-      # specify GUID gEfiIfrNotInTPVPageGuid, this page will not
-      # be showed in TPV page.
-      #
-      *_*_*_VFR_FLAGS   = -g e58809f8-fbc1-48e2-883a-a30fdc4b441e
-  }
-
-  SecurityPkg/Tcg/TcgDxe/TcgDxe.inf {
-    <LibraryClasses>
-      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-  }
-  SecurityPkg/Tcg/TcgSmm/TcgSmm.inf
-!endif
-  #
-  # EDK II Related Platform codes
-  #
-  Vlv2TbltDevicePkg/PlatformSmm/PlatformSmm.inf{
-    <LibraryClasses>
-    !if $(TARGET) != RELEASE
-          DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-    !endif
-          PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-  }
-  Vlv2TbltDevicePkg/PlatformInfoDxe/PlatformInfoDxe.inf
-  Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf
-  Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf
-
-  Vlv2TbltDevicePkg/PciPlatform/PciPlatform.inf
-  Vlv2TbltDevicePkg/SaveMemoryConfig/SaveMemoryConfig.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PlatformCpuPolicy.inf
-  Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf
-!if $(GOP_DRIVER_ENABLE) == TRUE
-  Vlv2TbltDevicePkg/PlatformGopPolicy/PlatformGopPolicy.inf
-
-!endif
-
-
-  #
-  # SMM
-  #
-  MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
-  MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
-  UefiCpuPkg/CpuDxe/CpuDxe.inf
-  UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf
-  UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
-  UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
-  MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf
-  UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf
-
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PowerManagement2.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/DigitalThermalSensor.inf
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/GraphicDxeInitSmm.inf
-
-  #
-  # ACPI
-  #
-   MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf {
-    <PcdsPatchableInModule>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043
-    <PcdsFixedAtBuild>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x27
-    <LibraryClasses>
-      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-  }
-  MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
-
-  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
-  Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/PowerManagement/AcpiTables/PowerManagementAcpiTables.inf
-
-  Vlv2DeviceRefCodePkg/AcpiTablesPCAT/AcpiTables.inf
-
-  Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf
-
-  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
-
-  #
-  # PCI
-  #
-  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
-
-
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/ISPDxe.inf
-
-
-  #
-  # ISA
-  #
-  Vlv2TbltDevicePkg/PcuSio/PcuSio.inf
-  MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf
-
-!if $(ACPI50_ENABLE) == TRUE
-  MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf {
-    <LibraryClasses>
-      TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf
-  }
-  MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf {
-    <LibraryClasses>
-      TimerLib|Vlv2TbltDevicePkg/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf
-  }
-!endif
-
-#
-# eMMC/SD Card
-#
-  MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
-  MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
-  MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
-
-#
-# IDE/SCSI/AHCI
-#
-  MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
-  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
-  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
-  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
-  FatPkg/EnhancedFatDxe/Fat.inf
-  ShellPkg/Application/Shell/Shell.inf {
-    <LibraryClasses>
-      ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
-      NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
-      NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
-      NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
-      NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
-      NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
-      NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
-      NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
-      HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
-      PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
-      BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
-    <PcdsFixedAtBuild>
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF
-      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
-      gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000
-  }
-!if $(SATA_ENABLE) == TRUE
-  Vlv2SocBinPkg/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SataController.inf
-!endif
-  MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
-!if $(SCSI_ENABLE) == TRUE
-  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
-  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
-!endif
-#
-# Console
-#
-  MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
-  MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
-  MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
-  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
-  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
-  MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
-  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
-
-  #
-  # USB
-  #
-!if $(USB_ENABLE) == TRUE
-  MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
-  MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
-  MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
-  MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
-  MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
-  MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
-  MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
-
-!endif
-
-  #
-  # SMBIOS
-  #
-  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
-  Vlv2TbltDevicePkg/SmBiosMiscDxe/SmBiosMiscDxe.inf
-
-  #
-  # CPU/FW Microde
-  #
-  Vlv2SocBinPkg/Microcode/MicrocodeUpdates.inf {
-    <BuildOptions>
-      *_*_*_GENFW_FLAGS = -a 0x800 -p 0xFF
-  }
-
-
-  #
-  # Network Stacks
-  #
-!include NetworkPkg/Network.dsc.inc
-
-!if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE)
-  MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf
-  MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf
-!endif
-
-!if $(CAPSULE_ENABLE)
-  !include Vlv2TbltDevicePkg/FmpMinnowMaxSystem.dsc
-  !include Vlv2TbltDevicePkg/FmpGreenSampleDevice.dsc
-  !include Vlv2TbltDevicePkg/FmpBlueSampleDevice.dsc
-  !include Vlv2TbltDevicePkg/FmpRedSampleDevice.dsc
-!endif
-
-!if $(MICOCODE_CAPSULE_ENABLE)
-  IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.inf {
-    <LibraryClasses>
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
-      SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
-  }
-!endif
-
-[BuildOptions]
-#
-# Define Build Options both for EDK and EDKII drivers.
-#
-
-#
-# Define token for different Platform
-#
-!if $(CLKGEN_CONFIG_EXTRA_ENABLE) == TRUE
-  DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION = -DCLKGEN_CONFIG_EXTRA=1
-!else
-  DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =
-!endif
-
-!if $(PCIESC_ENABLE) == TRUE
-  DEFINE PCIESC_SUPPORT_BUILD_OPTION = -DPCIESC_SUPPORT=1
-!else
-  DEFINE PCIESC_SUPPORT_BUILD_OPTION =
-!endif
-
-  DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION)
-
-  GCC:*_*_*_CC_FLAGS = -Wno-missing-braces
-!if $(SOURCE_DEBUG_ENABLE) == TRUE
-  MSFT:*_*_X64_GENFW_FLAGS  = --keepexceptiontable
-  GCC:*_*_X64_GENFW_FLAGS   = --keepexceptiontable
-  INTEL:*_*_X64_GENFW_FLAGS = --keepexceptiontable
-  DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
-!else
-  DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
-!endif
-
-#
-# Force PE/COFF sections to be aligned at 4KB boundaries to support page level
-# protection of DXE_RUNTIME_DRIVER modules
-#
-[BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]
-  MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096
-  GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
-
-#
-# Force PE/COFF sections to be aligned at 4KB boundaries to support page level
-# protection of DXE_SMM_DRIVER/SMM_CORE modules
-#
-[BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE]
-  MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096
-  GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
-
-[BuildOptions.Common.EDKII]
-  *_*_IA32_CC_FLAGS      = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_IA32_VFRPP_FLAGS   = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_IA32_APP_FLAGS     = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_IA32_PP_FLAGS      = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_IA32_ASLPP_FLAGS   = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-
-  *_*_X64_CC_FLAGS       = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) $(SOURCE_LEVEL_DEBUG_BUILD_OPTIONS)
-  *_*_X64_VFRPP_FLAGS    = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_X64_APP_FLAGS      = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_X64_PP_FLAGS       = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_X64_ASLPP_FLAGS    = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 1b83682c53..121ebc9eee 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -1225,33 +1225,15 @@ [BuildOptions]
 #
 # Define Build Options both for EDK and EDKII drivers.
 #
+GCC:*_*_*_CC_FLAGS = -Wno-missing-braces
 
 #
 # Define token for different Platform
 #
-!if $(CLKGEN_CONFIG_EXTRA_ENABLE) == TRUE
-  DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION = /DCLKGEN_CONFIG_EXTRA=1
-!else
-  DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =
-!endif
-
-!if $(PCIESC_ENABLE) == TRUE
-  DEFINE PCIESC_SUPPORT_BUILD_OPTION = /DPCIESC_SUPPORT=1
-!else
-  DEFINE PCIESC_SUPPORT_BUILD_OPTION =
-!endif
-
-  DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION)
-
 !if $(SOURCE_DEBUG_ENABLE) == TRUE
   MSFT:*_*_X64_GENFW_FLAGS  = --keepexceptiontable
   GCC:*_*_X64_GENFW_FLAGS   = --keepexceptiontable
   INTEL:*_*_X64_GENFW_FLAGS = --keepexceptiontable
-!if $(TARGET) == DEBUG
-  DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS = /Od /Oy-
-!endif
-!else
-  DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
 !endif
 
 #
@@ -1271,14 +1253,34 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE]
   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
 
 [BuildOptions.Common.EDKII]
-  *_*_IA32_CC_FLAGS      = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_IA32_VFRPP_FLAGS   = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_IA32_APP_FLAGS     = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_IA32_PP_FLAGS      = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_IA32_ASLPP_FLAGS   = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
+!if $(CLKGEN_CONFIG_EXTRA_ENABLE) == TRUE
+  MSFT:*_*_*_CC_FLAGS    = /DCLKGEN_CONFIG_EXTRA=1
+  MSFT:*_*_*_VFRPP_FLAGS = /DCLKGEN_CONFIG_EXTRA=1
+  MSFT:*_*_*_APP_FLAGS   = /DCLKGEN_CONFIG_EXTRA=1
+  MSFT:*_*_*_PP_FLAGS    = /DCLKGEN_CONFIG_EXTRA=1
+  MSFT:*_*_*_ASLPP_FLAGS = /DCLKGEN_CONFIG_EXTRA=1
+  GCC:*_*_*_CC_FLAGS     = -DCLKGEN_CONFIG_EXTRA=1
+  GCC:*_*_*_VFRPP_FLAGS  = -DCLKGEN_CONFIG_EXTRA=1
+  GCC:*_*_*_APP_FLAGS    = -DCLKGEN_CONFIG_EXTRA=1
+  GCC:*_*_*_PP_FLAGS     = -DCLKGEN_CONFIG_EXTRA=1
+  GCC:*_*_*_ASLPP_FLAGS  = -DCLKGEN_CONFIG_EXTRA=1
+!endif
 
-  *_*_X64_CC_FLAGS       = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) $(SOURCE_LEVEL_DEBUG_BUILD_OPTIONS)
-  *_*_X64_VFRPP_FLAGS    = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_X64_APP_FLAGS      = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_X64_PP_FLAGS       = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_X64_ASLPP_FLAGS    = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
+!if $(PCIESC_ENABLE) == TRUE
+  MSFT:*_*_*_CC_FLAGS    = /DPCIESC_SUPPORT=1
+  MSFT:*_*_*_VFRPP_FLAGS = /DPCIESC_SUPPORT=1
+  MSFT:*_*_*_APP_FLAGS   = /DPCIESC_SUPPORT=1
+  MSFT:*_*_*_PP_FLAGS    = /DPCIESC_SUPPORT=1
+  MSFT:*_*_*_ASLPP_FLAGS = /DPCIESC_SUPPORT=1
+  GCC:*_*_*_CC_FLAGS     = -DPCIESC_SUPPORT=1
+  GCC:*_*_*_VFRPP_FLAGS  = -DPCIESC_SUPPORT=1
+  GCC:*_*_*_APP_FLAGS    = -DPCIESC_SUPPORT=1
+  GCC:*_*_*_PP_FLAGS     = -DPCIESC_SUPPORT=1
+  GCC:*_*_*_ASLPP_FLAGS  = -DPCIESC_SUPPORT=1
+!endif
+
+!if $(SOURCE_DEBUG_ENABLE) == TRUE
+  !if $(TARGET) == DEBUG
+    MSFT:*_*_X64_CC_FLAGS = /Od /Oy-
+  !endif
+!endif
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index 54923edf02..3e4087f919 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -18,7 +18,7 @@ [Defines]
   PLATFORM_GUID                       = 465B0A0B-7AC1-443b-8F67-7B8DEC145F90
   PLATFORM_VERSION                    = 0.1
   DSC_SPECIFICATION                   = 0x00010005
-  OUTPUT_DIRECTORY                    = Build/Vlv2TbltDevicePkg
+  OUTPUT_DIRECTORY                    = Build/Vlv2TbltDevicePkgX64
   SUPPORTED_ARCHITECTURES             = IA32|X64
   BUILD_TARGETS                       = DEBUG|RELEASE
   SKUID_IDENTIFIER                    = DEFAULT
@@ -1240,33 +1240,15 @@ [BuildOptions]
 #
 # Define Build Options both for EDK and EDKII drivers.
 #
+GCC:*_*_*_CC_FLAGS = -Wno-missing-braces
 
 #
 # Define token for different Platform
 #
-!if $(CLKGEN_CONFIG_EXTRA_ENABLE) == TRUE
-  DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION = /DCLKGEN_CONFIG_EXTRA=1
-!else
-  DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =
-!endif
-
-!if $(PCIESC_ENABLE) == TRUE
-  DEFINE PCIESC_SUPPORT_BUILD_OPTION = /DPCIESC_SUPPORT=1
-!else
-  DEFINE PCIESC_SUPPORT_BUILD_OPTION =
-!endif
-
-  DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION)
-
 !if $(SOURCE_DEBUG_ENABLE) == TRUE
   MSFT:*_*_X64_GENFW_FLAGS  = --keepexceptiontable
   GCC:*_*_X64_GENFW_FLAGS   = --keepexceptiontable
   INTEL:*_*_X64_GENFW_FLAGS = --keepexceptiontable
-!if $(TARGET) == DEBUG
-  DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS = /Od /Oy-
-!endif
-!else
-  DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =
 !endif
 
 #
@@ -1286,14 +1268,34 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE]
   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
 
 [BuildOptions.Common.EDKII]
-  *_*_IA32_CC_FLAGS      = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_IA32_VFRPP_FLAGS   = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_IA32_APP_FLAGS     = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_IA32_PP_FLAGS      = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_IA32_ASLPP_FLAGS   = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
+!if $(CLKGEN_CONFIG_EXTRA_ENABLE) == TRUE
+  MSFT:*_*_*_CC_FLAGS    = /DCLKGEN_CONFIG_EXTRA=1
+  MSFT:*_*_*_VFRPP_FLAGS = /DCLKGEN_CONFIG_EXTRA=1
+  MSFT:*_*_*_APP_FLAGS   = /DCLKGEN_CONFIG_EXTRA=1
+  MSFT:*_*_*_PP_FLAGS    = /DCLKGEN_CONFIG_EXTRA=1
+  MSFT:*_*_*_ASLPP_FLAGS = /DCLKGEN_CONFIG_EXTRA=1
+  GCC:*_*_*_CC_FLAGS     = -DCLKGEN_CONFIG_EXTRA=1
+  GCC:*_*_*_VFRPP_FLAGS  = -DCLKGEN_CONFIG_EXTRA=1
+  GCC:*_*_*_APP_FLAGS    = -DCLKGEN_CONFIG_EXTRA=1
+  GCC:*_*_*_PP_FLAGS     = -DCLKGEN_CONFIG_EXTRA=1
+  GCC:*_*_*_ASLPP_FLAGS  = -DCLKGEN_CONFIG_EXTRA=1
+!endif
 
-  *_*_X64_CC_FLAGS       = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) $(SOURCE_LEVEL_DEBUG_BUILD_OPTIONS)
-  *_*_X64_VFRPP_FLAGS    = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_X64_APP_FLAGS      = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_X64_PP_FLAGS       = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
-  *_*_X64_ASLPP_FLAGS    = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
+!if $(PCIESC_ENABLE) == TRUE
+  MSFT:*_*_*_CC_FLAGS    = /DPCIESC_SUPPORT=1
+  MSFT:*_*_*_VFRPP_FLAGS = /DPCIESC_SUPPORT=1
+  MSFT:*_*_*_APP_FLAGS   = /DPCIESC_SUPPORT=1
+  MSFT:*_*_*_PP_FLAGS    = /DPCIESC_SUPPORT=1
+  MSFT:*_*_*_ASLPP_FLAGS = /DPCIESC_SUPPORT=1
+  GCC:*_*_*_CC_FLAGS     = -DPCIESC_SUPPORT=1
+  GCC:*_*_*_VFRPP_FLAGS  = -DPCIESC_SUPPORT=1
+  GCC:*_*_*_APP_FLAGS    = -DPCIESC_SUPPORT=1
+  GCC:*_*_*_PP_FLAGS     = -DPCIESC_SUPPORT=1
+  GCC:*_*_*_ASLPP_FLAGS  = -DPCIESC_SUPPORT=1
+!endif
+
+!if $(SOURCE_DEBUG_ENABLE) == TRUE
+  !if $(TARGET) == DEBUG
+    MSFT:*_*_X64_CC_FLAGS = /Od /Oy-
+  !endif
+!endif
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
index e804ed37e3..fb634c490c 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
+++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
@@ -179,13 +179,8 @@ if defined VS140COMNTOOLS (
 
 echo Ensuring correct build directory is present
 if not exist %WORKSPACE%\Build mkdir %WORKSPACE%\Build
-if "%Arch%"=="IA32" (
-  if not exist %WORKSPACE%\Build\%PLATFORM_NAME%IA32 mkdir %WORKSPACE%\Build\%PLATFORM_NAME%IA32
-  set BUILD_PATH=%WORKSPACE%\Build\%PLATFORM_NAME%IA32\%TARGET%_%TOOL_CHAIN_TAG%
-) else (
-  if not exist %WORKSPACE%\Build\%PLATFORM_NAME% mkdir %WORKSPACE%\Build\%PLATFORM_NAME%
-  set BUILD_PATH=%WORKSPACE%\Build\%PLATFORM_NAME%\%TARGET%_%TOOL_CHAIN_TAG%
-)
+if not exist %WORKSPACE%\Build\%PLATFORM_NAME%%Arch% mkdir %WORKSPACE%\Build\%PLATFORM_NAME%%Arch%
+set BUILD_PATH=%WORKSPACE%\Build\%PLATFORM_NAME%%Arch%\%TARGET%_%TOOL_CHAIN_TAG%
 if not exist %BUILD_PATH% mkdir %BUILD_PATH%
 
 ::**********************************************************************
@@ -215,8 +210,9 @@ if "%Arch%"=="IA32" (
     set Build_Flags=%Build_Flags% -a IA32 -a X64
 )
 set Build_Flags=%Build_Flags% -t %TOOL_CHAIN_TAG%
-set Build_Flags=%Build_Flags% -p %PLATFORM_PACKAGE%/PlatformPkg%Arch%.dsc
 set Build_Flags=%Build_Flags% -n %build_threads%
+set Capsule_Build_Flags=%Build_Flags%
+set Build_Flags=%Build_Flags% -p %PLATFORM_PACKAGE%/PlatformPkg%Arch%.dsc
 if "%GenLog%"=="TRUE" (
   set Build_Flags=%Build_Flags% -j %BUILD_PATH%\%PLATFORM_NAME%.log
 )
@@ -264,11 +260,9 @@ copy %BUILD_PATH%\FV\VLV.fd %BUILD_PATH%\FV\Vlv.ROM
 ::**********************************************************************
 :: Build Capsules
 ::**********************************************************************
-if "%Arch%"=="X64" (
-  echo Invoking EDK2 build for capsules...
-  echo build -t %TOOL_CHAIN_TAG% -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc
-  call build -t %TOOL_CHAIN_TAG% -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc
-)
+echo Invoking EDK2 build for capsules...
+echo build %Capsule_Build_Flags% -p %PLATFORM_PACKAGE%\PlatformCapsule%Arch%.dsc
+call build %Capsule_Build_Flags% -p %PLATFORM_PACKAGE%\PlatformCapsule%Arch%.dsc
 
 goto Exit
 
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
index 8d96152285..c8db91c6dc 100755
--- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
@@ -134,17 +134,10 @@ if [ ! -d ${WORKSPACE}/Build ]; then
   mkdir ${WORKSPACE}/Build
 fi
 
-if [ $Arch == "IA32" ]; then
-  if [ ! -d ${WORKSPACE}/Build/${PLATFORM_NAME}IA32 ]; then
-    mkdir ${WORKSPACE}/Build/${PLATFORM_NAME}IA32
-  fi
-  BUILD_PATH=${WORKSPACE}/Build/${PLATFORM_NAME}IA32/${TARGET}_${TOOL_CHAIN_TAG}
-else
-  if [ ! -d ${WORKSPACE}/Build/${PLATFORM_NAME} ]; then
-    mkdir ${WORKSPACE}/Build/${PLATFORM_NAME}
-  fi
-  BUILD_PATH=${WORKSPACE}/Build/${PLATFORM_NAME}/${TARGET}_${TOOL_CHAIN_TAG}
+if [ ! -d ${WORKSPACE}/Build/${PLATFORM_NAME}${Arch} ]; then
+  mkdir ${WORKSPACE}/Build/${PLATFORM_NAME}${Arch}
 fi
+BUILD_PATH=${WORKSPACE}/Build/${PLATFORM_NAME}${Arch}/${TARGET}_${TOOL_CHAIN_TAG}
 
 if [ ! -d $BUILD_PATH ]; then
   mkdir $BUILD_PATH
@@ -175,8 +168,9 @@ else
   Build_Flags="$Build_Flags -a IA32 -a X64"
 fi
 Build_Flags="$Build_Flags -t $TOOL_CHAIN_TAG"
-Build_Flags="$Build_Flags -p ${PLATFORM_PKG_PATH}/PlatformPkgGcc${Arch}.dsc"
 Build_Flags="$Build_Flags -n $build_threads"
+Capsule_Build_Flags="$Build_Flags"
+Build_Flags="$Build_Flags -p ${PLATFORM_PKG_PATH}/PlatformPkg${Arch}.dsc"
 if [ $GenLog == "TRUE" ]; then
   Build_Flags="$Build_Flags -j ${BUILD_PATH}/${PLATFORM_NAME}.log"
 fi
@@ -219,11 +213,9 @@ cp -f $BUILD_PATH/FV/VLV.fd $BUILD_PATH/FV/Vlv.ROM
 ##**********************************************************************
 ## Build Capsules
 ##**********************************************************************
-if [ $Arch == "X64" ]; then
-  echo "Invoking EDK2 build for capsules..."
-  echo build -t $TOOL_CHAIN_TAG -p $PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc
-  build -t $TOOL_CHAIN_TAG -p $PLATFORM_PKG_PATH/PlatformCapsuleGcc.dsc
-fi
+echo "Invoking EDK2 build for capsules..."
+echo build $Capsule_Build_Flags -p $PLATFORM_PKG_PATH/PlatformCapsule${Arch}.dsc
+build      $Capsule_Build_Flags -p $PLATFORM_PKG_PATH/PlatformCapsule${Arch}.dsc
 
 echo
 echo -------------------- The EDKII BIOS build has successfully completed. --------------------
-- 
2.21.0.windows.1


  parent reply	other threads:[~2019-07-19  6:02 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-19  6:02 [edk2-platforms Patch V2 0/5] Vlv2Tbl2DevicePkg: Remove Linux/Windows differences Michael D Kinney
2019-07-19  6:02 ` [edk2-platforms Patch V2 1/5] Vlv2TbltDevicePkg/PlatformPei: Add boot mode detection Michael D Kinney
2019-07-19  6:02 ` [edk2-platforms Patch V2 2/5] Vlv2TbltDevicePkg: Convert use of FCE tool to Structured PCD Michael D Kinney
2019-07-19  6:02 ` Michael D Kinney [this message]
2019-07-19  6:02 ` [edk2-platforms Patch V2 4/5] Vlv2TbltDevicePkg: Convert BAT/sh Capsule scripts to Python Michael D Kinney
2019-07-19  6:02 ` [edk2-platforms Patch V2 5/5] Vlv2Tbl2DevicePkg: Convert BAT/sh Build " Michael D Kinney
2019-07-22  4:08   ` [edk2-devel] " Gary Lin
2019-07-22 17:24     ` Michael D Kinney
2019-07-19  6:42 ` [edk2-devel] [edk2-platforms Patch V2 0/5] Vlv2Tbl2DevicePkg: Remove Linux/Windows differences Liming Gao

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190719060247.10132-4-michael.d.kinney@intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox