UefiCpuPkg/Include/Register/Msr/*.h: Add new MSR.

[mirror_edk2.git] / Vlv2TbltDevicePkg / PlatformPkg.fdf

diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index 846db044b4037b0143828d06bc023b3fe1b4e59d..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
@@ -319,7 +319,7 @@ INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET
 INF EdkCompatibilityPkg/Compatibility/AcpiVariableHobOnSmramReserveHobThunk/AcpiVariableHobOnSmramReserveHobThunk.inf\r
 !endif\r
 \r
-INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PiSmmCommunicationPei.inf\r
+# INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PiSmmCommunicationPei.inf\r
 !if $(TPM_ENABLED) == TRUE\r
 INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf\r
 INF SecurityPkg/Tcg/TcgPei/TcgPei.inf\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
@@ -473,6 +468,7 @@ INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
 INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/MpCpu.inf\r
 INF $(PLATFORM_PACKAGE)/Metronome/Metronome.inf\r
 INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf\r
+INF USE=X64 MdeModulePkg/Logo/Logo.inf\r
 INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
 INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
 INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf\r
@@ -612,6 +608,8 @@ INF RuleOverride = ACPITABLE $(PLATFORM_RC_PACKAGE)/AcpiTablesPCAT/AcpiTables.in
 \r
 INF $(PLATFORM_PACKAGE)/AcpiPlatform/AcpiPlatform.inf\r
 \r
+INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf\r
+\r
   #\r
   # PCI\r
   #\r
@@ -635,8 +633,8 @@ INF  IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
 #\r
 # SDIO\r
 #\r
-INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/MmcHost.inf\r
-INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/MmcMediaDevice.inf\r
+#INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/MmcHost.inf\r
+#INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/MmcMediaDevice.inf\r
 #\r
 # IDE/SCSI/AHCI\r
 #\r
@@ -772,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
@@ -789,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
@@ -858,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
@@ -1091,6 +1067,12 @@ INF  SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf
     RAW BIN                |.bin\r
   }\r
 \r
+[Rule.Common.USER_DEFINED.BINARY]\r
+  FILE FREEFORM = $(NAMED_GUID) {\r
+    UI  STRING="$(MODULE_NAME)" Optional\r
+    RAW BIN                |.bin\r
+  }\r
+\r
 [Rule.Common.USER_DEFINED.ACPITABLE]\r
   FILE FREEFORM = $(NAMED_GUID) {\r
     RAW ACPI  Optional            |.acpi\r