Vlv2TbltDevicePkg: Update DSC/FDF to use FmpDevicePkg

Cc: David Wei <david.wei@intel.com>
Cc: Mang Guo <mang.guo@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Guo Mang <mang.guo@intel.com>

diff --git a/Vlv2TbltDevicePkg/FmpBlueSampleDevice.dsc b/Vlv2TbltDevicePkg/FmpBlueSampleDevice.dsc
new file mode 100644 (file)
index 0000000..5f59845
--- /dev/null
+++ b/Vlv2TbltDevicePkg/FmpBlueSampleDevice.dsc
@@ -0,0 +1,61 @@
+#/** @file\r
+# FmpDxe driver for Blue Sample device firmware update.\r
+#\r
+# Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>\r
+#\r
+# This program and the accompanying materials are licensed and made available under\r
+# the terms and conditions of the BSD License that accompanies this distribution.\r
+# The full text of the license may be found at\r
+# http://opensource.org/licenses/bsd-license.php.\r
+#\r
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+#\r
+#**/\r
+\r
+  FmpDevicePkg/FmpDxe/FmpDxe.inf {\r
+    <Defines>\r
+      #\r
+      # ESRT and FMP GUID for sample device capsule update\r
+      #\r
+      FILE_GUID = $(FMP_BLUE_SAMPLE_DEVICE)\r
+    <PcdsFixedAtBuild>\r
+      #\r
+      # Unicode name string that is used to populate FMP Image Descriptor for this capsule update module\r
+      #\r
+      gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceImageIdName|L"Sample Firmware Device"\r
+\r
+      #\r
+      # ESRT and FMP Lowest Support Version for this capsule update module\r
+      # 000.000.000.000\r
+      #\r
+      gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceBuildTimeLowestSupportedVersion|0x00000000\r
+\r
+      gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceProgressWatchdogTimeInSeconds|2\r
+\r
+      #\r
+      # Capsule Update Progress Bar Color.  Set to Blue (RGB) (0, 0, 255)\r
+      #\r
+      gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceProgressColor|0x000000FF\r
+\r
+      #\r
+      # Certificates used to authenticate capsule update image\r
+      #\r
+      !include Vlv2TbltDevicePkg/FmpCertificate.dsc\r
+\r
+    <LibraryClasses>\r
+      #\r
+      # Generic libraries that are used "as is" by all FMP modules\r
+      #\r
+      FmpPayloadHeaderLib|FmpDevicePkg/Library/FmpPayloadHeaderLibV1/FmpPayloadHeaderLibV1.inf\r
+      FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf\r
+      #\r
+      # Platform specific capsule policy library\r
+      #\r
+      CapsuleUpdatePolicyLib|FmpDevicePkg/Library/CapsuleUpdatePolicyLibNull/CapsuleUpdatePolicyLibNull.inf\r
+      #\r
+      # Device specific library that processes a capsule and updates the FW storage device\r
+      #\r
+      FmpDeviceLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/FmpDeviceLibSample/FmpDeviceLib.inf\r
+  }\r

diff --git a/Vlv2TbltDevicePkg/FmpCertificate.dsc b/Vlv2TbltDevicePkg/FmpCertificate.dsc
new file mode 100644 (file)
index 0000000..c510c90
--- /dev/null
+++ b/Vlv2TbltDevicePkg/FmpCertificate.dsc
@@ -0,0 +1,28 @@
+#/** @file\r
+# FMP Certificates shared by multiple FmpDxe drivers for firmware update.\r
+#\r
+# Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>\r
+#\r
+# This program and the accompanying materials are licensed and made available under\r
+# the terms and conditions of the BSD License that accompanies this distribution.\r
+# The full text of the license may be found at\r
+# http://opensource.org/licenses/bsd-license.php.\r
+#\r
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+#\r
+#**/\r
+\r
+!if $(CAPSULE_PKCS7_CERT) == SAMPLE_DEVELOPMENT_SAMPLE_PRODUCTION\r
+  !include Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/SAMPLE_DEVELOPMENT_SAMPLE_PRODUCTION.cer.gFmpDevicePkgTokenSpaceGuid.PcdFmpDevicePkcs7CertBufferXdr.inc\r
+!endif\r
+!if $(CAPSULE_PKCS7_CERT) == SAMPLE_DEVELOPMENT\r
+  !include Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/SAMPLE_DEVELOPMENT.cer.gFmpDevicePkgTokenSpaceGuid.PcdFmpDevicePkcs7CertBufferXdr.inc\r
+!endif\r
+!if $(CAPSULE_PKCS7_CERT) == EDKII_TEST\r
+  !include BaseTools/Source/Python/Pkcs7Sign/TestRoot.cer.gFmpDevicePkgTokenSpaceGuid.PcdFmpDevicePkcs7CertBufferXdr.inc\r
+!endif\r
+!if $(CAPSULE_PKCS7_CERT) == NEW_ROOT\r
+  !include Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/NewRoot.cer.gFmpDevicePkgTokenSpaceGuid.PcdFmpDevicePkcs7CertBufferXdr.inc\r
+!endif\r

