OvmfPkg/RiscVVirt: Add build files for Qemu Virt platform

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4076

Add infrastructure files to build edk2 for RISC-V qemu virt machine.

- It follows PEI less design.
- EDK2 for qemu virt is booted in S-mode as a payload for M-mode FW
- Leveraged from ArmVirtQemu

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
Acked-by: Abner Chang <abner.chang@amd.com>
Reviewed-by: Andrei Warkentin <andrei.warkentin@intel.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Jiewen Yao <Jiewen.yao@intel.com>

5 files changed, 1266 insertions, 0 deletions

diff --git a/OvmfPkg/RiscVVirt/RiscVVirt.dsc.inc b/OvmfPkg/RiscVVirt/RiscVVirt.dsc.inc
new file mode 100644
index 0000000000..731f54f73f
--- /dev/null
+++ b/OvmfPkg/RiscVVirt/RiscVVirt.dsc.inc
@@ -0,0 +1,336 @@
+#

+#  Copyright (c) 2022, Ventana Micro Systems Inc. All rights reserved.

+#  Copyright (c) 2011 - 2022, ARM Limited. All rights reserved.

+#  Copyright (c) 2014, Linaro Limited. All rights reserved.

+#  Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.

+#  Copyright (c) Microsoft Corporation.

+#

+#  SPDX-License-Identifier: BSD-2-Clause-Patent

+#

+#

+

+[Defines]

+  DEFINE DEBUG_PRINT_ERROR_LEVEL = 0x80000047

+

+[LibraryClasses.common]

+!ifdef $(SOURCE_DEBUG_ENABLE)

+  PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf

+  DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf

+!else

+  PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf

+  DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf

+  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf

+!endif

+!if $(DEBUG_ON_SERIAL_PORT) == TRUE

+  DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

+!else

+  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf

+!endif

+  DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf

+  PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf

+  BaseLib|MdePkg/Library/BaseLib/BaseLib.inf

+  SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf

+  BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupportLib.inf

+  SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf

+  PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf

+  PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf

+  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf

+  IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf

+  UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf

+  CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf

+  CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf

+  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf

+  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

+  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf

+  DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf

+  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf

+  DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf

+  DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf

+  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf

+  UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf

+  HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf

+  UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf

+  SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf

+  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf

+  ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf

+  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf

+  PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf

+  UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf

+  OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf

+  OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf

+  PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf

+

+  #

+  # Ramdisk Requirements

+  #

+  FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf

+

+  # Allow dynamic PCDs

+  #

+

+  BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

+

+  # Networking Requirements

+!include NetworkPkg/NetworkLibs.dsc.inc

+!if $(NETWORK_TLS_ENABLE) == TRUE

+  TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf

+!endif

+

+

+  # Add support for GCC stack protector

+  NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf

+

+  # RISC-V Architectural Libraries

+  CpuExceptionHandlerLib|UefiCpuPkg/Library/BaseRiscV64CpuExceptionHandlerLib/BaseRiscV64CpuExceptionHandlerLib.inf

+  RiscVSbiLib|MdePkg/Library/BaseRiscVSbiLib/BaseRiscVSbiLib.inf

+  PlatformBootManagerLib|OvmfPkg/RiscVVirt/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf

+  ResetSystemLib|OvmfPkg/RiscVVirt/Library/ResetSystemLib/BaseResetSystemLib.inf

+

+  RealTimeClockLib|EmbeddedPkg/Library/VirtualRealTimeClockLib/VirtualRealTimeClockLib.inf

+  TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf

+  SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf

+

+  DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf

+  DebugAgentTimerLib|EmbeddedPkg/Library/DebugAgentTimerLibNull/DebugAgentTimerLibNull.inf

+

+  # Flattened Device Tree (FDT) access library

+  FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf

+

+  # PCI Libraries

+  PciLib|MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf

+  PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf

+  PciCapLib|OvmfPkg/Library/BasePciCapLib/BasePciCapLib.inf

+  PciCapPciSegmentLib|OvmfPkg/Library/BasePciCapPciSegmentLib/BasePciCapPciSegmentLib.inf

+  PciCapPciIoLib|OvmfPkg/Library/UefiPciCapPciIoLib/UefiPciCapPciIoLib.inf

+  DxeHardwareInfoLib|OvmfPkg/Library/HardwareInfoLib/DxeHardwareInfoLib.inf

+

+  # USB Libraries

+  UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf

+

+  #

+  # CryptoPkg libraries needed by multiple firmware features

+  #

+  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

+!if $(NETWORK_TLS_ENABLE) == TRUE

+  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf

+!else

+  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf

+!endif

+  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf

+  RngLib|MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf

+

+  #

+  # Secure Boot dependencies

+  #

+!if $(SECURE_BOOT_ENABLE) == TRUE

+  AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf

+  SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf

+  SecureBootVariableProvisionLib|SecurityPkg/Library/SecureBootVariableProvisionLib/SecureBootVariableProvisionLib.inf

+  PlatformPKProtectionLib|SecurityPkg/Library/PlatformPKProtectionLibVarPolicy/PlatformPKProtectionLibVarPolicy.inf

+

+  # re-use the UserPhysicalPresent() dummy implementation from the ovmf tree

+  PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf

+!else

+  AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf

+!endif

+  VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf

+  VariableFlashInfoLib|MdeModulePkg/Library/BaseVariableFlashInfoLib/BaseVariableFlashInfoLib.inf

+  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf

