#\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
-# This program and the accompanying materials\r
-# are licensed and made available under the terms and conditions of the BSD License\r
-# which accompanies this distribution. The full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+# SPDX-License-Identifier: BSD-2-Clause-Patent\r
#\r
#\r
\r
# Defines for default states. These can be changed on the command line.\r
# -D FLAG=VALUE\r
#\r
+ DEFINE TTY_TERMINAL = FALSE\r
DEFINE SECURE_BOOT_ENABLE = FALSE\r
- DEFINE NETWORK_IP6_ENABLE = FALSE\r
- DEFINE HTTP_BOOT_ENABLE = FALSE\r
+\r
+ #\r
+ # Network definition\r
+ #\r
+ DEFINE NETWORK_IP6_ENABLE = FALSE\r
+ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE\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
+!endif\r
+\r
+!include NetworkPkg/NetworkDefines.dsc.inc\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
PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf\r
+ PlatformBmPrintScLib|OvmfPkg/Library/PlatformBmPrintScLib/PlatformBmPrintScLib.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
+ 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
\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
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE\r
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE\r
\r
+ gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE\r
+\r
[PcdsFixedAtBuild.common]\r
- gArmPlatformTokenSpaceGuid.PcdCoreCount|1\r
!if $(ARCH) == AARCH64\r
gArmTokenSpaceGuid.PcdVFPEnabled|1\r
!endif\r
\r
- gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase|0x4007c000\r
gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize|0x4000\r
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000\r
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x2800\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
+ #\r
+ # The cumulative and individual VOLATILE variable size limits should be set\r
+ # high enough for accommodating several and/or large CA certificates.\r
+ #\r
+ gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x80000\r
+ gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVolatileVariableSize|0x40000\r
+!endif\r
\r
# Size of the region used by UEFI in permanent memory (Reserved 64MB)\r
gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000\r
\r
- ## Trustzone enable (to make the transition from EL3 to EL2 in ArmPlatformPkg/Sec)\r
- gArmTokenSpaceGuid.PcdTrustzoneSupport|FALSE\r
-\r
#\r
# ARM PrimeCell\r
#\r
## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM\r
!if $(TTY_TERMINAL) == TRUE\r
gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4\r
+ # Set terminal type to TtyTerm, the value encoded is EFI_TTY_TERM_GUID\r
+ gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x80, 0x6d, 0x91, 0x7d, 0xb1, 0x5b, 0x8c, 0x45, 0xa4, 0x8f, 0xe2, 0x5f, 0xdd, 0x51, 0xef, 0x94}\r
!else\r
gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|1\r
!endif\r
#\r
gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0\r
\r
-!if $(HTTP_BOOT_ENABLE) == TRUE\r
- gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE\r
-!endif\r
+ #\r
+ # Network Pcds\r
+ #\r
+!include NetworkPkg/NetworkPcds.dsc.inc\r
\r
gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE\r
gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }\r
#\r
gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16\r
\r
+!if $(SECURE_BOOT_ENABLE) == TRUE\r
+ # override the default values from SecurityPkg to ensure images from all sources are verified in secure boot\r
+ gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x04\r
+ gEfiSecurityPkgTokenSpaceGuid.PcdFixedMediaImageVerificationPolicy|0x04\r
+ gEfiSecurityPkgTokenSpaceGuid.PcdRemovableMediaImageVerificationPolicy|0x04\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
NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf\r
}\r
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
+ OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf\r
!else\r
MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
!endif\r
<LibraryClasses>\r
NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf\r
}\r
- ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf\r
+ OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.inf\r
MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
\r
+ #\r
+ # Status Code Routing\r
+ #\r
+ MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf\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
- MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf\r
- MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf\r
- MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf\r
- MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf\r
- MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf\r
- MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
- MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
- MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
- NetworkPkg/TcpDxe/TcpDxe.inf\r
- NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
- NetworkPkg/IScsiDxe/IScsiDxe.inf\r
-!if $(NETWORK_IP6_ENABLE) == TRUE\r
- NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
- NetworkPkg/Udp6Dxe/Udp6Dxe.inf\r
- NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
- NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
-!endif\r
-!if $(HTTP_BOOT_ENABLE) == TRUE\r
- NetworkPkg/DnsDxe/DnsDxe.inf\r
- NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf\r
- NetworkPkg/HttpDxe/HttpDxe.inf\r
- NetworkPkg/HttpBootDxe/HttpBootDxe.inf\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
+ NULL|OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf\r
+ }\r
!endif\r
\r
#\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
ArmVirtPkg/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