INF DuetPkg/DataHubGenDxe/DataHubGen.inf\r
#INF DuetPkg/FvbRuntimeService/DUETFwh.inf\r
INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf\r
-INF DuetPkg/CpuIoDxe/CpuIo.inf\r
+INF UefiCpuPkg/CpuIoDxe/CpuIo.inf\r
INF DuetPkg/CpuDxe/Cpu.inf\r
\r
INF IntelFrameworkModulePkg/Universal/Legacy8259Dxe/8259.inf\r
-INF DuetPkg/KbcResetDxe/Reset.inf\r
+INF PcAtChipsetPkg/KbcResetDxe/Reset.inf\r
INF DuetPkg/LegacyMetronome/Metronome.inf\r
-INF DuetPkg/8254TimerDxe/8254Timer.inf\r
-INF DuetPkg/PcRtc/RealTimeClock.inf\r
+INF PcAtChipsetPkg/8254TimerDxe/8254Timer.inf\r
+INF PcAtChipsetPkg/PcRtc/RealTimeClock.inf\r
INF DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf\r
INF DuetPkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf\r
INF IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf\r
#IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf\r
\r
# Usb Support\r
-#INF MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf\r
-#INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
-#INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
-#INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf\r
+INF MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf\r
+INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
+INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
+INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf\r
\r
# ISA Support\r
-INF DuetPkg/IsaAcpiDxe/IsaAcpi.inf\r
+INF PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf\r
INF IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf\r
INF IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf\r
INF IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf\r