diff --git a/Vlv2TbltDevicePkg/FmpGreenSampleDevice.dsc b/Vlv2TbltDevicePkg/FmpGreenSampleDevice.dsc
new file mode 100644 (file)
index 0000000..085318f
--- /dev/null
+++ b/Vlv2TbltDevicePkg/FmpGreenSampleDevice.dsc
@@ -0,0 +1,61 @@
+#/** @file\r
+# FmpDxe driver for Green Sample device firmware update.\r
+#\r
+# Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>\r
+#\r
+# This program and the accompanying materials are licensed and made available under\r
+# the terms and conditions of the BSD License that accompanies this distribution.\r
+# The full text of the license may be found at\r
+# http://opensource.org/licenses/bsd-license.php.\r
+#\r
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+#\r
+#**/\r
+\r
+  FmpDevicePkg/FmpDxe/FmpDxe.inf {\r
+    <Defines>\r
+      #\r
+      # ESRT and FMP GUID for sample device capsule update\r
+      #\r
+      FILE_GUID = $(FMP_GREEN_SAMPLE_DEVICE)\r
+    <PcdsFixedAtBuild>\r
+      #\r
+      # Unicode name string that is used to populate FMP Image Descriptor for this capsule update module\r
+      #\r
+      gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceImageIdName|L"Sample Firmware Device"\r
+\r
+      #\r
+      # ESRT and FMP Lowest Support Version for this capsule update module\r
+      # 000.000.000.000\r
+      #\r
+      gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceBuildTimeLowestSupportedVersion|0x00000000\r
+\r
+      gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceProgressWatchdogTimeInSeconds|2\r
+\r
+      #\r
+      # Capsule Update Progress Bar Color.  Set to Green (RGB) (0, 255, 0)\r
+      #\r
+      gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceProgressColor|0x0000FF00\r
+\r
+      #\r
+      # Certificates used to authenticate capsule update image\r
+      #\r
+      !include Vlv2TbltDevicePkg/FmpCertificate.dsc\r
+\r
+    <LibraryClasses>\r
+      #\r
+      # Generic libraries that are used "as is" by all FMP modules\r
+      #\r
+      FmpPayloadHeaderLib|FmpDevicePkg/Library/FmpPayloadHeaderLibV1/FmpPayloadHeaderLibV1.inf\r
+      FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf\r
+      #\r
+      # Platform specific capsule policy library\r
+      #\r
+      CapsuleUpdatePolicyLib|FmpDevicePkg/Library/CapsuleUpdatePolicyLibNull/CapsuleUpdatePolicyLibNull.inf\r
+      #\r
+      # Device specific library that processes a capsule and updates the FW storage device\r
+      #\r
+      FmpDeviceLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/FmpDeviceLibSample/FmpDeviceLib.inf\r
+  }\r

diff --git a/Vlv2TbltDevicePkg/FmpMinnowMaxSystem.dsc b/Vlv2TbltDevicePkg/FmpMinnowMaxSystem.dsc
new file mode 100644 (file)
index 0000000..3b5d303
--- /dev/null
+++ b/Vlv2TbltDevicePkg/FmpMinnowMaxSystem.dsc
@@ -0,0 +1,65 @@
+#/** @file\r
+# FmpDxe driver for Minnow Max system firmware update.\r
+#\r
+# Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>\r
+#\r
+# This program and the accompanying materials are licensed and made available under\r
+# the terms and conditions of the BSD License that accompanies this distribution.\r
+# The full text of the license may be found at\r
+# http://opensource.org/licenses/bsd-license.php.\r
+#\r
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+#\r
+#**/\r
+\r
+  FmpDevicePkg/FmpDxe/FmpDxe.inf {\r
+    <Defines>\r
+      #\r
+      # ESRT and FMP GUID for system firmware capsule update\r
+      #\r
+      FILE_GUID = $(FMP_MINNOW_MAX_SYSTEM)\r
+    <PcdsFixedAtBuild>\r
+      #\r
+      # Unicode name string that is used to populate FMP Image Descriptor for this capsule update module\r
+      #\r
+      gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceImageIdName|L"Minnow Max System Firmware Device"\r
+\r
+      #\r
+      # ESRT and FMP Lowest Support Version for this capsule update module\r
+      # 000.000.000.000\r
+      #\r
+      gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceBuildTimeLowestSupportedVersion|0x00000000\r
+\r
+      gPlatformModuleTokenSpaceGuid.PcdSystemFirmwareFmpLowestSupportedVersion|0x00000000\r
+      gPlatformModuleTokenSpaceGuid.PcdSystemFirmwareFmpVersion|0x00000000\r
+      gPlatformModuleTokenSpaceGuid.PcdSystemFirmwareFmpVersionString|"000.000.000.000"\r
+\r
+      gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceProgressWatchdogTimeInSeconds|4\r
+\r
+      #\r
+      # Capsule Update Progress Bar Color.  Set to Purple (RGB) (255, 0, 255)\r
+      #\r
+      gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceProgressColor|0x00FF00FF\r
+\r
+      #\r
+      # Certificates used to authenticate capsule update image\r
+      #\r
+      !include Vlv2TbltDevicePkg/FmpCertificate.dsc\r
+\r
+    <LibraryClasses>\r
+      #\r
+      # Generic libraries that are used "as is" by all FMP modules\r
+      #\r
+      FmpPayloadHeaderLib|FmpDevicePkg/Library/FmpPayloadHeaderLibV1/FmpPayloadHeaderLibV1.inf\r
+      FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf\r
+      #\r
+      # Platform specific capsule policy library\r
+      #\r
+      CapsuleUpdatePolicyLib|FmpDevicePkg/Library/CapsuleUpdatePolicyLibNull/CapsuleUpdatePolicyLibNull.inf\r
+      #\r
+      # Device specific library that processes a capsule and updates the FW storage device\r
+      #\r
+      FmpDeviceLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/FmpDeviceLib/FmpDeviceLib.inf\r
+  }\r

diff --git a/Vlv2TbltDevicePkg/FmpRedSampleDevice.dsc b/Vlv2TbltDevicePkg/FmpRedSampleDevice.dsc
new file mode 100644 (file)
index 0000000..6e181ac
--- /dev/null
+++ b/Vlv2TbltDevicePkg/FmpRedSampleDevice.dsc
@@ -0,0 +1,61 @@
+#/** @file\r
+# FmpDxe driver for Red Sample device firmware update.\r
+#\r
+# Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>\r
+#\r
+# This program and the accompanying materials are licensed and made available under\r
+# the terms and conditions of the BSD License that accompanies this distribution.\r
+# The full text of the license may be found at\r
+# http://opensource.org/licenses/bsd-license.php.\r
+#\r
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+#\r
+#**/\r
+\r
+  FmpDevicePkg/FmpDxe/FmpDxe.inf {\r
+    <Defines>\r
+      #\r
+      # ESRT and FMP GUID for sample device capsule update\r
+      #\r
+      FILE_GUID = $(FMP_RED_SAMPLE_DEVICE)\r
+    <PcdsFixedAtBuild>\r
+      #\r
+      # Unicode name string that is used to populate FMP Image Descriptor for this capsule update module\r
+      #\r
+      gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceImageIdName|L"Sample Firmware Device"\r
+\r
+      #\r
+      # ESRT and FMP Lowest Support Version for this capsule update module\r
+      # 000.000.000.000\r
+      #\r
+      gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceBuildTimeLowestSupportedVersion|0x00000000\r
+\r
+      gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceProgressWatchdogTimeInSeconds|2\r
+\r
+      #\r
+      # Capsule Update Progress Bar Color.  Set to Blue (RGB) (255, 0, 0)\r
+      #\r
+      gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceProgressColor|0x00FF0000\r
+\r
+      #\r
+      # Certificates used to authenticate capsule update image\r
+      #\r
+      !include Vlv2TbltDevicePkg/FmpCertificate.dsc\r
+\r
+    <LibraryClasses>\r
+      #\r
+      # Generic libraries that are used "as is" by all FMP modules\r
+      #\r
+      FmpPayloadHeaderLib|FmpDevicePkg/Library/FmpPayloadHeaderLibV1/FmpPayloadHeaderLibV1.inf\r
+      FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf\r
+      #\r
+      # Platform specific capsule policy library\r
+      #\r
+      CapsuleUpdatePolicyLib|FmpDevicePkg/Library/CapsuleUpdatePolicyLibNull/CapsuleUpdatePolicyLibNull.inf\r
+      #\r
+      # Device specific library that processes a capsule and updates the FW storage device\r
+      #\r
+      FmpDeviceLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/FmpDeviceLibSample/FmpDeviceLib.inf\r
+  }\r

