ArmVirtPkg/ArmVirtKvmTool: Migrate to OVMF's VirtNorFlashDxe

Migrate to the virt specific NOR flash driver as the ArmPlatformPkg is
going away.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>

diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc
index 3bd3ebd6e0b3e751ac400571715e456df6fbf182..c598903b33d2ef5d24a313fd30165ab83d305214 100644 (file)
--- a/ArmVirtPkg/ArmVirtKvmTool.dsc
+++ b/ArmVirtPkg/ArmVirtKvmTool.dsc
@@ -50,7 +50,7 @@
   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
@@ -291,7 +291,7 @@
       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

diff --git a/ArmVirtPkg/ArmVirtKvmTool.fdf b/ArmVirtPkg/ArmVirtKvmTool.fdf
index 9e006e83ee5c875120b62d2d137c821ae04719e1..b696bffc7ccb81bfecd390a8422cffab81ade84a 100644 (file)
--- a/ArmVirtPkg/ArmVirtKvmTool.fdf
+++ b/ArmVirtPkg/ArmVirtKvmTool.fdf
@@ -154,7 +154,7 @@ READ_LOCK_STATUS   = TRUE
   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

diff --git a/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtool.c b/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtool.c
index 39d2615b54091837890485c5022b19c8a0f85abe..129c16b7110cc2d0dce94ef6086d19e434497e72 100644 (file)
--- a/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtool.c
+++ b/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtool.c
@@ -9,8 +9,8 @@
 \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
@@ -25,10 +25,10 @@
 */\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
@@ -36,7 +36,7 @@ STATIC FDT_CLIENT_PROTOCOL    *mFdtClient;
   @retval EFI_SUCCESS           Success.\r
 **/\r
 EFI_STATUS\r
-NorFlashPlatformInitialization (\r
+VirtNorFlashPlatformInitialization (\r
   VOID\r
   )\r
 {\r
@@ -89,7 +89,7 @@ NorFlashPlatformInitialization (
 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
@@ -187,9 +187,9 @@ SetupVariableStore (
   @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

diff --git a/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf b/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf
index 04d6723295379b5db8da8131650d63a1e5dfffaa..b5f35d4782896761e7975a6e5c196ff0fab0d6db 100644 (file)
--- a/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf
+++ b/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf
@@ -12,7 +12,7 @@
   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
@@ -20,11 +20,11 @@
 \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