ArmVirtPkg: align ArmVirtQemuKernel with ArmVirtQemu

The platform ArmVirtQemuKernel is intended as an alternative for
ArmVirtQemu that only deviates in the way it is invoked by QEMU, either
from flash address 0x0 (the default ARM reset vector) or via the Linux
kernel boot protocol. So add VirtioRngDxe and HighMemDxe here as well.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 6bf894a5702fe57575241c74cbeb9218662c5adb..01a1d9b4613b8a84addd62e892e5fbef57be7ba3 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -294,9 +294,11 @@
   #\r
   ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf\r
   ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf\r
+  ArmVirtPkg/HighMemDxe/HighMemDxe.inf\r
   OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
   OvmfPkg/VirtioScsiDxe/VirtioScsi.inf\r
   OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
+  OvmfPkg/VirtioRngDxe/VirtioRng.inf\r
 \r
   #\r
   # FAT filesystem + GPT/MBR partitioning\r

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.fdf b/ArmVirtPkg/ArmVirtQemuKernel.fdf
index 772b0f6ed982463903b7ed510fd8486a8e7070af..dcea9771a28839d1a07a94313da25d8e451fced4 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.fdf
+++ b/ArmVirtPkg/ArmVirtQemuKernel.fdf
@@ -128,6 +128,7 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
   INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf\r
   INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf\r
+  INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf\r
 \r
   #\r
   # PI DXE Drivers producing Architectural Protocols (EFI Services)\r
@@ -175,6 +176,7 @@ READ_LOCK_STATUS   = TRUE
   INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
   INF OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
   INF OvmfPkg/VirtioScsiDxe/VirtioScsi.inf\r
+  INF OvmfPkg/VirtioRngDxe/VirtioRng.inf\r
 \r
   #\r
   # UEFI application (Shell Embedded Boot Loader)\r