diff --git a/Vlv2TbltDevicePkg/PlatformCapsule.dsc b/Vlv2TbltDevicePkg/PlatformCapsule.dsc
index a619ed853a1924374ced975b68f1f98c7b179dde..80cda88384e0c3ac92ffe64ee426539c0b8e5ccf 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformCapsule.dsc
+++ b/Vlv2TbltDevicePkg/PlatformCapsule.dsc
@@ -23,6 +23,7 @@
   SUPPORTED_ARCHITECTURES        = IA32|X64\r
   BUILD_TARGETS                  = DEBUG|RELEASE\r
   SKUID_IDENTIFIER               = DEFAULT\r
+  POSTBUILD                      = Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.bat\r
 \r
 ###################################################################################################\r
 #\r

diff --git a/Vlv2TbltDevicePkg/PlatformCapsule.fdf b/Vlv2TbltDevicePkg/PlatformCapsule.fdf
index a80a75cf83a8e0352231b57e9c5f7b06f651da78..a05f6c6e6e3c930544ac2d3e1aa7966c8e9492d0 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformCapsule.fdf
+++ b/Vlv2TbltDevicePkg/PlatformCapsule.fdf
@@ -35,24 +35,10 @@ FILE RAW = AF9C9EB2-12AD-4D3E-A4D4-96F6C9966215 { # PcdEdkiiSystemFirmwareFileGu
     $(WORKSPACE)/$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/FV/Vlv.ROM\r
   }\r
 \r
-FILE RAW = ce57b167-b0e4-41e8-a897-5f4feb781d40 { # gEdkiiSystemFmpCapsuleDriverFvFileGuid\r
-    $(WORKSPACE)/$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/FV/CAPSULEDISPATCHFV.Fv\r
-  }\r
-\r
 FILE RAW = 812136D3-4D3A-433A-9418-29BB9BF78F6E { # gEdkiiSystemFmpCapsuleConfigFileGuid\r
     Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfig.ini\r
   }\r
 \r
-[FmpPayload.FmpPayloadSystemFirmwarePkcs7]\r
-IMAGE_HEADER_INIT_VERSION = 0x02\r
-IMAGE_TYPE_ID             = 4096267b-da0a-42eb-b5eb-fef31d207cb4 # PcdSystemFmpCapsuleImageTypeIdGuid\r
-IMAGE_INDEX               = 0x1\r
-HARDWARE_INSTANCE         = 0x0\r
-MONOTONIC_COUNT           = 0x2\r
-CERTIFICATE_GUID          = 4AAFD29D-68DF-49EE-8AA9-347D375665A7 # PKCS7\r
-\r
-FILE DATA = $(WORKSPACE)/$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/FV/SYSTEMFIRMWAREUPDATECARGO.Fv\r
-\r
 [FmpPayload.FmpPayloadSystemFirmwareRsa2048]\r
 IMAGE_HEADER_INIT_VERSION = 0x02\r
 IMAGE_TYPE_ID             = 4096267b-da0a-42eb-b5eb-fef31d207cb4 # PcdSystemFmpCapsuleImageTypeIdGuid\r
@@ -63,14 +49,6 @@ CERTIFICATE_GUID          = A7717414-C616-4977-9420-844712A735BF # RSA2048SHA256
 \r
 FILE DATA = $(WORKSPACE)/$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/FV/SYSTEMFIRMWAREUPDATECARGO.Fv\r
 \r
-[Capsule.Vlv2FirmwareUpdateCapsuleFmpPkcs7]\r
-CAPSULE_GUID                = 6dcbd5ed-e82d-4c44-bda1-7194199ad92a # gEfiFmpCapsuleGuid\r
-CAPSULE_FLAGS               = PersistAcrossReset,InitiateReset\r
-CAPSULE_HEADER_SIZE         = 0x20\r
-CAPSULE_HEADER_INIT_VERSION = 0x1\r
-\r
-FMP_PAYLOAD = FmpPayloadSystemFirmwarePkcs7\r
-\r
 [Capsule.Vlv2Rec]\r
 CAPSULE_GUID                = 6dcbd5ed-e82d-4c44-bda1-7194199ad92a # gEfiFmpCapsuleGuid\r
 CAPSULE_FLAGS               = PersistAcrossReset,InitiateReset\r
@@ -78,4 +56,3 @@ CAPSULE_HEADER_SIZE         = 0x20
 CAPSULE_HEADER_INIT_VERSION = 0x1\r
 \r
 FMP_PAYLOAD = FmpPayloadSystemFirmwareRsa2048\r
-\r

diff --git a/Vlv2TbltDevicePkg/PlatformCapsuleGcc.fdf b/Vlv2TbltDevicePkg/PlatformCapsuleGcc.fdf
index f4f396cf4e9c550e3bbdb778f932d4f5a4f35e33..b7ea8bf839bddd0af1d64354358a3dcd53ae24d3 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformCapsuleGcc.fdf
+++ b/Vlv2TbltDevicePkg/PlatformCapsuleGcc.fdf
@@ -35,24 +35,10 @@ FILE RAW = AF9C9EB2-12AD-4D3E-A4D4-96F6C9966215 { # PcdEdkiiSystemFirmwareFileGu
     $(WORKSPACE)/$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/FV/Vlv.ROM\r
   }\r
 \r