+  VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf

+  UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf

+  ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

+  PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf

+  ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf

+  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

+  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

+

+[LibraryClasses.common.SEC]

+  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

+  BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

+  PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf

+  ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf

+  ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.inf

+  PlatformSecLib|UefiCpuPkg/Library/PlatformSecLibNull/PlatformSecLibNull.inf

+  HobLib|EmbeddedPkg/Library/PrePiHobLib/PrePiHobLib.inf

+  PrePiHobListPointerLib|OvmfPkg/RiscVVirt/Library/PrePiHobListPointerLib/PrePiHobListPointerLib.inf

+  MemoryAllocationLib|EmbeddedPkg/Library/PrePiMemoryAllocationLib/PrePiMemoryAllocationLib.inf

+

+[LibraryClasses.common.DXE_CORE]

+  PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf

+  HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf

+  MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf

+  DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf

+

+[LibraryClasses.common.DXE_DRIVER]

+  SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf

+  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

+

+[LibraryClasses.common.UEFI_APPLICATION]

+  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

+  HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf

+

+[LibraryClasses.common.UEFI_DRIVER]

+  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

+

+[LibraryClasses.common.DXE_RUNTIME_DRIVER]

+  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

+  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf

+!if $(DEBUG_ON_SERIAL_PORT) == TRUE

+  DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf

+!endif

+  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf

+

+!if $(SECURE_BOOT_ENABLE) == TRUE

+  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf

+!endif

+

+################################################################################

+#

+# Pcd Section - list of all EDK II PCD Entries defined by this Platform

+#

+################################################################################

+

+[PcdsFeatureFlag.common]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdHiiOsRuntimeSupport|FALSE

+

+  gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob|TRUE

+

+[PcdsFeatureFlag]

+  #

+  # Activate AcpiSdtProtocol

+  #

+  gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE

+

+[PcdsFixedAtBuild.common]

+  gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000

+  gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000

+  gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|0

+  gEfiMdePkgTokenSpaceGuid.PcdSpinLockTimeout|10000000

+  gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|320

+

+  # DEBUG_ASSERT_ENABLED       0x01

+  # DEBUG_PRINT_ENABLED        0x02

+  # DEBUG_CODE_ENABLED         0x04

+  # CLEAR_MEMORY_ENABLED       0x08

+  # ASSERT_BREAKPOINT_ENABLED  0x10

+  # ASSERT_DEADLOOP_ENABLED    0x20

+!if $(DEBUG_ON_SERIAL_PORT) != TRUE

+  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x21

+!else

+  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2f

+!endif

+

+  #  DEBUG_INIT      0x00000001  // Initialization

+  #  DEBUG_WARN      0x00000002  // Warnings

+  #  DEBUG_LOAD      0x00000004  // Load events

+  #  DEBUG_FS        0x00000008  // EFI File system

+  #  DEBUG_POOL      0x00000010  // Alloc & Free (pool)

+  #  DEBUG_PAGE      0x00000020  // Alloc & Free (page)

+  #  DEBUG_INFO      0x00000040  // Informational debug messages

+  #  DEBUG_DISPATCH  0x00000080  // PEI/DXE/SMM Dispatchers

+  #  DEBUG_VARIABLE  0x00000100  // Variable

+  #  DEBUG_BM        0x00000400  // Boot Manager

+  #  DEBUG_BLKIO     0x00001000  // BlkIo Driver

+  #  DEBUG_NET       0x00004000  // SNP Driver

+  #  DEBUG_UNDI      0x00010000  // UNDI Driver

+  #  DEBUG_LOADFILE  0x00020000  // LoadFile

+  #  DEBUG_EVENT     0x00080000  // Event messages

+  #  DEBUG_GCD       0x00100000  // Global Coherency Database changes

+  #  DEBUG_CACHE     0x00200000  // Memory range cachability changes

+  #  DEBUG_VERBOSE   0x00400000  // Detailed debug messages that may

+  #                              // significantly impact boot performance

+  #  DEBUG_ERROR     0x80000000  // Error

+!if $(DEBUG_ON_SERIAL_PORT) == TRUE

+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|$(DEBUG_PRINT_ERROR_LEVEL)

+!endif

+

+  #

+  # Optional feature to help prevent EFI memory map fragments

+  # Turned on and off via: PcdPrePiProduceMemoryTypeInformationHob

+  # Values are in EFI Pages (4K). DXE Core will make sure that

+  # at least this much of each type of memory can be allocated

+  # from a single memory range. This way you only end up with

+  # maximum of two fragments for each type in the memory map

+  # (the memory used, and the free memory that was prereserved

+  # but not used).

+  #

+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0

+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS|0

+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType|0

+!if $(SECURE_BOOT_ENABLE) == TRUE

+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData|600

+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode|400

+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesCode|1500

+!else

+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData|300

+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode|150

+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesCode|1000

+!endif

+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesData|6000

+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode|20

+  gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0

+

+  #

+  # Enable strict image permissions for all images. (This applies

+  # only to images that were built with >= 4 KB section alignment.)

+  #

+  gEfiMdeModulePkgTokenSpaceGuid.PcdImageProtectionPolicy|0x3

+

+  #

+  # Enable NX memory protection for all non-code regions, including OEM and OS

+  # reserved ones, with the exception of LoaderData regions, of which OS loaders

+  # (i.e., GRUB) may assume that its contents are executable.

+  #

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeNxMemoryProtectionPolicy|0xC000000000007FD5

