!include ArmVirtPkg/ArmVirt.dsc.inc\r
\r
[LibraryClasses.AARCH64]\r
- ArmLib|ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf\r
ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexAEMv8Lib/ArmCortexAEMv8Lib.inf\r
\r
[LibraryClasses.ARM]\r
- ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf\r
ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Lib.inf\r
\r
[LibraryClasses.common]\r
+ ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf\r
+ ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf\r
+\r
# Virtio Support\r
VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf\r
VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf\r
CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf\r
UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf\r
BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf\r
- ImageDecoderLib|MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.inf\r
PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf\r
CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf\r
+ FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf\r
QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf\r
FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf\r
PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
+ PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf\r
+ PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf\r
\r
[LibraryClasses.common.UEFI_DRIVER]\r
UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf\r
GCC:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a15 -I$(WORKSPACE)/ArmVirtPkg/Include\r
*_*_AARCH64_PLATFORM_FLAGS == -I$(WORKSPACE)/ArmVirtPkg/Include\r
\r
+[BuildOptions.ARM.EDKII.SEC, BuildOptions.ARM.EDKII.BASE]\r
+ # Avoid MOVT/MOVW instruction pairs in code that may end up in the PIE\r
+ # executable we build for the relocatable PrePi. They are not runtime\r
+ # relocatable in ELF.\r
+ *_CLANG35_*_CC_FLAGS = -mno-movt\r
\r
################################################################################\r
#\r
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE\r
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE\r
\r
- # Activate KVM workaround for now.\r
- gArmVirtTokenSpaceGuid.PcdKludgeMapPciMmioAsCached|TRUE\r
-\r
[PcdsFixedAtBuild.common]\r
gArmPlatformTokenSpaceGuid.PcdCoreCount|1\r
!if $(ARCH) == AARCH64\r
# PCD and PcdPciDisableBusEnumeration above have not been assigned yet\r
gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xFFFFFFFFFFFFFFFF\r
\r
+ gArmTokenSpaceGuid.PcdPciIoTranslation|0x0\r
+\r
#\r
# Set video resolution for boot options and for text setup.\r
# PlatformDxe can set the former at runtime.\r
#\r
ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf\r
ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf\r
+ ArmVirtPkg/HighMemDxe/HighMemDxe.inf\r
OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
OvmfPkg/VirtioScsiDxe/VirtioScsi.inf\r
OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
+ OvmfPkg/VirtioRngDxe/VirtioRng.inf\r
\r
#\r
# FAT filesystem + GPT/MBR partitioning\r
MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf\r
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
- MdeModulePkg/Universal/BdsDxe/BdsDxe.inf {\r
- <LibraryClasses>\r
- NULL|MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.inf\r
- }\r
+ MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf\r
+ MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
+ MdeModulePkg/Logo/LogoDxe.inf\r
MdeModulePkg/Application/UiApp/UiApp.inf {\r
<LibraryClasses>\r
NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf\r
OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf\r
\r
#\r
- # ACPI Support\r
+ # PCI support\r
#\r
- MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
- OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf {\r
+ ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf {\r
<LibraryClasses>\r
NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
}\r
-\r
- #\r
- # PCI support\r
- #\r
- ArmVirtPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
+ MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf {\r
<LibraryClasses>\r
NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
#\r
# Video support\r
#\r
- OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {\r
- <LibraryClasses>\r
- BltLib|OptionRomPkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf\r
- }\r
+ OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf\r
+ OvmfPkg/VirtioGpuDxe/VirtioGpu.inf\r
OvmfPkg/PlatformDxe/Platform.inf\r
\r
#\r
MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf\r
MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
+\r
+[Components.AARCH64]\r
+ #\r
+ # ACPI Support\r
+ #\r
+ OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf {\r
+ <LibraryClasses>\r
+ NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
+ }\r