From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mx.groups.io with SMTP id smtpd.web10.7362.1586434253868565534 for ; Thu, 09 Apr 2020 05:10:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=Oew+gMJV; spf=pass (domain: nuviainc.com, ip: 209.85.128.66, mailfrom: leif@nuviainc.com) Received: by mail-wm1-f66.google.com with SMTP id d202so3976650wmd.1 for ; Thu, 09 Apr 2020 05:10:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=q2cqjXb/FV/gwf7tVa6I8Itc5gTlHJ7XYEdFEt4Q8rI=; b=Oew+gMJVV1UVZKcKps00LT1cehHtCNLWlRGcMiHQ8NYc5Yy89VQJeFtAjIp8RLOiXA qMN/7dkZdwqpxR4NeHD+6TZH4PBBt10WzKNRWLgN2Uvv6+K0xpR2vQhaC0oERjn1BT6+ mGl5OuKukSgQ3gLrIxnpYD/2oRrPNtF0pkT+dxaPfdTH1zqCcfbr7jzvRPoTMBLq3Xyj 3vqIE1GqYKa8AQoZlIan3jLgDoxODXWeMVucacZsrf6VFv9ZE3S7oCdiKU6lPGVoJgdL 6MGW3VF+broH/kc41p35qNVVJh/tLRBaqAkKEAGbyelkcbUBex6HHY3wSBs7rWRIR80d Ng3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=q2cqjXb/FV/gwf7tVa6I8Itc5gTlHJ7XYEdFEt4Q8rI=; b=VeWbf0MXx5Ljz9iiNWSiCA3YNPmYyCJ11PUoG3GVK7PGc1XJwdzxd8nwf+yJoNbIyf h+3Dutn3OQ1wzUB6QXHFffac5x5Yhmo5kUJ0q/cncNPXqHmwJ8vwrF/NAuGrr9j7M+1F dI8vjwqQOe2KFz6A0Rs+ElkYbS3EaPyyamaUprA5cDasf5ou2da3WdjouktQUgaR/Pd5 GRdpq5fw+ZnQ4SINgXyUFGAMuZ4Ung9LAzrPmbAeUyfNJiJuWTObAxjZ+ytC5oKFIC9j xKx5ehnuMczPwKj0V+O2hgCSWk2NKxRlzYi4BMSxAgg1AYF7WOen9vk28Onqb36gLk7w AVQA== X-Gm-Message-State: AGi0PubzxqoZrg8YJuGLuXYpXbxnLnHVhWF7NBKZrJpwIMq5QohCS/zi 2Q4ufkZz/xOetoZDVj9wquC2ylIH8KCjtLWXAs59cgACV0uz+1yq5ASsPuj62WZxgOA+SdP7/w8 ZWemtu+YrtMLvUe9+UsMFK08v6DKAQgIqo6mpq+p8QIXNJ0jTP3AuXQQ195QSfkM= X-Google-Smtp-Source: APiQypLZLoZubiz6fV/Avtn9Ocfo4piYf7SDUVnZZNTNrHf3QpMFY3kKX9i2t14KD7EHJ3y09Fwwqg== X-Received: by 2002:a7b:cf25:: with SMTP id m5mr10345245wmg.65.1586434252249; Thu, 09 Apr 2020 05:10:52 -0700 (PDT) Return-Path: Received: from vanye.hemma.eciton.net (cpc92302-cmbg19-2-0-cust304.5-4.cable.virginm.net. [82.1.209.49]) by smtp.gmail.com with ESMTPSA id p5sm14851234wrn.93.2020.04.09.05.10.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Apr 2020 05:10:51 -0700 (PDT) From: "Leif Lindholm" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Laszlo Ersek , Leendert van Doorn Subject: [PATCH 1/1] ArmVirtPkg: Include NVMe support in ArmVirtQemu* Date: Thu, 9 Apr 2020 13:10:50 +0100 Message-Id: <20200409121050.15387-1-leif@nuviainc.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Leendert van Doorn 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 --- 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