From nobody Fri Oct 18 05:17:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+114319+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+114319+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1706114289; cv=none; d=zohomail.com; s=zohoarc; b=nzS0WdHHN+iSbGznBvWFhazcmdALmz/yWO+dldOjtV9D9u6XT23dnWGdvSEvBPC0rG+OIn4FadnZiqgqcMlT+oV4az4gZ9F65foFmDBD5xjQYjbme8Vbzm7M+/5BztGwxV+H6iAv8+tg7OQXokO2Q9u8i5R9+7aVvsNiLF44pBM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1706114289; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=kaGsSISSkNwBJ8xJyzu2rhKoJXV35Mo+G7AS06Yi6qk=; b=FzU4HVq99P9VpRZ6WEJiA3VqKe+c0r4NImcLbG6Zx+NvrSSUKZdMmGuUPVLQvg4IBF/kCAIabLIFaRrYlsWJEPnWJsC/TYsiQjMLG6byzJIJjiPHLo+PlTbGkIZnnxDIADjGveKRqCwx/V1IqNDQWDSu8LxTJNvT2vO3cxc3qSA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+114319+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1706114289202843.94185381665; Wed, 24 Jan 2024 08:38:09 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=qI+Ue1hrPsZbVbLu7fXM9Uf39N/i66tJJxCGYDx9RvY=; 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=1706114288; v=1; b=tR2d5orKWDh0Y8MPvRC7b7a/JeRMQNKJJhHXB9+eVCJoj35wxw7/TgUwS6IIz02RtArvJXCT Z14kdI3hfBhT9SZaVe9ZbXVxDuq+JVzoPA83ABxyK1yKsGZwr/VBOsmCrofx9IG8/rZBnM4+goC CclqNKPAFxQMPgALiSbq3rzg= X-Received: by 127.0.0.2 with SMTP id 5uh9YY1788612xdEQbrrQIj3; Wed, 24 Jan 2024 08:38:08 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web10.27607.1706114288183917089 for ; Wed, 24 Jan 2024 08:38:08 -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-407-h39NMYR1PE26HjnFQUNQCw-1; Wed, 24 Jan 2024 11:38:05 -0500 X-MC-Unique: h39NMYR1PE26HjnFQUNQCw-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (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 5AC9383B833; Wed, 24 Jan 2024 16:38:05 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.193.66]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2C250400D288; Wed, 24 Jan 2024 16:38:05 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B96131800DD8; Wed, 24 Jan 2024 17:38:02 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Jiewen Yao , Ard Biesheuvel , Michael Roth , Gerd Hoffmann , Laszlo Ersek , Erdem Aktas , Min Xu , Tom Lendacky , Oliver Steffen Subject: [edk2-devel] [PATCH 03/11] OvmfPkg: add ShellDxe.fdf.inc Date: Wed, 24 Jan 2024 17:37:54 +0100 Message-ID: <20240124163802.2160303-4-kraxel@redhat.com> In-Reply-To: <20240124163802.2160303-1-kraxel@redhat.com> References: <20240124163802.2160303-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 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: jgfzmS535FH2CbQkwJ89fWVDx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1706114290954100005 Content-Type: text/plain; charset="utf-8"; x-default="true" 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 =20 -!if $(BUILD_SHELL) =3D=3D TRUE && $(TOOL_CHAIN_TAG) !=3D "XCODE5" -INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf -INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf -INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand= .inf -!endif -!if $(BUILD_SHELL) =3D=3D TRUE -INF ShellPkg/Application/Shell/Shell.inf -!endif - INF MdeModulePkg/Logo/LogoDxe.inf =20 INF OvmfPkg/TdxDxe/TdxDxe.inf @@ -402,6 +393,8 @@ [FV.DXEFV] # !include OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc =20 +!include OvmfPkg/Include/Fdf/ShellDxe.fdf.inc + ##########################################################################= ###### =20 [FV.FVMAIN_COMPACT] diff --git a/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc b/OvmfPkg/Include/Fdf/She= llDxe.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) =3D=3D TRUE + +!if $(TOOL_CHAIN_TAG) !=3D "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 --=20 2.43.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#114319): https://edk2.groups.io/g/devel/message/114319 Mute This Topic: https://groups.io/mt/103935342/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-