+

+[Components.common]

+  #

+  # Ramdisk support

+  #

+  MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf

+

+  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {

+    <PcdsFixedAtBuild>

+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

+  }

+  ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf {

+    <PcdsFixedAtBuild>

+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

+  }

+  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {

+    <PcdsFixedAtBuild>

+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

+  }

+  ShellPkg/Application/Shell/Shell.inf {

+    <LibraryClasses>

+      ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf

+      NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf

+      NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf

+      NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf

+      NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf

+      NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf

+!if $(ACPIVIEW_ENABLE) == TRUE

+      NULL|ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.inf

+!endif

+      NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf

+      NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf

+!if $(NETWORK_IP6_ENABLE) == TRUE

+      NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf

+!endif

+      HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf

+      PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf

+      BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf

+

+    <PcdsFixedAtBuild>

+      gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF

+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

+      gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000

+  }

+

+  #

+  # ACPI Support

+  #

+  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf {

+    <LibraryClasses>

+      NULL|EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf

+  }

diff --git a/OvmfPkg/RiscVVirt/RiscVVirt.fdf.inc b/OvmfPkg/RiscVVirt/RiscVVirt.fdf.inc
new file mode 100644
index 0000000000..b0a1c3293f
--- /dev/null
+++ b/OvmfPkg/RiscVVirt/RiscVVirt.fdf.inc
@@ -0,0 +1,41 @@
+## @file

+#  Definitions of Flash definition file on RiscVVirt RISC-V platform

+#

+#  Copyright (c) 2021, Hewlett Packard Enterprise Development LP. All rights reserved.<BR>

+#  Copyright (c) 2022, Ventana Micro Systems Inc. All rights reserved.<BR>

+#

+#  SPDX-License-Identifier: BSD-2-Clause-Patent

+#

+##

+[Defines]

+DEFINE BLOCK_SIZE                  = 0x1000

+

+DEFINE PFLASH1_BASE                = 0x22000000

+

+DEFINE FW_BASE_ADDRESS             = $(PFLASH1_BASE)

+DEFINE FW_SIZE                     = 0x00800000

+DEFINE FW_BLOCKS                   = 0x800

+

+DEFINE CODE_BASE_ADDRESS           = $(FW_BASE_ADDRESS)

+DEFINE CODE_SIZE                   = 0x00740000

+DEFINE CODE_BLOCKS                 = 0x740

+

+DEFINE VARS_SIZE                    = 0x000C0000

+DEFINE VARS_BLOCK_SIZE              = 0x40000

+DEFINE VARS_BLOCKS                  = 0x3

+

+#

+# EFI Variable memory region.

+# The total size of EFI Variable FD must include

+# all of sub regions of EFI Variable

+#

+DEFINE VARS_OFFSET                   = $(CODE_SIZE)

+DEFINE VARS_LIVE_SIZE                = 0x00040000

+DEFINE VARS_FTW_WORKING_OFFSET       = $(VARS_OFFSET) + $(VARS_LIVE_SIZE)

+DEFINE VARS_FTW_WORKING_SIZE         = 0x00040000

+DEFINE VARS_FTW_SPARE_OFFSET         = $(VARS_FTW_WORKING_OFFSET) + $(VARS_FTW_WORKING_SIZE)

+DEFINE VARS_FTW_SPARE_SIZE           = 0x00040000

+

+SET gUefiCpuPkgTokenSpaceGuid.PcdCpuCoreCrystalClockFrequency = 10000000

+SET gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase = 0x83FF0000

+SET gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamSize = 0x00010000

diff --git a/OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc b/OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc
new file mode 100644
index 0000000000..054d511138
--- /dev/null
+++ b/OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc
@@ -0,0 +1,504 @@
+## @file

+#  RISC-V EFI on RiscVVirtQem platform

+#

+#  Copyright (c) 2021, Hewlett Packard Enterprise Development LP. All rights reserved.<BR>

+#  Copyright (c) 2022, Ventana Micro Systems Inc. All rights reserved.<BR>

+#

+#  SPDX-License-Identifier: BSD-2-Clause-Patent

+#

+##

+

+################################################################################

+#

+# Defines Section - statements that will be processed to create a Makefile.

+#

+################################################################################

+[Defines]

+  PLATFORM_NAME                  = RiscVVirtQemu

+  PLATFORM_GUID                  = 39DADB39-1B21-4867-838E-830B6149B9E0

+  PLATFORM_VERSION               = 0.1

+  DSC_SPECIFICATION              = 0x0001001c

+  OUTPUT_DIRECTORY               = Build/$(PLATFORM_NAME)

+  SUPPORTED_ARCHITECTURES        = RISCV64

+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT

+  SKUID_IDENTIFIER               = DEFAULT

+  FLASH_DEFINITION               = OvmfPkg/RiscVVirt/RiscVVirtQemu.fdf

+

+  #

+  # Enable below options may cause build error or may not work on

+  # the initial version of RISC-V package

+  # Defines for default states.  These can be changed on the command line.

+  # -D FLAG=VALUE

+  #

+  DEFINE TTY_TERMINAL            = FALSE

+  DEFINE SECURE_BOOT_ENABLE      = FALSE

+  DEFINE TPM2_ENABLE             = FALSE

+  DEFINE TPM2_CONFIG_ENABLE      = FALSE

+  DEFINE DEBUG_ON_SERIAL_PORT    = TRUE

+

+  #