-FILE RAW = ce57b167-b0e4-41e8-a897-5f4feb781d40 { # gEdkiiSystemFmpCapsuleDriverFvFileGuid\r
-    $(WORKSPACE)/$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/FV/CAPSULEDISPATCHFV.Fv\r
-  }\r
-\r
 FILE RAW = 812136D3-4D3A-433A-9418-29BB9BF78F6E { # gEdkiiSystemFmpCapsuleConfigFileGuid\r
     Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareUpdateConfig/SystemFirmwareUpdateConfigGcc.ini\r
   }\r
 \r
-[FmpPayload.FmpPayloadSystemFirmwarePkcs7]\r
-IMAGE_HEADER_INIT_VERSION = 0x02\r
-IMAGE_TYPE_ID             = 4096267b-da0a-42eb-b5eb-fef31d207cb4 # PcdSystemFmpCapsuleImageTypeIdGuid\r
-IMAGE_INDEX               = 0x1\r
-HARDWARE_INSTANCE         = 0x0\r
-MONOTONIC_COUNT           = 0x2\r
-CERTIFICATE_GUID          = 4AAFD29D-68DF-49EE-8AA9-347D375665A7 # PKCS7\r
-\r
-FILE DATA = $(WORKSPACE)/$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/FV/SYSTEMFIRMWAREUPDATECARGO.Fv\r
-\r
 [FmpPayload.FmpPayloadSystemFirmwareRsa2048]\r
 IMAGE_HEADER_INIT_VERSION = 0x02\r
 IMAGE_TYPE_ID             = 4096267b-da0a-42eb-b5eb-fef31d207cb4 # PcdSystemFmpCapsuleImageTypeIdGuid\r
