ArmPlatformPkg/ArmPlatformPkg.dec | 6 - ArmPlatformPkg/ArmPlatformPkg.dsc | 6 - ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashBlockIoDxe.c | 123 ----- ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashStandaloneMm.c | 383 --------------- ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashStandaloneMm.inf | 66 --- ArmPlatformPkg/Library/NorFlashPlatformNullLib/NorFlashPlatformNullLib.c | 28 -- ArmPlatformPkg/Library/NorFlashPlatformNullLib/NorFlashPlatformNullLib.inf | 24 - ArmVirtPkg/ArmVirtKvmTool.dsc | 4 +- ArmVirtPkg/ArmVirtKvmTool.fdf | 2 +- ArmVirtPkg/ArmVirtQemu.dsc | 4 +- ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 2 +- ArmVirtPkg/ArmVirtQemuKernel.dsc | 4 +- ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtool.c | 20 +- ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf | 4 +- ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c | 12 +- ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf | 4 +- ArmPlatformPkg/Include/Library/NorFlashPlatformLib.h => OvmfPkg/Include/Library/VirtNorFlashPlatformLib.h | 16 +- OvmfPkg/OvmfPkg.dec | 4 + ArmPlatformPkg/Drivers/NorFlashDxe/NorFlash.c => OvmfPkg/VirtNorFlashDxe/VirtNorFlash.c | 492 ++++---------------- ArmPlatformPkg/Drivers/NorFlashDxe/NorFlash.h => OvmfPkg/VirtNorFlashDxe/VirtNorFlash.h | 83 +--- ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.c => OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.c | 77 +-- ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf => OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.inf | 39 +- ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvb.c => OvmfPkg/VirtNorFlashDxe/VirtNorFlashFvb.c | 62 +-- 23 files changed, 205 insertions(+), 1260 deletions(-) delete mode 100644 ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashBlockIoDxe.c delete mode 100644 ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashStandaloneMm.c delete mode 100644 ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashStandaloneMm.inf delete mode 100644 ArmPlatformPkg/Library/NorFlashPlatformNullLib/NorFlashPlatformNullLib.c delete mode 100644 ArmPlatformPkg/Library/NorFlashPlatformNullLib/NorFlashPlatformNullLib.inf rename ArmPlatformPkg/Include/Library/NorFlashPlatformLib.h => OvmfPkg/Include/Library/VirtNorFlashPlatformLib.h (52%) rename ArmPlatformPkg/Drivers/NorFlashDxe/NorFlash.c => OvmfPkg/VirtNorFlashDxe/VirtNorFlash.c (54%) rename ArmPlatformPkg/Drivers/NorFlashDxe/NorFlash.h => OvmfPkg/VirtNorFlashDxe/VirtNorFlash.h (78%) rename ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.c => OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.c (85%) rename ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf => OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.inf (78%) rename ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvb.c => OvmfPkg/VirtNorFlashDxe/VirtNorFlashFvb.c (92%)