From: "Gerd Hoffmann" <kraxel@redhat.com>
To: devel@edk2.groups.io
Cc: Michael Roth <michael.roth@amd.com>,
Laszlo Ersek <lersek@redhat.com>,
Tom Lendacky <thomas.lendacky@amd.com>,
Min Xu <min.m.xu@intel.com>, Jiewen Yao <jiewen.yao@intel.com>,
Gerd Hoffmann <kraxel@redhat.com>,
Ard Biesheuvel <ardb+tianocore@kernel.org>,
Erdem Aktas <erdemaktas@google.com>,
Oliver Steffen <osteffen@redhat.com>,
Jiewen Yao <Jiewen.yao@intel.com>
Subject: [edk2-devel] [PATCH v3 03/12] OvmfPkg: add ShellDxe.fdf.inc
Date: Thu, 22 Feb 2024 11:13:49 +0100 [thread overview]
Message-ID: <20240222101358.67818-4-kraxel@redhat.com> (raw)
In-Reply-To: <20240222101358.67818-1-kraxel@redhat.com>
Move EFI Shell firmware volume files to
the new ShellDxe.fdf.inc file.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Acked-by: Jiewen Yao <Jiewen.yao@intel.com>
---
OvmfPkg/OvmfPkgX64.fdf | 11 ++---------
OvmfPkg/Include/Fdf/ShellDxe.fdf.inc | 14 ++++++++++++++
2 files changed, 16 insertions(+), 9 deletions(-)
create mode 100644 OvmfPkg/Include/Fdf/ShellDxe.fdf.inc
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index f47ab1727e4c..eb3fb90cb8b6 100644
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -319,15 +319,6 @@ [FV.DXEFV]
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf
-!if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
-INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
-INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf
-INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
-!endif
-!if $(BUILD_SHELL) == TRUE
-INF ShellPkg/Application/Shell/Shell.inf
-!endif
-
INF MdeModulePkg/Logo/LogoDxe.inf
INF OvmfPkg/TdxDxe/TdxDxe.inf
@@ -402,6 +393,8 @@ [FV.DXEFV]
#
!include OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc
+!include OvmfPkg/Include/Fdf/ShellDxe.fdf.inc
+
################################################################################
[FV.FVMAIN_COMPACT]
diff --git a/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc b/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc
new file mode 100644
index 000000000000..0935f06fa368
--- /dev/null
+++ b/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc
@@ -0,0 +1,14 @@
+##
+# SPDX-License-Identifier: BSD-2-Clause-Patent
+##
+
+!if $(BUILD_SHELL) == TRUE
+
+!if $(TOOL_CHAIN_TAG) != "XCODE5"
+INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
+INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf
+INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
+!endif
+
+INF ShellPkg/Application/Shell/Shell.inf
+!endif
--
2.43.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#115786): https://edk2.groups.io/g/devel/message/115786
Mute This Topic: https://groups.io/mt/104505807/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
next prev parent reply other threads:[~2024-02-22 10:14 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-22 10:13 [edk2-devel] [PATCH v3 00/12] OvmfPkg: tweak shell builds Gerd Hoffmann
2024-02-22 10:13 ` [edk2-devel] [PATCH v3 01/12] OvmfPkg: add ShellComponents.dsc.inc Gerd Hoffmann
2024-02-22 10:13 ` [edk2-devel] [PATCH v3 02/12] OvmfPkg: add ShellLibs.dsc.inc Gerd Hoffmann
2024-02-22 10:13 ` Gerd Hoffmann [this message]
2024-02-22 10:13 ` [edk2-devel] [PATCH v3 04/12] OvmfPkg: Shell*.inc: allow building without network support Gerd Hoffmann
2024-02-22 10:13 ` [edk2-devel] [PATCH v3 05/12] OvmfPkg: ShellDxe.fdf.inc: add VariablePolicyDynamicCommand to FV Gerd Hoffmann
2024-02-22 10:13 ` [edk2-devel] [PATCH v3 06/12] OvmfPkg: switch OvmfPkgIa32 to new shell include files Gerd Hoffmann
2024-02-22 10:13 ` [edk2-devel] [PATCH v3 07/12] OvmfPkg: switch OvmfPkgIa32X64 " Gerd Hoffmann
2024-02-22 10:13 ` [edk2-devel] [PATCH v3 08/12] OvmfPkg: switch AmdSevX64 " Gerd Hoffmann
2024-02-22 10:13 ` [edk2-devel] [PATCH v3 09/12] OvmfPkg: switch IntelTdxX64 " Gerd Hoffmann
2024-02-22 10:13 ` [edk2-devel] [PATCH v3 10/12] OvmfPkg: switch MicrovmX64 " Gerd Hoffmann
2024-02-22 10:13 ` [edk2-devel] [PATCH v3 11/12] OvmfPkg/CI: copy shell to virtual drive Gerd Hoffmann
2024-02-22 10:13 ` [edk2-devel] [PATCH v3 12/12] OvmfPkg: only add shell to FV in case secure boot is disabled Gerd Hoffmann
2024-02-25 17:50 ` [edk2-devel] [PATCH v3 00/12] OvmfPkg: tweak shell builds Laszlo Ersek
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=20240222101358.67818-4-kraxel@redhat.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