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
NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf\r
}\r
\r
- ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf\r
+ OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.inf\r
\r
MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
\r
INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf\r
INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf\r
INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
- INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf\r
+ INF OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.inf\r
\r
#\r
# FAT filesystem + GPT/MBR partitioning + UDF filesystem\r
\r
#include <Library/BaseLib.h>\r
#include <Library/DebugLib.h>\r
-#include <Library/NorFlashPlatformLib.h>\r
#include <Library/UefiBootServicesTableLib.h>\r
+#include <Library/VirtNorFlashPlatformLib.h>\r
#include <Protocol/FdtClient.h>\r
\r
/** Macro defining the NOR block size configured in Kvmtool.\r
*/\r
#define LABEL_UEFI_VAR_STORE "System-firmware"\r
\r
-STATIC NOR_FLASH_DESCRIPTION mNorFlashDevices[MAX_FLASH_DEVICES];\r
-STATIC UINTN mNorFlashDeviceCount = 0;\r
-STATIC INT32 mUefiVarStoreNode = MAX_INT32;\r
-STATIC FDT_CLIENT_PROTOCOL *mFdtClient;\r
+STATIC VIRT_NOR_FLASH_DESCRIPTION mNorFlashDevices[MAX_FLASH_DEVICES];\r
+STATIC UINTN mNorFlashDeviceCount = 0;\r
+STATIC INT32 mUefiVarStoreNode = MAX_INT32;\r
+STATIC FDT_CLIENT_PROTOCOL *mFdtClient;\r
\r
/** This function performs platform specific actions to initialise\r
the NOR flash, if required.\r
@retval EFI_SUCCESS Success.\r
**/\r
EFI_STATUS\r
-NorFlashPlatformInitialization (\r
+VirtNorFlashPlatformInitialization (\r
VOID\r
)\r
{\r
STATIC\r
EFI_STATUS\r
SetupVariableStore (\r
- IN NOR_FLASH_DESCRIPTION *FlashDevice\r
+ IN VIRT_NOR_FLASH_DESCRIPTION *FlashDevice\r
)\r
{\r
UINTN FlashRegion;\r
@retval EFI_NOT_FOUND Flash device not found.\r
**/\r
EFI_STATUS\r
-NorFlashPlatformGetDevices (\r
- OUT NOR_FLASH_DESCRIPTION **NorFlashDescriptions,\r
- OUT UINT32 *Count\r
+VirtNorFlashPlatformGetDevices (\r
+ OUT VIRT_NOR_FLASH_DESCRIPTION **NorFlashDescriptions,\r
+ OUT UINT32 *Count\r
)\r
{\r
if (mNorFlashDeviceCount > 0) {\r
FILE_GUID = E75F07A1-B160-4893-BDD4-09E32FF847DC\r
MODULE_TYPE = DXE_DRIVER\r
VERSION_STRING = 1.0\r
- LIBRARY_CLASS = NorFlashPlatformLib\r
+ LIBRARY_CLASS = VirtNorFlashPlatformLib\r
CONSTRUCTOR = NorFlashPlatformLibConstructor\r
\r
[Sources.common]\r
\r
[Packages]\r
ArmPkg/ArmPkg.dec\r
- ArmPlatformPkg/ArmPlatformPkg.dec\r
ArmVirtPkg/ArmVirtPkg.dec\r
EmbeddedPkg/EmbeddedPkg.dec\r
MdePkg/MdePkg.dec\r
MdeModulePkg/MdeModulePkg.dec\r
+ OvmfPkg/OvmfPkg.dec\r
\r
[LibraryClasses]\r
BaseLib\r