INF UefiCpuPkg/CpuDxe/CpuDxe.inf\r
INF PcAtChipsetPkg/8254TimerDxe/8254Timer.inf\r
INF PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
-INF IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
+INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
INF PcAtChipsetPkg/KbcResetDxe/Reset.inf\r
INF MdeModulePkg/Universal/Metronome/Metronome.inf\r
INF PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf\r
\r
-INF MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf\r
+INF OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf\r
+INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf\r
+INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf\r
INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf\r
INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
\r
-INF OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf\r
-\r
INF PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf\r
INF IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf\r
INF IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf\r
# PEI Phase modules\r
#\r
INF MdeModulePkg/Core/Pei/PeiMain.inf\r
-INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
-INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf\r
-INF OvmfPkg/PlatformPei/PlatformPei.inf\r
+INF RuleOverride=NORELOC MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
+INF RuleOverride=NORELOC IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf\r
+INF RuleOverride=NORELOC OvmfPkg/PlatformPei/PlatformPei.inf\r
INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
\r
#\r
\r
[Rule.Common.PEI_CORE]\r
FILE PEI_CORE = $(NAMED_GUID) {\r
- PE32 PE32 |.efi\r
+ PE32 PE32 Align=32 |.efi\r
UI STRING ="$(MODULE_NAME)" Optional\r
VERSION STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
}\r
VERSION STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
}\r
\r
+[Rule.Common.PEIM.NORELOC]\r
+ FILE PEIM = $(NAMED_GUID) RELOCS_STRIPPED {\r
+ PEI_DEPEX PEI_DEPEX Optional |.depex\r
+ TE TE |.efi\r
+ UI STRING="$(MODULE_NAME)" Optional\r
+ VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
+ }\r
+\r
[Rule.Common.PEIM]\r
FILE PEIM = $(NAMED_GUID) {\r
PEI_DEPEX PEI_DEPEX Optional |.depex\r
- PE32 PE32 |.efi\r
+ PE32 PE32 Align=32 |.efi\r
UI STRING="$(MODULE_NAME)" Optional\r
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
}\r
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
}\r
\r
-[Rule.Common.DXE_DRIVER.ACPITABLE]\r
+[Rule.Common.USER_DEFINED.ACPITABLE]\r
FILE FREEFORM = $(NAMED_GUID) {\r
RAW ACPI |.acpi\r
RAW ASL |.aml\r
RAW RAW |.raw\r
}\r
\r
+[OptionRom.CirrusLogic5446]\r
+INF OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf {\r
+ PCI_DEVICE_ID = 0x00B8\r
+ }\r
+\r