+  # Network definition

+  #

+  DEFINE NETWORK_IP6_ENABLE             = FALSE

+  DEFINE NETWORK_HTTP_BOOT_ENABLE       = FALSE

+  DEFINE NETWORK_SNP_ENABLE             = FALSE

+  DEFINE NETWORK_TLS_ENABLE             = FALSE

+  DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE

+  DEFINE NETWORK_ISCSI_ENABLE           = FALSE

+

+!if $(NETWORK_SNP_ENABLE) == TRUE

+  !error "NETWORK_SNP_ENABLE is IA32/X64/EBC only"

+!endif

+

+

+!include MdePkg/MdeLibs.dsc.inc

+

+[BuildOptions]

+  GCC:RELEASE_*_*_CC_FLAGS       = -DMDEPKG_NDEBUG

+!ifdef $(SOURCE_DEBUG_ENABLE)

+  GCC:*_*_RISCV64_GENFW_FLAGS    = --keepexceptiontable

+!endif

+

+[BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]

+  GCC:  *_*_*_DLINK_FLAGS = -z common-page-size=0x1000

+  MSFT: *_*_*_DLINK_FLAGS = /ALIGN:4096

+

+################################################################################

+#

+# Library Class section - list of all Library Classes needed by this Platform.

+#

+################################################################################

+

+!include NetworkPkg/NetworkDefines.dsc.inc

+

+!include OvmfPkg/RiscVVirt/RiscVVirt.dsc.inc

+

+!include MdePkg/MdeLibs.dsc.inc

+

+[LibraryClasses.common]

+  # Virtio Support

+  VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf

+  VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf

+  QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMmio.inf

+  QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/BaseQemuFwCfgS3LibNull.inf

+  QemuFwCfgSimpleParserLib|OvmfPkg/Library/QemuFwCfgSimpleParserLib/QemuFwCfgSimpleParserLib.inf

+  QemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf

+

+  TimerLib|UefiCpuPkg/Library/BaseRiscV64CpuTimerLib/BaseRiscV64CpuTimerLib.inf

+  VirtNorFlashPlatformLib|OvmfPkg/RiscVVirt/Library/VirtNorFlashPlatformLib/VirtNorFlashStaticLib.inf

+

+  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf

+  BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf

+  PlatformBootManagerLib|OvmfPkg/RiscVVirt/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf

+  PlatformBmPrintScLib|OvmfPkg/Library/PlatformBmPrintScLib/PlatformBmPrintScLib.inf

+  CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf

+  FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf

+  QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf

+  FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf

+  PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf

+  PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf

+  PciHostBridgeLib|OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf

+  PciHostBridgeUtilityLib|OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf

+  PeiHardwareInfoLib|OvmfPkg/Library/HardwareInfoLib/PeiHardwareInfoLib.inf

+  PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf

+

+!if $(TPM2_ENABLE) == TRUE

+  Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf

+  Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.inf

+  TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf

+  TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf

+!else

+  TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf

+  TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLibNull/PeiDxeTpmPlatformHierarchyLib.inf

+!endif

+

+[LibraryClasses.common.DXE_DRIVER]

+  ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

+  PciExpressLib|OvmfPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpressLib.inf

+

+!if $(TPM2_ENABLE) == TRUE

+  Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf

+!endif

+

+[LibraryClasses.common.UEFI_DRIVER]

+  UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf

+  PciExpressLib|OvmfPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpressLib.inf

+

+#!include NetworkPkg/NetworkBuildOptions.dsc.inc

+

+################################################################################

+#

+# Pcd Section - list of all EDK II PCD Entries defined by this Platform.

+#

+################################################################################

+[PcdsFeatureFlag.common]

+  gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderPciTranslation|TRUE

+  gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderMmioTranslation|TRUE

+

+  ## If TRUE, Graphics Output Protocol will be installed on virtual handle created by ConsplitterDxe.

+  #  It could be set FALSE to save size.

+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE

+

+  gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE

+

+[PcdsFixedAtBuild.common]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000

+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x2800

+!if $(NETWORK_TLS_ENABLE) == TRUE

+  #

+  # The cumulative and individual VOLATILE variable size limits should be set

+  # high enough for accommodating several and/or large CA certificates.

+  #

+  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x80000

+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVolatileVariableSize|0x40000

+!endif

+

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"2.7"

+

+  # Serial Port

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x10000000

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialBaudRate|9600

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseHardwareFlowControl|FALSE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialClockRate|3686400

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterStride|1

+

+  #

+  # Network Pcds

+  #

+!include NetworkPkg/NetworkPcds.dsc.inc

+

+  gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }

+

+

+  #

+  # Enable the non-executable DXE stack. (This gets set up by DxeIpl)

+  #

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack|TRUE

+

+!if $(SECURE_BOOT_ENABLE) == TRUE

+  # override the default values from SecurityPkg to ensure images from all sources are verified in secure boot

+  gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x04

+  gEfiSecurityPkgTokenSpaceGuid.PcdFixedMediaImageVerificationPolicy|0x04

+  gEfiSecurityPkgTokenSpaceGuid.PcdRemovableMediaImageVerificationPolicy|0x04

+!endif

+

+  gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize|0x20000

+  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x02

+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory|FALSE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1

+

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosEntryPointProvideMethod|0x2

+

+[PcdsDynamicDefault.common]

+  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3

+

+  ## If TRUE, OvmfPkg/AcpiPlatformDxe will not wait for PCI

