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

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

On Thu, Apr 09, 2020 at 15:53:59 +0100, Leif Lindholm wrote:
> > > [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(+)
> > 
> > (2) I realize I'm being arbitrary, with regard to what driver should be
> > conditional and what should always be there. But in OvmfPkg,
> > NvmExpressDxe is included unconditionally, and I think that should work
> > here too.
> > 
> > Of course, if you *want* to make NvmExpressDxe excludable from the
> > ArmVirtQemu* platforms, then I'm fine with that.
> 
> I don't. I just succumbed to premature optimization.
> Do you want to see a v2, or do I drop the bits before submission?
> 
> Regards,
> 
> Leif
> 
> > So, I'm proposing (1) and (2) only as food for thought; dependent on
> > your stance on them, I'm OK with this patch:
> > 
> > Reviewed-by: Laszlo Ersek <lersek@redhat.com>

Given Ard's stated opinion in other email, I'm taking this and
dropping the conditionals.
Pushed as a5d8a399635d.

Thanks!

> > 
> > Thanks,
> > Laszlo
> > 
> > > 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
> > >    #
> > > 
> >