Re: [PATCH 1/1] ArmVirtPkg: Include NVMe support in ArmVirtQemu*

["Leif Lindholm" <leif@nuviainc.com>]

On Thu, Apr 09, 2020 at 15:07:30 +0200, Ard Biesheuvel wrote:
> On 4/9/20 2:10 PM, Leif Lindholm wrote:
> > 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]
> 
> Why?

Well, it adds size and complexity for a target most frequently used to
model a pure virtual environment?

Size difference isn't huge though:
FVMAIN [99%Full] 5337920 total, 5337864 used, 56 free
FVMAIN_COMPACT [39%Full] 2093056 total, 829392 used, 1263664 free
vs.
FVMAIN [99%Full] 5300992 total, 5300936 used, 56 free
FVMAIN_COMPACT [38%Full] 2093056 total, 804128 used, 1288928 free

If that's not an issue, I'm happy to drop it and my bracketing.

/
    Leif

> > 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
> >     #
> > 
>