@@ -63,14 +49,6 @@ CERTIFICATE_GUID          = A7717414-C616-4977-9420-844712A735BF # RSA2048SHA256
 \r
 FILE DATA = $(WORKSPACE)/$(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/FV/SYSTEMFIRMWAREUPDATECARGO.Fv\r
 \r
-[Capsule.Vlv2FirmwareUpdateCapsuleFmpPkcs7]\r
-CAPSULE_GUID                = 6dcbd5ed-e82d-4c44-bda1-7194199ad92a # gEfiFmpCapsuleGuid\r
-CAPSULE_FLAGS               = PersistAcrossReset,InitiateReset\r
-CAPSULE_HEADER_SIZE         = 0x20\r
-CAPSULE_HEADER_INIT_VERSION = 0x1\r
-\r
-FMP_PAYLOAD = FmpPayloadSystemFirmwarePkcs7\r
-\r
 [Capsule.Vlv2Rec]\r
 CAPSULE_GUID                = 6dcbd5ed-e82d-4c44-bda1-7194199ad92a # gEfiFmpCapsuleGuid\r
 CAPSULE_FLAGS               = PersistAcrossReset,InitiateReset\r
@@ -78,4 +56,3 @@ CAPSULE_HEADER_SIZE         = 0x20
 CAPSULE_HEADER_INIT_VERSION = 0x1\r
 \r
 FMP_PAYLOAD = FmpPayloadSystemFirmwareRsa2048\r
-\r

diff --git a/Vlv2TbltDevicePkg/PlatformPkg.dec b/Vlv2TbltDevicePkg/PlatformPkg.dec
index 731fd05ed572bbbe736ac8662a6af91c4e79620c..8fccd7f1b1dd11d6eae28c07ef6dc3e1b8352694 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkg.dec
+++ b/Vlv2TbltDevicePkg/PlatformPkg.dec
@@ -165,6 +165,11 @@
   gPlatformModuleTokenSpaceGuid.PcdBiosRomBase|0xFFC00000|UINT32|0x4000000B\r
   gPlatformModuleTokenSpaceGuid.PcdBiosRomSize|0x00400000|UINT32|0x4000000C\r
 \r
+  # PCDs for System Firmware FMP instance\r
+  gPlatformModuleTokenSpaceGuid.PcdSystemFirmwareFmpLowestSupportedVersion|0x00000000|UINT32|0x40000100\r
+  gPlatformModuleTokenSpaceGuid.PcdSystemFirmwareFmpVersion|0x00000000|UINT32|0x40000101\r
+  gPlatformModuleTokenSpaceGuid.PcdSystemFirmwareFmpVersionString|""|VOID*|0x40000102\r
+\r
 [PcdsFeatureFlag]\r
   ## This PCD specifies whether StatusCode is reported via ISA Serial port.\r
   gEfiSerialPortTokenSpaceGuid.PcdStatusCodeUseIsaSerial|TRUE|BOOLEAN|0x00000020\r

diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index 85309650db75f61254544ed1e73e68b1e4cdaa65..b7a0e584deebeaee3fcefa0e05e56c89a616e56b 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -242,7 +242,7 @@ READ_LOCK_CAP      = TRUE
 READ_LOCK_STATUS   = TRUE\r
 \r
 FILE RAW = 197DB236-F856-4924-90F8-CDF12FB875F3 {\r
-  $(OUTPUT_DIRECTORY)\$(TARGET)_$(TOOL_CHAIN_TAG)\$(DXE_ARCHITECTURE)\MicrocodeUpdates.bin\r
+  $(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/$(DXE_ARCHITECTURE)/MicrocodeUpdates.bin\r
 }\r
 \r
 !if $(RECOVERY_ENABLE)\r
@@ -413,11 +413,6 @@ INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET
 \r
 INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
 \r
-!if $(CAPSULE_ENABLE) || $(RECOVERY_ENABLE)\r
-  # FMP image decriptor\r
-INF RuleOverride = FMP_IMAGE_DESC Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf\r
-!endif\r
-\r
 [FV.FVMAIN]\r
 BlockSize          = $(FLASH_BLOCK_SIZE)\r
 FvAlignment        = 16\r
@@ -775,14 +770,25 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
   !endif\r
 !endif\r
 \r
-!if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE)\r
-INF  MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf\r
-!endif\r
 !if $(CAPSULE_ENABLE)\r
-INF  SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf\r
+INF  MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf\r
+\r
+#\r
+# Minnow Max System Firmware FMP\r
+#\r
+INF  FILE_GUID = $(FMP_MINNOW_MAX_SYSTEM) FmpDevicePkg/FmpDxe/FmpDxe.inf\r
+\r
+#\r
+# Sample Device FMP\r
+#\r
+INF  FILE_GUID = $(FMP_GREEN_SAMPLE_DEVICE) FmpDevicePkg/FmpDxe/FmpDxe.inf\r
+INF  FILE_GUID = $(FMP_BLUE_SAMPLE_DEVICE)  FmpDevicePkg/FmpDxe/FmpDxe.inf\r
+INF  FILE_GUID = $(FMP_RED_SAMPLE_DEVICE)   FmpDevicePkg/FmpDxe/FmpDxe.inf\r
+\r
 !endif\r
+\r
 !if $(MICOCODE_CAPSULE_ENABLE)\r
-INF  UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.inf\r
+INF  IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.inf\r
 !endif\r
 \r
 !if $(RECOVERY_ENABLE)\r
@@ -792,13 +798,6 @@ FILE FREEFORM = PCD(gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiRsa2048Sha256Test
      }\r
 !endif\r
 \r
-!if $(CAPSULE_ENABLE)\r
-FILE FREEFORM = PCD(gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiPkcs7TestPublicKeyFileGuid) {\r
-     SECTION RAW = BaseTools/Source/Python/Pkcs7Sign/TestRoot.cer\r
-     SECTION UI = "Pkcs7TestRoot"\r
-     }\r
-!endif\r
-\r
 [FV.FVMAIN_COMPACT]\r
 BlockSize          = $(FLASH_BLOCK_SIZE)\r
 FvAlignment        = 16\r
@@ -861,32 +860,6 @@ READ_STATUS        = TRUE
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
 \r
-\r
-!if $(CAPSULE_ENABLE) || $(RECOVERY_ENABLE)\r
-[FV.CapsuleDispatchFv]\r
-FvAlignment        = 16\r
-ERASE_POLARITY     = 1\r
-MEMORY_MAPPED      = TRUE\r
-STICKY_WRITE       = TRUE\r
-LOCK_CAP           = TRUE\r
-LOCK_STATUS        = TRUE\r
-WRITE_DISABLED_CAP = TRUE\r
-WRITE_ENABLED_CAP  = TRUE\r
-WRITE_STATUS       = TRUE\r
-WRITE_LOCK_CAP     = TRUE\r
-WRITE_LOCK_STATUS  = TRUE\r
-READ_DISABLED_CAP  = TRUE\r
-READ_ENABLED_CAP   = TRUE\r
-READ_STATUS        = TRUE\r
-READ_LOCK_CAP      = TRUE\r
-READ_LOCK_STATUS   = TRUE\r
-\r
-!if $(CAPSULE_ENABLE)\r
-INF  SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf\r
-!endif\r
-\r
-!endif\r
-\r
 ################################################################################\r
 #\r
 # Rules are use with the [FV] section's module INF type to define\r

diff --git a/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc b/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
index c93ca8a4572cf43e13fba3402de750b15187f477..672853dda6a6bfce737a95c771acaf1be6c26efc 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
@@ -66,7 +66,7 @@ DEFINE S3_ENABLE = TRUE
 DEFINE CAPSULE_ENABLE = TRUE\r
 DEFINE CAPSULE_RESET_ENABLE = TRUE\r
 DEFINE RECOVERY_ENABLE = FALSE\r
-DEFINE MICOCODE_CAPSULE_ENABLE = FALSE\r
+DEFINE MICOCODE_CAPSULE_ENABLE = TRUE\r
 \r
 DEFINE GOP_DRIVER_ENABLE = TRUE\r
 DEFINE DATAHUB_ENABLE = TRUE\r
@@ -94,6 +94,19 @@ DEFINE PCIESC_ENABLE     = TRUE
 #\r
 DEFINE SOURCE_DEBUG_ENABLE     = FALSE\r
 \r
+#\r
+# Capsule Pubic Certificate.  Default is EDK_TEST.  Options are:\r
+#   SAMPLE_DEVELOPMENT                    - Only signtool SAMPLE_DEVELOPMENT\r
+#   SAMPLE_DEVELOPMENT_SAMPLE_PRODUCTION  - Both signtool SAMPLE_DEVELOPMENT and SAMPLE_PRODUCTION\r
+#   EDKII_TEST                            - Only openssl EDK II test certificate\r
+#   NEW_ROOT                              - Only openssl new VLV2 certificate\r
+#\r
+DEFINE CAPSULE_PKCS7_CERT = EDKII_TEST\r
 \r
-\r
-\r
+#\r
+# Define ESRT GUIDs for Firmware Management Protocol instances\r
+#\r
+DEFINE FMP_MINNOW_MAX_SYSTEM   = 4096267b-da0a-42eb-b5eb-fef31d207cb4\r
+DEFINE FMP_RED_SAMPLE_DEVICE   = 72E2945A-00DA-448E-9AA7-075AD840F9D4\r
+DEFINE FMP_BLUE_SAMPLE_DEVICE  = 149DA854-7D19-4FAA-A91E-862EA1324BE6\r
+DEFINE FMP_GREEN_SAMPLE_DEVICE = 79179BFD-704D-4C90-9E02-0AB8D968C18A\r

diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index 51a620ea15cb51eb78d297b8bd6da7c4b1418835..eca273e33f88b5f8e34b41d80f9ad4884d71dc5f 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -123,7 +123,6 @@ SET gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize = $(FLASH_REGION_VL
 $(FLASH_REGION_VLVMICROCODE_OFFSET)|$(FLASH_REGION_VLVMICROCODE_SIZE)\r
 gPlatformModuleTokenSpaceGuid.PcdFlashMicroCodeAddress|gPlatformModuleTokenSpaceGuid.PcdFlashMicroCodeSize\r
 FV = MICROCODE_FV\r
-\r
 $(FLASH_REGION_VPD_OFFSET)|$(FLASH_REGION_VPD_SIZE)\r
 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize\r
 FILE = $(WORKSPACE)/Vlv2TbltDevicePkg/Stitch/Gcc/NvStorageVariable.bin\r
@@ -370,11 +369,6 @@ INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET
 \r
 INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
 \r
-!if $(CAPSULE_ENABLE) || $(RECOVERY_ENABLE)\r
-  # FMP image decriptor\r
-INF RuleOverride = FMP_IMAGE_DESC Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf\r
-!endif\r
-\r
 [FV.FVMAIN]\r
 BlockSize          = $(FLASH_BLOCK_SIZE)\r
 FvAlignment        = 16\r
@@ -732,14 +726,25 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
   !endif\r
 !endif\r
 \r
-!if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE)\r
-INF  MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf\r
-!endif\r
 !if $(CAPSULE_ENABLE)\r
-INF  SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf\r
+INF  MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf\r
+\r
+#\r
+# Minnow Max System Firmware FMP\r
+#\r
+INF  FILE_GUID = $(FMP_MINNOW_MAX_SYSTEM) FmpDevicePkg/FmpDxe/FmpDxe.inf\r
+\r
+#\r
+# Sample Device FMP\r
+#\r
+INF  FILE_GUID = $(FMP_GREEN_SAMPLE_DEVICE) FmpDevicePkg/FmpDxe/FmpDxe.inf\r
+INF  FILE_GUID = $(FMP_BLUE_SAMPLE_DEVICE)  FmpDevicePkg/FmpDxe/FmpDxe.inf\r
+INF  FILE_GUID = $(FMP_RED_SAMPLE_DEVICE)   FmpDevicePkg/FmpDxe/FmpDxe.inf\r
+\r
 !endif\r
+\r
 !if $(MICOCODE_CAPSULE_ENABLE)\r
-INF  UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.inf\r
+INF  IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.inf\r
 !endif\r
 \r
 !if $(RECOVERY_ENABLE)\r
@@ -748,13 +753,6 @@ FILE FREEFORM = PCD(gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiRsa2048Sha256Test
      SECTION UI = "Rsa2048Sha256TestSigningPublicKey"\r
      }\r
 !endif\r
-     \r
-!if $(CAPSULE_ENABLE)\r
-FILE FREEFORM = PCD(gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiPkcs7TestPublicKeyFileGuid) {\r
-     SECTION RAW = BaseTools/Source/Python/Pkcs7Sign/TestRoot.cer\r
-     SECTION UI = "Pkcs7TestRoot"\r
-     }\r
-!endif\r
 \r
 [FV.FVMAIN_COMPACT]\r
 BlockSize          = $(FLASH_BLOCK_SIZE)\r
@@ -818,32 +816,6 @@ READ_STATUS        = TRUE
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
 \r
-\r
-!if $(CAPSULE_ENABLE) || $(RECOVERY_ENABLE)\r
-[FV.CapsuleDispatchFv]\r
-FvAlignment        = 16\r
-ERASE_POLARITY     = 1\r
-MEMORY_MAPPED      = TRUE\r
-STICKY_WRITE       = TRUE\r
-LOCK_CAP           = TRUE\r
-LOCK_STATUS        = TRUE\r
-WRITE_DISABLED_CAP = TRUE\r
-WRITE_ENABLED_CAP  = TRUE\r
-WRITE_STATUS       = TRUE\r
-WRITE_LOCK_CAP     = TRUE\r
-WRITE_LOCK_STATUS  = TRUE\r
-READ_DISABLED_CAP  = TRUE\r
-READ_ENABLED_CAP   = TRUE\r
-READ_STATUS        = TRUE\r
-READ_LOCK_CAP      = TRUE\r
-READ_LOCK_STATUS   = TRUE\r
-\r
-!if $(CAPSULE_ENABLE)\r
-INF  SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf\r
-!endif\r
-\r
-!endif\r
-\r
 ################################################################################\r
 #\r
 # Rules are use with the [FV] section's module INF type to define\r
@@ -1086,4 +1058,3 @@ INF  SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf
      UI       STRING="$(MODULE_NAME)" Optional\r
      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
-\r

diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index 8b8a55ae6f12574999f09f190603b9c82530ff7f..3e3522aee908730ff68eca92c0b16b2843518359 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -190,7 +190,6 @@
 !else\r
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf\r
 !endif\r
-  EdkiiSystemCapsuleLib|SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.inf\r
   FmpAuthenticationLib|MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAuthenticationLibNull.inf\r
   IniParsingLib|SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.inf\r
   PlatformFlashAccessLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/PlatformFlashAccessLib/PlatformFlashAccessLib.inf\r
@@ -336,7 +335,7 @@
   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf\r
   SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf\r
 !else\r
-  DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf\r
+  DebugLib|MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf\r
   SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf\r
 !endif\r
 \r
@@ -706,7 +705,23 @@
   #\r
   gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000\r
 \r
-[PcdsFixedAtBuild.IA32.PEIM, PcdsFixedAtBuild.IA32.PEI_CORE, PcdsFixedAtBuild.IA32.SEC]\r
+  #\r
+  # Clear unused single certificate PCD\r
+  #\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdPkcs7CertBuffer|{0}\r
+\r
+  #\r
+  # Lock all updatable firmware devices at End of DXE\r
+  #\r
+  gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceLockEventGuid|{GUID(gEfiEndOfDxeEventGroupGuid)}\r
+#  gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceLockEventGuid|{GUID(gEfiEventReadyToBootGuid)}\r
+\r
+  #\r
+  # Set PcdFmpDeviceTestKeySha256Digest to {0} to disable test key detection\r
+  #\r
+#  gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceTestKeySha256Digest|{0}\r
+\r
+[PcdsFixedAtBuild.IA32]\r
 !if $(TARGET) == RELEASE\r
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0\r
   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x3\r
@@ -910,10 +925,10 @@
   gEfiVLVTokenSpaceGuid.PcdCpuSmramCpuDataAddress|0\r
   gEfiVLVTokenSpaceGuid.PcdCpuLockBoxSize|0\r
 \r
-!if $(CAPSULE_ENABLE) || $(RECOVERY_ENABLE)\r
-  gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareImageDescriptor|{0x0}|VOID*|0x100\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid|{0x7b, 0x26, 0x96, 0x40, 0x0a, 0xda, 0xeb, 0x42, 0xb5, 0xeb, 0xfe, 0xf3, 0x1d, 0x20, 0x7c, 0xb4}\r
-  gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareFileGuid|{0xb2, 0x9e, 0x9c, 0xaf, 0xad, 0x12, 0x3e, 0x4d, 0xa4, 0xd4, 0x96, 0xf6, 0xc9, 0x96, 0x62, 0x15}\r
+[PcdsDynamicExDefault.X64.DEFAULT]\r
+!if $(RECOVERY_ENABLE)\r
+  gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareFileGuid|{GUID("AF9C9EB2-12AD-4D3E-A4D4-96F6C9966215")}|VOID*|0x10\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid|{GUID("4096267b-da0a-42eb-b5eb-fef31d207cb4")}|VOID*|0x10\r
 !endif\r
 \r
 [Components.IA32]\r
@@ -937,14 +952,6 @@
   }\r
   !endif\r
 \r