+  #  enumeration to complete before installing ACPI tables.

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration|TRUE

+

+  # set PcdPciExpressBaseAddress to MAX_UINT64, which signifies that this

+  # PCD and PcdPciDisableBusEnumeration above have not been assigned yet

+  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xFFFFFFFFFFFFFFFF

+

+  gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x0

+

+  #

+  # Set video resolution for boot options and for text setup.

+  # PlatformDxe can set the former at runtime.

+  #

+  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|1280

+  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|800

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|640

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|480

+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|0

+

+  #

+  # SMBIOS entry point version

+  #

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion|0x0300

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0

+  gUefiOvmfPkgTokenSpaceGuid.PcdQemuSmbiosValidated|FALSE

+

+  gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0

+

+  #

+  # IPv4 and IPv6 PXE Boot support.

+  #

+  gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01

+  gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01

+

+  #

+  # TPM2 support

+  #

+!if $(TPM2_ENABLE) == TRUE

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0x0

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0

+!else

+[PcdsPatchableInModule]

+  # make this PCD patchable instead of dynamic when TPM support is not enabled

+  # this permits setting the PCD in unreachable code without pulling in dynamic PCD support

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0x0

+!endif

+

+[PcdsDynamicHii]

+  gUefiOvmfPkgTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gOvmfVariableGuid|0x0|FALSE|NV,BS

+

+!if $(TPM2_CONFIG_ENABLE) == TRUE

+  gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|3|NV,BS

+!endif

+

+  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5

+

+[LibraryClasses.common.PEI_CORE, LibraryClasses.common.PEIM]

+!if $(TPM2_ENABLE) == TRUE

+  PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf

+!else

+  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

+!endif

+

+################################################################################

+#

+# Components Section - list of all EDK II Modules needed by this Platform.

+#

+################################################################################

+[Components]

+

+  #

+  # SEC Phase modules

+  #

+  OvmfPkg/RiscVVirt/Sec/SecMain.inf {

+    <LibraryClasses>

+      ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf

+      LzmaDecompressLib|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf

+      PrePiLib|EmbeddedPkg/Library/PrePiLib/PrePiLib.inf

+      HobLib|EmbeddedPkg/Library/PrePiHobLib/PrePiHobLib.inf

+      PrePiHobListPointerLib|OvmfPkg/RiscVVirt/Library/PrePiHobListPointerLib/PrePiHobListPointerLib.inf

+      MemoryAllocationLib|EmbeddedPkg/Library/PrePiMemoryAllocationLib/PrePiMemoryAllocationLib.inf

+  }

+

+  #

+  # DXE

+  #

+  MdeModulePkg/Core/Dxe/DxeMain.inf {

+    <LibraryClasses>

+      NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf

+      DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

+  }

+

+  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf  {

+   <LibraryClasses>

+      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

+      DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf

+      DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

+  }

+

+  #

+  # Architectural Protocols

+  #

+  UefiCpuPkg/CpuDxeRiscV64/CpuDxeRiscV64.inf

+  MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf

+  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {

+    <LibraryClasses>

+      NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf

+      # don't use unaligned CopyMem () on the UEFI varstore NOR flash region

+      BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

+  }

+

+!if $(SECURE_BOOT_ENABLE) == TRUE

+  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf {

+    <LibraryClasses>

+      NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf

+!if $(TPM2_ENABLE) == TRUE

+      NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf

+!endif

+  }

+  SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf

+  OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf

+!else

+  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf

+!endif

+  MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf

+  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf

+  MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf

+  MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf

+  EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf

+  EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf

+

+  MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf

+  MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf

+  MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf

+  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

+  MdeModulePkg/Universal/SerialDxe/SerialDxe.inf

+

+  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

+

+  UefiCpuPkg/CpuTimerDxeRiscV64/CpuTimerDxeRiscV64.inf

+  OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.inf

+  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf

+

+  #

+  # Status Code Routing

+  #

+  MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf

+  MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf

+

+  #

+  # Platform Driver

+  #

+  OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf

+  EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf {

+    <LibraryClasses>

+      DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

+      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

+      DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf

+  }

+  OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf

+  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf

+  OvmfPkg/VirtioScsiDxe/VirtioScsi.inf

+  OvmfPkg/VirtioNetDxe/VirtioNet.inf

+  OvmfPkg/VirtioRngDxe/VirtioRng.inf

+

+  #

+  # FAT filesystem + GPT/MBR partitioning + UDF filesystem + virtio-fs

+  #

+  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf

+  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf

+  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

+  FatPkg/EnhancedFatDxe/Fat.inf

+  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf

+  OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf

+

+  #

+  # Bds

+  #

+  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf {

+    <LibraryClasses>

+      DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

+      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

+      DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf

+  }

+  MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf

+  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

+  MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf

+  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf

+  MdeModulePkg/Logo/LogoDxe.inf

+  MdeModulePkg/Application/UiApp/UiApp.inf {

+    <LibraryClasses>

+      NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf

+      NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf

+      NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf

+  }

+  OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf {

+    <LibraryClasses>

+      NULL|OvmfPkg/Library/BlobVerifierLibNull/BlobVerifierLibNull.inf

+  }

+

+  #

+  # Networking stack

+  #

+!include NetworkPkg/NetworkComponents.dsc.inc

+

+  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf {

+    <LibraryClasses>

+      NULL|OvmfPkg/Library/PxeBcPcdProducerLib/PxeBcPcdProducerLib.inf

+  }

