#\r
# Copyright (c) 2011-2015, ARM Limited. All rights reserved.\r
# Copyright (c) 2014, Linaro Limited. All rights reserved.\r
-# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.\r
+# Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.\r
#\r
# SPDX-License-Identifier: BSD-2-Clause-Patent\r
#\r
DEFINE NETWORK_SNP_ENABLE = FALSE\r
DEFINE NETWORK_TLS_ENABLE = FALSE\r
DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE\r
+ DEFINE NETWORK_ISCSI_ENABLE = FALSE\r
\r
!if $(NETWORK_SNP_ENABLE) == TRUE\r
!error "NETWORK_SNP_ENABLE is IA32/X64/EBC only"\r
\r
!include ArmVirtPkg/ArmVirt.dsc.inc\r
\r
+!include MdePkg/MdeLibs.dsc.inc\r
+\r
[LibraryClasses.common]\r
ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf\r
ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf\r
# Virtio Support\r
VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf\r
VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf\r
- QemuFwCfgLib|ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf\r
+ QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMmio.inf\r
QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/BaseQemuFwCfgS3LibNull.inf\r
+ QemuFwCfgSimpleParserLib|OvmfPkg/Library/QemuFwCfgSimpleParserLib/QemuFwCfgSimpleParserLib.inf\r
+ QemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf\r
\r
ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.inf\r
\r
TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf\r
- NorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf\r
+ VirtNorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf\r
\r
CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf\r
BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.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
+ PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf\r
- PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf\r
+ PciHostBridgeLib|OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf\r
+ PciHostBridgeUtilityLib|OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf\r
+ TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf\r
+ TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLibNull/PeiDxeTpmPlatformHierarchyLib.inf\r
\r
[LibraryClasses.common.DXE_DRIVER]\r
ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf\r
[LibraryClasses.common.UEFI_DRIVER]\r
UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf\r
\r
-[BuildOptions.common.EDKII.SEC, BuildOptions.common.EDKII.BASE]\r
+[BuildOptions]\r
+!include NetworkPkg/NetworkBuildOptions.dsc.inc\r
+\r
#\r
- # CLANG38 with LTO support enabled uses the GNU GOLD linker, which insists\r
- # on emitting GOT based symbol references when running in shared mode, unless\r
- # we override visibility to 'hidden' in all modules that make up the PrePi\r
- # build.\r
+ # We need to avoid jump tables in SEC modules, so that the PE/COFF\r
+ # self-relocation code itself is guaranteed to be position independent.\r
#\r
- GCC:*_CLANG38_*_CC_FLAGS = -include $(WORKSPACE)/ArmVirtPkg/Include/Platform/Hidden.h\r
+ GCC:*_*_*_CC_FLAGS = -fno-jump-tables\r
\r
################################################################################\r
#\r
!endif\r
\r
gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|3\r
+ gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize|0x20000\r
\r
[PcdsPatchableInModule.common]\r
+ # we need to provide a resolution for this PCD that supports PcdSet64()\r
+ # being called from ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c,\r
+ # even though that call will be compiled out on this platform as it does\r
+ # not (and cannot) support the TPM2 driver stack\r
+ gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0x0\r
+\r
#\r
# This will be overridden in the code\r
#\r
# PCD and PcdPciDisableBusEnumeration above have not been assigned yet\r
gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xFFFFFFFFFFFFFFFF\r
\r
- gArmTokenSpaceGuid.PcdPciIoTranslation|0x0\r
+ gEfiMdePkgTokenSpaceGuid.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
- gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|800\r
- gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|600\r
+ gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|1280\r
+ gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|800\r
gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|640\r
gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|480\r
+ gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|0\r
+ gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|0\r
\r
#\r
# SMBIOS entry point version\r
gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0\r
gUefiOvmfPkgTokenSpaceGuid.PcdQemuSmbiosValidated|FALSE\r
\r
+ #\r
+ # IPv4 and IPv6 PXE Boot support.\r
+ #\r
+ gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01\r
+ gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01\r
+\r
################################################################################\r
#\r
# Components Section - list of all EDK II Modules needed by this Platform\r
<LibraryClasses>\r
NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf\r
}\r
- ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf\r
+ OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.inf {\r
+ <LibraryClasses>\r
+ # don't use unaligned CopyMem () on the UEFI varstore NOR flash region\r
+ BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf\r
+ }\r
MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
\r
#\r
#\r
# Platform Driver\r
#\r
- ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf\r
- ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf\r
- ArmVirtPkg/HighMemDxe/HighMemDxe.inf\r
+ OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf\r
+ EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf\r
+ OvmfPkg/Fdt/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 + UDF filesystem\r
+ # FAT filesystem + GPT/MBR partitioning + UDF filesystem + virtio-fs\r
#\r
MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
FatPkg/EnhancedFatDxe/Fat.inf\r
MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf\r
+ OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf\r
\r
#\r
# Bds\r
NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf\r
NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf\r
}\r
+ OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf {\r
+ <LibraryClasses>\r
+ NULL|OvmfPkg/Library/BlobVerifierLibNull/BlobVerifierLibNull.inf\r
+ }\r
\r
#\r
# Networking stack\r
#\r
!include NetworkPkg/NetworkComponents.dsc.inc\r
+\r
+ NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf {\r
+ <LibraryClasses>\r
+ NULL|OvmfPkg/Library/PxeBcPcdProducerLib/PxeBcPcdProducerLib.inf\r
+ }\r
+\r
!if $(NETWORK_TLS_ENABLE) == TRUE\r
NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf {\r
<LibraryClasses>\r
MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf\r
MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf\r
\r
+ #\r
+ # NVME Driver\r
+ #\r
+ MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf\r
+\r
#\r
# SMBIOS Support\r
#\r
#\r
ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf {\r
<LibraryClasses>\r
- NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
+ NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
}\r
MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf {\r
<LibraryClasses>\r
- NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
+ NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
}\r
+ OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf\r
OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf\r
OvmfPkg/Virtio10Dxe/Virtio10.inf\r
\r
#\r
# ACPI Support\r
#\r
- ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf\r
+ OvmfPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf\r
[Components.AARCH64]\r
MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf\r
- OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf {\r
+ OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf {\r
<LibraryClasses>\r
- NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
+ NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
}\r
projects / mirror_edk2.git / blobdiff