-!if $(CAPSULE_ENABLE) || $(RECOVERY_ENABLE)\r
-  # FMP image decriptor\r
-  Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf {\r
-    <LibraryClasses>\r
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
-  }\r
-!endif\r
-\r
   MdeModulePkg/Core/Pei/PeiMain.inf {\r
 !if $(TARGET) == DEBUG\r
     <PcdsFixedAtBuild>\r
@@ -1199,11 +1206,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
       DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
       PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
       SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf\r
-!if $(CAPSULE_ENABLE)\r
-      FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf\r
-!else\r
-      FmpAuthenticationLib|MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAuthenticationLibNull.inf\r
-!endif\r
     !if $(FTPM_ENABLE) == TRUE\r
       Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCDxe/Tpm2DeviceLibSeC.inf\r
     !else\r
@@ -1572,32 +1574,20 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
     !endif\r
 !endif\r
 \r
-  Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.inf\r
-\r
 !if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE)\r
   MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf\r
   MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf\r
 !endif\r
 \r
 !if $(CAPSULE_ENABLE)\r
-  SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf {\r
-    <LibraryClasses>\r
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
-      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
-      SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf\r
-      FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf\r
-  }\r
-  SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf {\r
-    <LibraryClasses>\r
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
-      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
-      SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf\r
-      FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf\r
-  }\r
+  !include Vlv2TbltDevicePkg/FmpMinnowMaxSystem.dsc\r
+  !include Vlv2TbltDevicePkg/FmpGreenSampleDevice.dsc\r
+  !include Vlv2TbltDevicePkg/FmpBlueSampleDevice.dsc\r
+  !include Vlv2TbltDevicePkg/FmpRedSampleDevice.dsc\r
 !endif\r
 \r
 !if $(MICOCODE_CAPSULE_ENABLE)\r