+

+!if $(NETWORK_TLS_ENABLE) == TRUE

+  NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf {

+    <LibraryClasses>

+      NULL|OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf

+  }

+!endif

+

+  #

+  # SCSI Bus and Disk Driver

+  #

+  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf

+  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf

+

+  #

+  # NVME Driver

+  #

+  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf

+

+  #

+  # SMBIOS Support

+  #

+  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf {

+    <LibraryClasses>

+      NULL|OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.inf

+  }

+  OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf

+

+  #

+  # PCI support

+  #

+  OvmfPkg/RiscVVirt/PciCpuIo2Dxe/PciCpuIo2Dxe.inf {

+    <LibraryClasses>

+      NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf

+  }

+  MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf

+  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf {

+    <LibraryClasses>

+      NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf

+  }

+  OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf

+  OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf

+  OvmfPkg/Virtio10Dxe/Virtio10.inf

+

+  #

+  # Video support

+  #

+  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf

+  OvmfPkg/VirtioGpuDxe/VirtioGpu.inf

+  OvmfPkg/PlatformDxe/Platform.inf

+

+  #

+  # USB Support

+  #

+  MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf

+  MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf

+  MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf

+  MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf

+  MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf

+  MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf

+

+  #

+  # TPM2 support

+  #

+!if $(TPM2_ENABLE) == TRUE

+  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf {

+    <LibraryClasses>

+      HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf

+      Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf

+      NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf

+      NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf

+      NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf

+      NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf

+      NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf

+      NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf

+  }

+!if $(TPM2_CONFIG_ENABLE) == TRUE

+  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf

+!endif

+!endif

+

+  #

+  # ACPI Support

+  #

+  OvmfPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf

+  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf

+  OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf {

+    <LibraryClasses>

+      NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf

+  }

diff --git a/OvmfPkg/RiscVVirt/RiscVVirtQemu.fdf b/OvmfPkg/RiscVVirt/RiscVVirtQemu.fdf
new file mode 100644
index 0000000000..6072c37af0
--- /dev/null
+++ b/OvmfPkg/RiscVVirt/RiscVVirtQemu.fdf
@@ -0,0 +1,306 @@
+# @file

+#  Flash definition file on RiscVVirt RISC-V platform

+#

+#  Copyright (c) 2021, Hewlett Packard Enterprise Development LP. All rights reserved.<BR>

+#  Copyright (c) 2022, Ventana Micro Systems Inc. All rights reserved.<BR>

+#

+#  SPDX-License-Identifier: BSD-2-Clause-Patent

+#

+# Platform definitions

+#

+

+!include RiscVVirt.fdf.inc

+

+################################################################################

+[FD.RISCV_VIRT]

+BaseAddress   = $(FW_BASE_ADDRESS)|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress

+Size          = $(FW_SIZE)|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareFdSize

+ErasePolarity = 1

+BlockSize     = $(BLOCK_SIZE)

+NumBlocks     = $(FW_BLOCKS)

+

+0x00000000|$(CODE_SIZE)

+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvSize

+FV = FVMAIN_COMPACT

+

+!include VarStore.fdf.inc

+################################################################################

+

+[FV.DXEFV]

+BlockSize          = 0x10000

+FvAlignment        = 16

+ERASE_POLARITY     = 1

+MEMORY_MAPPED      = TRUE

+STICKY_WRITE       = TRUE

+LOCK_CAP           = TRUE

+LOCK_STATUS        = TRUE

+WRITE_DISABLED_CAP = TRUE

+WRITE_ENABLED_CAP  = TRUE

+WRITE_STATUS       = TRUE

+WRITE_LOCK_CAP     = TRUE

+WRITE_LOCK_STATUS  = TRUE

+READ_DISABLED_CAP  = TRUE

+READ_ENABLED_CAP   = TRUE

+READ_STATUS        = TRUE

+READ_LOCK_CAP      = TRUE

+READ_LOCK_STATUS   = TRUE

+

+#

+# DXE Phase modules

+#

+INF  MdeModulePkg/Core/Dxe/DxeMain.inf

+INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf

+INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

+INF  OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf

+INF  EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf

+INF  OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf

+

+#

+# PI DXE Drivers producing Architectural Protocols (EFI Services)

+#

+INF  UefiCpuPkg/CpuDxeRiscV64/CpuDxeRiscV64.inf

+INF  MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf

+INF  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf

+INF  MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf

+INF  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf

+INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf

+!if $(SECURE_BOOT_ENABLE) == TRUE

+  INF  SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf

+!endif

+INF  MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf

+INF  MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf

+INF  EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf

+INF  EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf

+INF  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

+

+#

+# Multiple Console IO support

+#

+INF  MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf

+INF  MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf

+INF  MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf

+INF  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

+INF  MdeModulePkg/Universal/SerialDxe/SerialDxe.inf

+

+# RISC-V Core Drivers

+INF  UefiCpuPkg/CpuTimerDxeRiscV64/CpuTimerDxeRiscV64.inf

+INF  OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.inf

+INF  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf

+

+#

+# FAT filesystem + GPT/MBR partitioning + UDF filesystem + virtio-fs

+#

+INF  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf

+INF  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf

+INF  FatPkg/EnhancedFatDxe/Fat.inf

+INF  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

+INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf

+INF  OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf

+

+#

+# Status Code Routing

+#

+INF  MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf

