[edk2,v2,2/5] ArmVirtPkg: align ArmVirtQemuKernel with ArmVirtQemu

Message ID 1468322342-30611-3-git-send-email-ard.biesheuvel@linaro.org
State Accepted
Commit 0a8bc04e6fa07bb8128ff8d05c886fea2c35c3fc
Headers show

Commit Message

Ard Biesheuvel July 12, 2016, 11:18 a.m.
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>

---
 ArmVirtPkg/ArmVirtQemuKernel.dsc | 2 ++
 ArmVirtPkg/ArmVirtQemuKernel.fdf | 2 ++
 2 files changed, 4 insertions(+)

-- 
1.9.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Laszlo Ersek July 12, 2016, 11:36 a.m. | #1
On 07/12/16 13:18, Ard Biesheuvel wrote:
> 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>

> ---

>  ArmVirtPkg/ArmVirtQemuKernel.dsc | 2 ++

>  ArmVirtPkg/ArmVirtQemuKernel.fdf | 2 ++

>  2 files changed, 4 insertions(+)

> 

> diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc

> index 6bf894a5702f..01a1d9b4613b 100644

> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc

> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc

> @@ -294,9 +294,11 @@ [Components.common]

>    #

>    ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf

>    ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf

> +  ArmVirtPkg/HighMemDxe/HighMemDxe.inf

>    OvmfPkg/VirtioBlkDxe/VirtioBlk.inf

>    OvmfPkg/VirtioScsiDxe/VirtioScsi.inf

>    OvmfPkg/VirtioNetDxe/VirtioNet.inf

> +  OvmfPkg/VirtioRngDxe/VirtioRng.inf

>  

>    #

>    # FAT filesystem + GPT/MBR partitioning

> diff --git a/ArmVirtPkg/ArmVirtQemuKernel.fdf b/ArmVirtPkg/ArmVirtQemuKernel.fdf

> index 772b0f6ed982..dcea9771a288 100644

> --- a/ArmVirtPkg/ArmVirtQemuKernel.fdf

> +++ b/ArmVirtPkg/ArmVirtQemuKernel.fdf

> @@ -128,6 +128,7 @@ [FV.FvMain]

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

>    INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf

>    INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf

> +  INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf

>  

>    #

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

> @@ -175,6 +176,7 @@ [FV.FvMain]

>    INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf

>    INF OvmfPkg/VirtioNetDxe/VirtioNet.inf

>    INF OvmfPkg/VirtioScsiDxe/VirtioScsi.inf

> +  INF OvmfPkg/VirtioRngDxe/VirtioRng.inf

>  

>    #

>    # UEFI application (Shell Embedded Boot Loader)

> 


Reviewed-by: Laszlo Ersek <lersek@redhat.com>

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patch

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 6bf894a5702f..01a1d9b4613b 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -294,9 +294,11 @@  [Components.common]
   #
   ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
   ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
+  ArmVirtPkg/HighMemDxe/HighMemDxe.inf
   OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
   OvmfPkg/VirtioScsiDxe/VirtioScsi.inf
   OvmfPkg/VirtioNetDxe/VirtioNet.inf
+  OvmfPkg/VirtioRngDxe/VirtioRng.inf
 
   #
   # FAT filesystem + GPT/MBR partitioning
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.fdf b/ArmVirtPkg/ArmVirtQemuKernel.fdf
index 772b0f6ed982..dcea9771a288 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.fdf
+++ b/ArmVirtPkg/ArmVirtQemuKernel.fdf
@@ -128,6 +128,7 @@  [FV.FvMain]
   INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
   INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
   INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
+  INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf
 
   #
   # PI DXE Drivers producing Architectural Protocols (EFI Services)
@@ -175,6 +176,7 @@  [FV.FvMain]
   INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
   INF OvmfPkg/VirtioNetDxe/VirtioNet.inf
   INF OvmfPkg/VirtioScsiDxe/VirtioScsi.inf
+  INF OvmfPkg/VirtioRngDxe/VirtioRng.inf
 
   #
   # UEFI application (Shell Embedded Boot Loader)