-  UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.inf {\r
+  IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.inf {\r
     <LibraryClasses>\r
       DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
       PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
@@ -1787,8 +1777,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
 \r
 \r
 [Components.X64]\r
- $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SysFwUpdateCapsuleDxe.inf\r
-\r
   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/I2cBus.inf {\r
     <PcdsPatchableInModule>\r
       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043\r

diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index cbdfb1b83aaf3125e072eb968f05ed0fbcd8e873..55c873d565a310bc69bf94e367e42dbb0bc38d9a 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -190,7 +190,6 @@
 !else\r
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf\r
 !endif\r
-  EdkiiSystemCapsuleLib|SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.inf\r
   FmpAuthenticationLib|MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAuthenticationLibNull.inf\r
   IniParsingLib|SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.inf\r
   PlatformFlashAccessLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/PlatformFlashAccessLib/PlatformFlashAccessLib.inf\r
@@ -706,7 +705,23 @@
   #\r
   gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000\r
 \r
-[PcdsFixedAtBuild.IA32.PEIM, PcdsFixedAtBuild.IA32.PEI_CORE, PcdsFixedAtBuild.IA32.SEC]\r
+  #\r
+  # Clear unused single certificate PCD\r
+  #\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdPkcs7CertBuffer|{0}\r
+\r
+  #\r
+  # Lock all updatable firmware devices at End of DXE\r
+  #\r
+  gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceLockEventGuid|{GUID(gEfiEndOfDxeEventGroupGuid)}\r
+#  gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceLockEventGuid|{GUID(gEfiEventReadyToBootGuid)}\r
+\r
+  #\r
+  # Set PcdFmpDeviceTestKeySha256Digest to {0} to disable test key detection\r
+  #\r
+#  gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceTestKeySha256Digest|{0}\r
+\r
+[PcdsFixedAtBuild.IA32]\r
 !if $(TARGET) == RELEASE\r
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0\r
   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x3\r
@@ -910,10 +925,10 @@
   gEfiVLVTokenSpaceGuid.PcdCpuSmramCpuDataAddress|0\r
   gEfiVLVTokenSpaceGuid.PcdCpuLockBoxSize|0\r
 \r
-!if $(CAPSULE_ENABLE) || $(RECOVERY_ENABLE)\r
-  gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareImageDescriptor|{0x0}|VOID*|0x100\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid|{0x7b, 0x26, 0x96, 0x40, 0x0a, 0xda, 0xeb, 0x42, 0xb5, 0xeb, 0xfe, 0xf3, 0x1d, 0x20, 0x7c, 0xb4}\r
-  gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareFileGuid|{0xb2, 0x9e, 0x9c, 0xaf, 0xad, 0x12, 0x3e, 0x4d, 0xa4, 0xd4, 0x96, 0xf6, 0xc9, 0x96, 0x62, 0x15}\r
+[PcdsDynamicExDefault.X64.DEFAULT]\r
+!if $(RECOVERY_ENABLE)\r
+  gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareFileGuid|{GUID("AF9C9EB2-12AD-4D3E-A4D4-96F6C9966215")}|VOID*|0x10\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid|{GUID("4096267b-da0a-42eb-b5eb-fef31d207cb4")}|VOID*|0x10\r
 !endif\r
 \r
 [Components.IA32]\r
@@ -937,14 +952,6 @@
   }\r
   !endif\r
 \r
-!if $(CAPSULE_ENABLE) || $(RECOVERY_ENABLE)\r
-  # FMP image decriptor\r
-  Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf {\r
-    <LibraryClasses>\r
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
-  }\r
-!endif\r
-\r
   MdeModulePkg/Core/Pei/PeiMain.inf {\r
 !if $(TARGET) == DEBUG\r
     <PcdsFixedAtBuild>\r
@@ -1187,11 +1194,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
       DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
       PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
       SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf\r
-!if $(CAPSULE_ENABLE)\r
-      FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf\r
-!else\r
-      FmpAuthenticationLib|MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAuthenticationLibNull.inf\r
-!endif\r
     !if $(FTPM_ENABLE) == TRUE\r
       Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCDxe/Tpm2DeviceLibSeC.inf\r
     !else\r
@@ -1560,32 +1562,20 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
     !endif\r
 !endif\r
 \r
-  Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.inf\r
-\r
 !if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE)\r
   MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf\r
   MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf\r
 !endif\r
 \r
 !if $(CAPSULE_ENABLE)\r
-  SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf {\r
-    <LibraryClasses>\r
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
-      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
-      SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf\r
-      FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf\r
-  }\r
-  SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf {\r
-    <LibraryClasses>\r
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
-      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
-      SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf\r
-      FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf\r
-  }\r
+  !include Vlv2TbltDevicePkg/FmpMinnowMaxSystem.dsc\r
+  !include Vlv2TbltDevicePkg/FmpGreenSampleDevice.dsc\r
+  !include Vlv2TbltDevicePkg/FmpBlueSampleDevice.dsc\r
+  !include Vlv2TbltDevicePkg/FmpRedSampleDevice.dsc\r
 !endif\r
 \r
 !if $(MICOCODE_CAPSULE_ENABLE)\r
-  UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.inf {\r
+  IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.inf {\r
     <LibraryClasses>\r
       DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
       PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
@@ -1776,8 +1766,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
 \r
 \r
 [Components.IA32]\r
- $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SysFwUpdateCapsuleDxe.inf\r
-\r
   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/I2cBus.inf {\r
     <PcdsPatchableInModule>\r
       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043\r

diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index 6396f7aad415ea5ae5ea6ca3ea724a5279ed24e7..fa6aa63491679a3599c74ccbf7c3ea4c55b0e51e 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -190,7 +190,6 @@
 !else\r
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf\r
 !endif\r
-  EdkiiSystemCapsuleLib|SignedCapsulePkg/Library/EdkiiSystemCapsuleLib/EdkiiSystemCapsuleLib.inf\r
   FmpAuthenticationLib|MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAuthenticationLibNull.inf\r
   IniParsingLib|SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.inf\r
   PlatformFlashAccessLib|Vlv2TbltDevicePkg/Feature/Capsule/Library/PlatformFlashAccessLib/PlatformFlashAccessLib.inf\r
@@ -706,6 +705,22 @@
   #\r
   gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000\r
 \r
+  #\r
+  # Clear unused single certificate PCD\r
+  #\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdPkcs7CertBuffer|{0}\r
+\r
+  #\r
+  # Lock all updatable firmware devices at End of DXE\r
+  #\r
+  gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceLockEventGuid|{GUID(gEfiEndOfDxeEventGroupGuid)}\r
+#  gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceLockEventGuid|{GUID(gEfiEventReadyToBootGuid)}\r
+\r
+  #\r
+  # Set PcdFmpDeviceTestKeySha256Digest to {0} to disable test key detection\r
+  #\r
+#  gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceTestKeySha256Digest|{0}\r
+\r
 [PcdsFixedAtBuild.IA32]\r
 !if $(TARGET) == RELEASE\r
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0\r
@@ -910,10 +925,10 @@
   gEfiVLVTokenSpaceGuid.PcdCpuSmramCpuDataAddress|0\r
   gEfiVLVTokenSpaceGuid.PcdCpuLockBoxSize|0\r
 \r
-!if $(CAPSULE_ENABLE) || $(RECOVERY_ENABLE)\r
-  gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareImageDescriptor|{0x0}|VOID*|0x100\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid|{0x7b, 0x26, 0x96, 0x40, 0x0a, 0xda, 0xeb, 0x42, 0xb5, 0xeb, 0xfe, 0xf3, 0x1d, 0x20, 0x7c, 0xb4}\r
-  gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareFileGuid|{0xb2, 0x9e, 0x9c, 0xaf, 0xad, 0x12, 0x3e, 0x4d, 0xa4, 0xd4, 0x96, 0xf6, 0xc9, 0x96, 0x62, 0x15}\r
+[PcdsDynamicExDefault.X64.DEFAULT]\r
+!if $(RECOVERY_ENABLE)\r
+  gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareFileGuid|{GUID("AF9C9EB2-12AD-4D3E-A4D4-96F6C9966215")}|VOID*|0x10\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid|{GUID("4096267b-da0a-42eb-b5eb-fef31d207cb4")}|VOID*|0x10\r
 !endif\r
 \r
 [Components.IA32]\r
@@ -937,14 +952,6 @@
   }\r
   !endif\r
 \r
-!if $(CAPSULE_ENABLE) || $(RECOVERY_ENABLE)\r
-  # FMP image decriptor\r
-  Vlv2TbltDevicePkg/Feature/Capsule/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf {\r
-    <LibraryClasses>\r
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
-  }\r
-!endif\r
-\r
   MdeModulePkg/Core/Pei/PeiMain.inf {\r
 !if $(TARGET) == DEBUG\r
     <PcdsFixedAtBuild>\r
@@ -1199,11 +1206,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
       DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
       PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
       SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf\r
-!if $(CAPSULE_ENABLE)\r
-      FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf\r
-!else\r
-      FmpAuthenticationLib|MdeModulePkg/Library/FmpAuthenticationLibNull/FmpAuthenticationLibNull.inf\r
-!endif\r
     !if $(FTPM_ENABLE) == TRUE\r
       Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCDxe/Tpm2DeviceLibSeC.inf\r
     !else\r
@@ -1572,32 +1574,20 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
     !endif\r
 !endif\r
 \r
-  Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.inf\r
-\r
 !if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE)\r
   MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf\r
   MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf\r
 !endif\r
 \r
 !if $(CAPSULE_ENABLE)\r
-  SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf {\r
-    <LibraryClasses>\r
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
-      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
-      SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf\r
-      FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf\r
-  }\r
-  SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf {\r
-    <LibraryClasses>\r
-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
-      PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
-      SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf\r
-      FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf\r
-  }\r
+  !include Vlv2TbltDevicePkg/FmpMinnowMaxSystem.dsc\r
+  !include Vlv2TbltDevicePkg/FmpGreenSampleDevice.dsc\r
+  !include Vlv2TbltDevicePkg/FmpBlueSampleDevice.dsc\r
+  !include Vlv2TbltDevicePkg/FmpRedSampleDevice.dsc\r
 !endif\r
 \r
 !if $(MICOCODE_CAPSULE_ENABLE)\r
-  UefiCpuPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.inf {\r
+  IntelSiliconPkg/Feature/Capsule/MicrocodeUpdateDxe/MicrocodeUpdateDxe.inf {\r
     <LibraryClasses>\r
       DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
       PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
@@ -1788,8 +1778,6 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
 \r
 \r
 [Components.X64]\r
- $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SysFwUpdateCapsuleDxe.inf\r
-\r
   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/I2cBus.inf {\r
     <PcdsPatchableInModule>\r
       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0xF0000043\r