+INF  MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf

+

+#

+# Platform Driver

+#

+INF  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf

+INF  OvmfPkg/VirtioNetDxe/VirtioNet.inf

+INF  OvmfPkg/VirtioScsiDxe/VirtioScsi.inf

+INF  OvmfPkg/VirtioRngDxe/VirtioRng.inf

+

+INF  ShellPkg/Application/Shell/Shell.inf

+INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf

+INF  ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf

+INF  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf

+

+#

+# Bds

+#

+INF  MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf

+INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

+INF  MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf

+INF  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf

+INF  MdeModulePkg/Application/UiApp/UiApp.inf

+INF  OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf

+

+#

+# Networking stack

+#

+!include NetworkPkg/Network.fdf.inc

+

+#

+# SCSI Bus and Disk Driver

+#

+INF  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf

+INF  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf

+

+#

+# NVME Driver

+#

+INF  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf

+

+#

+# SMBIOS Support

+#

+INF  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf

+INF  OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf

+

+#

+# ACPI Support

+#

+INF  OvmfPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf

+INF  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf

+INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf

+INF  OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf

+

+#

+# PCI support

+#

+INF  OvmfPkg/RiscVVirt/PciCpuIo2Dxe/PciCpuIo2Dxe.inf

+INF  MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf

+INF  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf

+INF  OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf

+INF  OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf

+INF  OvmfPkg/Virtio10Dxe/Virtio10.inf

+

+#

+# Video support

+#

+INF  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf

+INF  OvmfPkg/VirtioGpuDxe/VirtioGpu.inf

+INF  OvmfPkg/PlatformDxe/Platform.inf

+

+#

+# Usb Support

+#

+INF  MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf

+INF  MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf

+INF  MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf

+INF  MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf

+INF  MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf

+INF  MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf

+

+#

+# TianoCore logo (splash screen)

+#

+INF  MdeModulePkg/Logo/LogoDxe.inf

+

+#

+# Ramdisk support

+#

+INF  MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf

+

+#INF  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf

+

+################################################################################

+

+[FV.FVMAIN_COMPACT]

+FvAlignment        = 16

+ERASE_POLARITY     = 1

+MEMORY_MAPPED      = TRUE

+STICKY_WRITE       = TRUE

+LOCK_CAP           = TRUE

+LOCK_STATUS        = TRUE

+WRITE_DISABLED_CAP = TRUE

+WRITE_ENABLED_CAP  = TRUE

+WRITE_STATUS       = TRUE

+WRITE_LOCK_CAP     = TRUE

+WRITE_LOCK_STATUS  = TRUE

+READ_DISABLED_CAP  = TRUE

+READ_ENABLED_CAP   = TRUE

+READ_STATUS        = TRUE

+READ_LOCK_CAP      = TRUE

+READ_LOCK_STATUS   = TRUE

+FvNameGuid         = 27A72E80-3118-4c0c-8673-AA5B4EFA9613

+

+INF OvmfPkg/RiscVVirt/Sec/SecMain.inf

+

+FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {

+   SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE {

+     SECTION FV_IMAGE = DXEFV

+   }

+ }

+

+[Rule.Common.SEC]

+  FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED {

+    PE32     PE32   Align=4K $(INF_OUTPUT)/$(MODULE_NAME).efi

+    UI       STRING ="$(MODULE_NAME)" Optional

+    VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

+  }

+

+[Rule.Common.PEI_CORE]

+  FILE PEI_CORE = $(NAMED_GUID) {

+    PE32     PE32   Align=4K    $(INF_OUTPUT)/$(MODULE_NAME).efi

+    UI       STRING ="$(MODULE_NAME)" Optional

+    VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

+  }

+

+[Rule.Common.PEIM]

+  FILE PEIM = $(NAMED_GUID) {

+     PEI_DEPEX PEI_DEPEX Optional        $(INF_OUTPUT)/$(MODULE_NAME).depex

+     PE32     PE32   Align=4K         $(INF_OUTPUT)/$(MODULE_NAME).efi

+     UI       STRING="$(MODULE_NAME)" Optional

+     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

+  }

+

+[Rule.Common.DXE_CORE]

+  FILE DXE_CORE = $(NAMED_GUID) {

+    PE32     PE32   Align=4K  $(INF_OUTPUT)/$(MODULE_NAME).efi

+    UI       STRING="$(MODULE_NAME)" Optional

+    VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

+  }

+

+[Rule.Common.DXE_DRIVER]

+  FILE DRIVER = $(NAMED_GUID) {

+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex

+    PE32     PE32   Align=4K  $(INF_OUTPUT)/$(MODULE_NAME).efi

+    UI       STRING="$(MODULE_NAME)" Optional

+    VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

+  }

+

+[Rule.Common.DXE_RUNTIME_DRIVER]

+  FILE DRIVER = $(NAMED_GUID) {

+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex

+    PE32     PE32   Align = 4K    $(INF_OUTPUT)/$(MODULE_NAME).efi

+    UI       STRING="$(MODULE_NAME)" Optional

+    VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

+  }

+

+[Rule.Common.UEFI_DRIVER]

+  FILE DRIVER = $(NAMED_GUID) {

+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex

+    PE32     PE32  Align=4K  $(INF_OUTPUT)/$(MODULE_NAME).efi

+    UI       STRING="$(MODULE_NAME)" Optional

+    VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

+  }

+

+[Rule.Common.UEFI_DRIVER.BINARY]

