public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Leif Lindholm" <leif@nuviainc.com>
To: devel@edk2.groups.io
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>,
	Laszlo Ersek <lersek@redhat.com>,
	Leendert van Doorn <leendert@microsoft.com>
Subject: [PATCH 1/1] ArmVirtPkg: Include NVMe support in ArmVirtQemu*
Date: Thu,  9 Apr 2020 13:10:50 +0100	[thread overview]
Message-ID: <20200409121050.15387-1-leif@nuviainc.com> (raw)

From: Leendert van Doorn <leendert@microsoft.com>

Enable conditional support for NVMe storage in ArmVirtQemu/
QemVirtQemuKernel in order to simplify booting/installing operating
systems that don't support virtio.

[Conditionalised driver inclusion]
Signed-off-by: Leif Lindholm <leif@nuviainc.com>
---
 ArmVirtPkg/ArmVirtQemu.dsc           | 8 ++++++++
 ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 7 +++++++
 ArmVirtPkg/ArmVirtQemuKernel.dsc     | 8 ++++++++
 3 files changed, 23 insertions(+)

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 8c77fc46427b..6f93032ac064 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -28,6 +28,7 @@ [Defines]
   # -D FLAG=VALUE
   #
   DEFINE TTY_TERMINAL            = FALSE
+  DEFINE NVME_ENABLE             = FALSE
   DEFINE SECURE_BOOT_ENABLE      = FALSE
   DEFINE TPM2_ENABLE             = FALSE
   DEFINE TPM2_CONFIG_ENABLE      = FALSE
@@ -447,6 +448,13 @@ [Components.common]
   MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
   MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
 
+  #
+  # NVME Driver
+  #
+!if $(NVME_ENABLE) == TRUE
+  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
+!endif
+
   #
   # SMBIOS Support
   #
diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
index aaba0b1c8840..45f0dd65be33 100644
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
@@ -128,6 +128,13 @@ [FV.FvMain]
   INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
   INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
 
+  #
+  # NVME Driver
+  #
+!if $(NVME_ENABLE) == TRUE
+  INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
+!endif
+
   #
   # SMBIOS Support
   #
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 4d82a77213ec..5dd4b1cf29f4 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -28,6 +28,7 @@ [Defines]
   # -D FLAG=VALUE
   #
   DEFINE TTY_TERMINAL            = FALSE
+  DEFINE NVME_ENABLE             = FALSE
   DEFINE SECURE_BOOT_ENABLE      = FALSE
 
   #
@@ -382,6 +383,13 @@ [Components.common]
   MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
   MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
 
+  #
+  # NVME Driver
+  #
+!if $(NVME_ENABLE) == TRUE
+  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
+!endif
+
   #
   # SMBIOS Support
   #
-- 
2.20.1


             reply	other threads:[~2020-04-09 12:10 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-09 12:10 Leif Lindholm [this message]
2020-04-09 13:07 ` [PATCH 1/1] ArmVirtPkg: Include NVMe support in ArmVirtQemu* Ard Biesheuvel
2020-04-09 14:31   ` Leif Lindholm
2020-04-09 14:36     ` Ard Biesheuvel
2020-04-09 13:56 ` Laszlo Ersek
2020-04-09 14:53   ` Leif Lindholm
2020-04-09 17:43     ` Leif Lindholm

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200409121050.15387-1-leif@nuviainc.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox