#\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.<BR>\r
+# Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.<BR>\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
DSC_SPECIFICATION = 0x00010005\r
OUTPUT_DIRECTORY = Build/ArmVirtXen-$(ARCH)\r
SUPPORTED_ARCHITECTURES = AARCH64|ARM\r
- BUILD_TARGETS = DEBUG|RELEASE\r
+ BUILD_TARGETS = DEBUG|RELEASE|NOOPT\r
SKUID_IDENTIFIER = DEFAULT\r
FLASH_DEFINITION = ArmVirtPkg/ArmVirtXen.fdf\r
\r
!include ArmVirtPkg/ArmVirt.dsc.inc\r
\r
+!include MdePkg/MdeLibs.dsc.inc\r
+\r
[LibraryClasses]\r
SerialPortLib|OvmfPkg/Library/XenConsoleSerialPortLib/XenConsoleSerialPortLib.inf\r
- RealTimeClockLib|ArmVirtPkg/Library/XenRealTimeClockLib/XenRealTimeClockLib.inf\r
+ RealTimeClockLib|OvmfPkg/Library/XenRealTimeClockLib/XenRealTimeClockLib.inf\r
XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf\r
\r
+ ArmGenericTimerCounterLib|ArmVirtPkg/Library/XenArmGenericTimerVirtCounterLib/XenArmGenericTimerVirtCounterLib.inf\r
ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf\r
ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf\r
\r
BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf\r
PlatformBootManagerLib|ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf\r
CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf\r
+ TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf\r
+ TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLibNull/PeiDxeTpmPlatformHierarchyLib.inf\r
\r
[LibraryClasses.common.UEFI_DRIVER]\r
UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf\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
+[BuildOptions]\r
+ #\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:*_*_*_CC_FLAGS = -fno-jump-tables\r
\r
################################################################################\r
#\r
\r
[PcdsFixedAtBuild.common]\r
gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)"\r
-\r
- gArmPlatformTokenSpaceGuid.PcdCoreCount|1\r
!if $(ARCH) == AARCH64\r
gArmTokenSpaceGuid.PcdVFPEnabled|1\r
!endif\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
- gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }\r
\r
## Default Terminal Type\r
## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM\r
gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4\r
\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
+ #\r
+ # Make VariableRuntimeDxe work at emulated non-volatile variable mode.\r
+ #\r
+ gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable|TRUE\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
gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x0\r
gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x0\r
\r
- ## PL031 RealTimeClock\r
- gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0\r
-\r
gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3\r
\r
################################################################################\r
MdeModulePkg/Core/Dxe/DxeMain.inf {\r
<LibraryClasses>\r
NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf\r
+ DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
}\r
MdeModulePkg/Universal/PCD/Dxe/Pcd.inf {\r
<LibraryClasses>\r
MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf\r
\r
- MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf\r
+ MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {\r
+ <LibraryClasses>\r
+ NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf\r
+ }\r
\r
MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf\r
MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf\r
# Platform Driver\r
#\r
ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf\r
- ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf\r
+ EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf\r
\r
#\r
# FAT filesystem + GPT/MBR partitioning + UDF filesystem\r
#\r
# Bds\r
#\r
- MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
+ MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf {\r
+ <LibraryClasses>\r
+ DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
+ PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
+ }\r
MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf\r
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r