+  FILE DRIVER = $(NAMED_GUID) {

+    DXE_DEPEX DXE_DEPEX Optional      |.depex

+    PE32      PE32   Align=4K   |.efi

+    UI        STRING="$(MODULE_NAME)" Optional

+    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

+  }

+

+[Rule.Common.UEFI_APPLICATION]

+  FILE APPLICATION = $(NAMED_GUID) {

+    PE32     PE32   Align=4K   $(INF_OUTPUT)/$(MODULE_NAME).efi

+    UI       STRING="$(MODULE_NAME)" Optional

+    VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

+  }

+

+[Rule.Common.UEFI_APPLICATION.BINARY]

+  FILE APPLICATION = $(NAMED_GUID) {

+    PE32      PE32  Align=4K  |.efi

+    UI        STRING="$(MODULE_NAME)" Optional

+    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

+  }

+

+[Rule.Common.USER_DEFINED.ACPITABLE]

+  FILE FREEFORM = $(NAMED_GUID) {

+    RAW ACPI               |.acpi

+    RAW ASL                |.aml

+  }

diff --git a/OvmfPkg/RiscVVirt/VarStore.fdf.inc b/OvmfPkg/RiscVVirt/VarStore.fdf.inc
new file mode 100644
index 0000000000..30b170d779
--- /dev/null
+++ b/OvmfPkg/RiscVVirt/VarStore.fdf.inc
@@ -0,0 +1,79 @@
+## @file

+#  FDF include file with Layout Regions that define an empty variable store.

+#

+#  Copyright (c) 2022, Ventana Micro Systems Inc. All rights reserved.<BR>

+#  Copyright (c) 2021, Hewlett Packard Enterprise Development LP. All rights reserved.<BR>

+#  Copyright (C) 2014, Red Hat, Inc.

+#  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>

+#

+#  SPDX-License-Identifier: BSD-2-Clause-Patent

+#

+##

+

+$(VARS_OFFSET)|$(VARS_LIVE_SIZE)

+gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize

+#

+# NV_VARIABLE_STORE

+#

+DATA = {

+  ## This is the EFI_FIRMWARE_VOLUME_HEADER

+  # ZeroVector []

+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+  # FileSystemGuid: gEfiSystemNvDataFvGuid         =

+  #   { 0xFFF12B8D, 0x7696, 0x4C8B,

+  #     { 0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50 }}

+  0x8D, 0x2B, 0xF1, 0xFF, 0x96, 0x76, 0x8B, 0x4C,

+  0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50,

+  # FvLength: 0x20000

+  0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,

+  # Signature "_FVH"       # Attributes

+  0x5f, 0x46, 0x56, 0x48, 0xff, 0xfe, 0x04, 0x00,

+  # HeaderLength # CheckSum # ExtHeaderOffset #Reserved #Revision

+  0x48, 0x00, 0x39, 0xF1, 0x00, 0x00, 0x00, 0x02,

+  # Blockmap[0]: 0x20 Blocks * 0x1000 Bytes / Block

+  0x00, 0x08, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,

+  # Blockmap[1]: End

+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+  ## This is the VARIABLE_STORE_HEADER

+!if $(SECURE_BOOT_ENABLE) == TRUE

+  # Signature: gEfiAuthenticatedVariableGuid =

+  #   { 0xaaf32c78, 0x947b, 0x439a,

+  #     { 0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92 }}

+  0x78, 0x2c, 0xf3, 0xaa, 0x7b, 0x94, 0x9a, 0x43,

+  0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92,

+!else

+  # Signature: gEfiVariableGuid =

+  #   { 0xddcf3616, 0x3275, 0x4164,

+  #     { 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d }}

+  0x16, 0x36, 0xcf, 0xdd, 0x75, 0x32, 0x64, 0x41,

+  0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d,

+!endif

+  # Size: 0x40000 (gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize) -

+  #         0x48 (size of EFI_FIRMWARE_VOLUME_HEADER) = 0x3FFB8

+  # This can speed up the Variable Dispatch a bit.

+  0xB8, 0xFF, 0x03, 0x00,

+  # FORMATTED: 0x5A #HEALTHY: 0xFE #Reserved: UINT16 #Reserved1: UINT32

+  0x5A, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

+}

+

+$(VARS_FTW_WORKING_OFFSET)|$(VARS_FTW_WORKING_SIZE)

+gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize

+#

+#NV_FTW_WROK

+#

+DATA = {

+  # EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER->Signature = gEdkiiWorkingBlockSignatureGuid         =

+  #  { 0x9e58292b, 0x7c68, 0x497d, { 0xa0, 0xce, 0x65,  0x0, 0xfd, 0x9f, 0x1b, 0x95 }}

+  0x2b, 0x29, 0x58, 0x9e, 0x68, 0x7c, 0x7d, 0x49,

+  0xa0, 0xce, 0x65,  0x0, 0xfd, 0x9f, 0x1b, 0x95,

+  # Crc:UINT32            #WorkingBlockValid:1, WorkingBlockInvalid:1, Reserved

+  0x2c, 0xaf, 0x2c, 0x64, 0xFE, 0xFF, 0xFF, 0xFF,

+  # WriteQueueSize: UINT64

+  0xE0, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

+}

+

+$(VARS_FTW_SPARE_OFFSET)|$(VARS_FTW_SPARE_SIZE)

+gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize

+#

+#NV_FTW_SPARE