From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 2B919AC0D57 for ; Thu, 15 Feb 2024 10:25:13 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=XfKofBCkWWPh0grF2h27VUugGvO1RnEmb2jfYmEnu0k=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1707992711; v=1; b=qhhlAOvYJgez/yMXZDqmAQSmMBAgBxNFdNPHRgsvqkbBFKkCq7aF3i0yx31B5/xiWC0mafPQ v7WabrrJLQ+tyoa5H8RoCNls0HddgTSoYYIXTcjWU6Rc49MQLsoWZKl+vPN2zf+QY2ZaFhOgNvk PqetMBat3PFtCbtSaSQni/EU= X-Received: by 127.0.0.2 with SMTP id UQRhYY7687511x6OdkaLi7vY; Thu, 15 Feb 2024 02:25:11 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.11126.1707992711264503318 for ; Thu, 15 Feb 2024 02:25:11 -0800 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-426-9klfyAF4MFyqE9DapGFQfg-1; Thu, 15 Feb 2024 05:25:07 -0500 X-MC-Unique: 9klfyAF4MFyqE9DapGFQfg-1 X-Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9EED485A58A; Thu, 15 Feb 2024 10:25:06 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.193.16]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 414911C066A9; Thu, 15 Feb 2024 10:25:06 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 2CAE51800DEA; Thu, 15 Feb 2024 11:25:03 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Jiewen Yao , Gerd Hoffmann , Laszlo Ersek , Min Xu , Tom Lendacky , Oliver Steffen , Erdem Aktas , Ard Biesheuvel , Michael Roth Subject: [edk2-devel] [PATCH v2 03/12] OvmfPkg: add ShellDxe.fdf.inc Date: Thu, 15 Feb 2024 11:24:54 +0100 Message-ID: <20240215102503.273275-4-kraxel@redhat.com> In-Reply-To: <20240215102503.273275-1-kraxel@redhat.com> References: <20240215102503.273275-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: J5dUSlgoS3OkZOpzgMAn7CvIx7686176AA= Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=qhhlAOvY; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=redhat.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Move EFI Shell firmware volume files to the new ShellDxe.fdf.inc file. Signed-off-by: Gerd Hoffmann Reviewed-by: Laszlo Ersek --- 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.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#115506): https://edk2.groups.io/g/devel/message/115506 Mute This Topic: https://groups.io/mt/104370205/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-