# @file\r
# Workspace file for KVMTool virtual platform.\r
#\r
-# Copyright (c) 2018 - 2021, ARM Limited. All rights reserved.\r
+# Copyright (c) 2018 - 2022, ARM Limited. All rights reserved.\r
#\r
# SPDX-License-Identifier: BSD-2-Clause-Patent\r
#\r
SKUID_IDENTIFIER = DEFAULT\r
FLASH_DEFINITION = ArmVirtPkg/ArmVirtKvmTool.fdf\r
\r
+[Defines.AARCH64]\r
+ DEFINE ACPIVIEW_ENABLE = TRUE\r
+\r
!include ArmVirtPkg/ArmVirt.dsc.inc\r
\r
+!if $(ARCH) == AARCH64\r
+!include DynamicTablesPkg/DynamicTables.dsc.inc\r
+!endif\r
+\r
!include MdePkg/MdeLibs.dsc.inc\r
\r
[LibraryClasses.common]\r
ArmVirtMemInfoLib|ArmVirtPkg/Library/KvmtoolVirtMemInfoLib/KvmtoolVirtMemInfoLib.inf\r
\r
TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf\r
- NorFlashPlatformLib|ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf\r
+ VirtNorFlashPlatformLib|ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf\r
\r
CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf\r
\r
PlatformHookLib|ArmVirtPkg/Library/Fdt16550SerialPortHookLib/Fdt16550SerialPortHookLib.inf\r
SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf\r
\r
+ HwInfoParserLib|DynamicTablesPkg/Library/FdtHwInfoParserLib/FdtHwInfoParserLib.inf\r
+ DynamicPlatRepoLib|DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/DynamicPlatRepoLib.inf\r
+\r
+ ArmMonitorLib|ArmPkg/Library/ArmMonitorLib/ArmMonitorLib.inf\r
+ ArmTrngLib|ArmPkg/Library/ArmTrngLib/ArmTrngLib.inf\r
+\r
[LibraryClasses.common.SEC, LibraryClasses.common.PEI_CORE, LibraryClasses.common.PEIM]\r
PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf\r
PlatformHookLib|ArmVirtPkg/Library/Fdt16550SerialPortHookLib/EarlyFdt16550SerialPortHookLib.inf\r
# Use MMIO for accessing RTC controller registers.\r
gPcAtChipsetPkgTokenSpaceGuid.PcdRtcUseMmio|TRUE\r
\r
+ gArmTokenSpaceGuid.PcdMonitorConduitHvc|TRUE\r
+\r
[PcdsFixedAtBuild.common]\r
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000000F\r
\r
\r
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x0\r
\r
-[PcdsDynamicDefault.common]\r
- gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3\r
+[PcdsDynamicHii]\r
+ gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5\r
\r
+[PcdsDynamicDefault.common]\r
gArmTokenSpaceGuid.PcdArmArchTimerSecIntrNum|0x0\r
gArmTokenSpaceGuid.PcdArmArchTimerIntrNum|0x0\r
gArmTokenSpaceGuid.PcdArmArchTimerVirtIntrNum|0x0\r
gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|640\r
gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|480\r
\r
- ## Force DTB\r
- gArmVirtTokenSpaceGuid.PcdForceNoAcpi|TRUE\r
-\r
# Setup Flash storage variables\r
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0\r
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize|0x40000\r
NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf\r
}\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
\r
MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
\r
}\r
OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf\r
OvmfPkg/Virtio10Dxe/Virtio10.inf\r
+\r
+ #\r
+ # Rng Support\r
+ #\r
+ SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf\r
+\r
+!if $(ARCH) == AARCH64\r
+ #\r
+ # ACPI Support\r
+ #\r
+ ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManagerDxe.inf\r
+!endif\r