From nobody Sat May 18 19:48: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+102984+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+102984+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1681461222; cv=none; d=zohomail.com; s=zohoarc; b=dCeg1tNzp+HRQ3xJ/fh2rZNR7o8ZbUfhI6BJd/vwCohbBEGWdpOsiqOr6VZXqxKw9n0qxUZuwp3ZnfaAGe82z9XE2gT/MELD+FJPrOXOqUw+R2tEKBE0u4TSrDxeWEcxFBCi9Ox6MHLcOvvi5NNe/Mbd+HP85yAUZP5fgWTQFCo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681461222; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=MoEihMt7B+f4rCq3xEa/+n8HQ00+FPm81N473yQtN4k=; b=N2rLvNE/UkSxweWFyY9VBBlX+pEP90kVh3KNtrCNtvDBAOoW3qmWLherTQvrqH+DVqvmgu+BcODRjc+XmzPSNIe1mQlfl3J6MMkNmMNSjfDfZngtLmmP0IA66r+9V3xoq6KgF4wMKZlApZ0CtJ0mo0TcLk8cjSyPg0NF3Rg+sGY= 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+102984+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 1681461222276993.5509463867103; Fri, 14 Apr 2023 01:33:42 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id jTR6YY1788612xIa2uvi0OUi; Fri, 14 Apr 2023 01:33:41 -0700 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.4410.1681461219927769460 for ; Fri, 14 Apr 2023 01:33:40 -0700 X-Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-197-e6JJ-g1nOW-3qlm22Bb8uA-1; Fri, 14 Apr 2023 04:33:33 -0400 X-MC-Unique: e6JJ-g1nOW-3qlm22Bb8uA-1 X-Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 675E33815F76; Fri, 14 Apr 2023 08:33:32 +0000 (UTC) X-Received: from osteffen-laptop.redhat.com (unknown [10.39.193.167]) by smtp.corp.redhat.com (Postfix) with ESMTP id B6EDC492C13; Fri, 14 Apr 2023 08:33:30 +0000 (UTC) From: "Oliver Steffen" To: devel@edk2.groups.io Cc: Anthony Perard , Ard Biesheuvel , Gerd Hoffmann , Jiewen Yao , Jordan Justen , Julien Grall , Leif Lindholm , Ray Ni , Sami Mujawar , Zhichao Gao , Oliver Steffen Subject: [edk2-devel] [PATCH v4 1/2] OvmfPkg: allow setting Firmware Version from build command line Date: Fri, 14 Apr 2023 10:33:22 +0200 Message-Id: <20230414083323.153731-2-osteffen@redhat.com> In-Reply-To: <20230414083323.153731-1-osteffen@redhat.com> References: <20230414083323.153731-1-osteffen@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: 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,osteffen@redhat.com X-Gm-Message-State: EaEM0SjAFO2XDWQPoOY8aUwJx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1681461221; bh=h++C1wAf2z0d5NmbZ4Pt0gJx5qKB2Huo9Fj+KjGjonI=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=LXlqufWJv5xhlFeALN0nehrTLsIxnz1OTX6dKNwss01eVY7qtLCCH4tkSZ4gG6URJoB RCpRK956lOUbT6jTCv0hfttrNuB5hPzwc+bQCjzCcykjP+hlI3Ylmw5WKJ7d0io1Nb2zq fIWZqUdVZJ7iimBGWOHtyTKSOSXEzlbT5k4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1681461223832100007 Content-Type: text/plain; charset="utf-8"; x-default="true" Initialize gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString with with the value of the variable "FIRMWARE_VER", if is is defined. Applies to all flavors of OvmfPkg. This behavior is already implemented in ArmVirtXen.dsc. It allows specifying the firmware version string on the build command line with -D FIRMARE_VER=3D... Introduce a common include file to be used in the .dsc files for the different OVMF flavors, and add the changes there. (ArmVirtPkg already has such a file). Signed-off-by: Oliver Steffen --- OvmfPkg/Include/Dsc/OvmfPkg.dsc.inc | 9 +++++++++ OvmfPkg/OvmfPkgIa32.dsc | 2 ++ OvmfPkg/OvmfPkgIa32X64.dsc | 2 ++ OvmfPkg/OvmfPkgX64.dsc | 3 +++ OvmfPkg/OvmfXen.dsc | 2 ++ 5 files changed, 18 insertions(+) create mode 100644 OvmfPkg/Include/Dsc/OvmfPkg.dsc.inc diff --git a/OvmfPkg/Include/Dsc/OvmfPkg.dsc.inc b/OvmfPkg/Include/Dsc/Ovmf= Pkg.dsc.inc new file mode 100644 index 000000000000..f0bc73ede3df --- /dev/null +++ b/OvmfPkg/Include/Dsc/OvmfPkg.dsc.inc @@ -0,0 +1,9 @@ +## +# SPDX-License-Identifier: BSD-2-Clause-Patent +## + +[PcdsFixedAtBuild.common] +!ifdef $(FIRMWARE_VER) + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER= )" +!endif + diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 86177bb94899..0ee97c35b05c 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -78,6 +78,8 @@ [Defines] !endif !endif =20 +!include OvmfPkg/Include/Dsc/OvmfPkg.dsc.inc + [BuildOptions] GCC:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG INTEL:RELEASE_*_*_CC_FLAGS =3D /D MDEPKG_NDEBUG diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index 065b54450647..19c197a4075c 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -77,6 +77,8 @@ [Defines] !endif !endif =20 +!include OvmfPkg/Include/Dsc/OvmfPkg.dsc.inc + [BuildOptions] GCC:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG INTEL:RELEASE_*_*_CC_FLAGS =3D /D MDEPKG_NDEBUG diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 3d405cd4ade0..0d8fb54a88d1 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -84,6 +84,8 @@ [Defines] DEFINE UP_CPU_PEI_GUID =3D 280251c4-1d09-4035-9062-839acb5f18c1 DEFINE UP_CPU_DXE_GUID =3D 6490f1c5-ebcc-4665-8892-0075b9bb49b7 =20 +!include OvmfPkg/Include/Dsc/OvmfPkg.dsc.inc + [BuildOptions] GCC:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG INTEL:RELEASE_*_*_CC_FLAGS =3D /D MDEPKG_NDEBUG @@ -514,6 +516,7 @@ [PcdsFeatureFlag] gEfiMdeModulePkgTokenSpaceGuid.PcdRequireSelfSignedPk|TRUE !endif =20 + [PcdsFixedAtBuild] gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1 !if $(SMM_REQUIRE) =3D=3D FALSE diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc index 8bfc16c2d3d6..1f44ec86c9c7 100644 --- a/OvmfPkg/OvmfXen.dsc +++ b/OvmfPkg/OvmfXen.dsc @@ -62,6 +62,8 @@ [Defines] !endif !endif =20 +!include OvmfPkg/Include/Dsc/OvmfPkg.dsc.inc + [BuildOptions] GCC:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG INTEL:RELEASE_*_*_CC_FLAGS =3D /D MDEPKG_NDEBUG --=20 2.40.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 (#102984): https://edk2.groups.io/g/devel/message/102984 Mute This Topic: https://groups.io/mt/98258185/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- From nobody Sat May 18 19:48: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+102983+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+102983+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1681461221; cv=none; d=zohomail.com; s=zohoarc; b=j2Qb9+auWsfg0+yfxAURPiboAkamM2op8BhixBMZB+TyTnsY1j+uIprHN+dSd+hjI/+Ru4H+6WtMGLXY9tvZsWroiGUjiCATjdTmGDjxz8+UFXM361BzptS/rnR+Psor7eo6KPVloRYxOHrzAx8APno/EmxkUb4cN36aJ35f7ek= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681461221; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=MUIBUctNbgG0EM8DTZJCeZg2NCdO9RjgeaAuqUJZH2g=; b=gmMCR43rto9N0EpaHWlBcnPORd6UqafMpoG9K8dNgf5SDJL8J7unJ4Rhst6RB81ZwQxAVFnkrGDOgtJls6RmA8s97QJQRDhYp7EkN9xnF06Ui181ophpruYjDUl23YPf89lBVdbGBdPGHvhKBQiUxDpG+GzLk3SkJD7EQBKWDXs= 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+102983+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 168146122171051.61820139126553; Fri, 14 Apr 2023 01:33:41 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id x8vdYY1788612xfDlLnkYiUD; Fri, 14 Apr 2023 01:33:39 -0700 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.4497.1681461219027993923 for ; Fri, 14 Apr 2023 01:33:39 -0700 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.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-320-MnmzvaFxOGu7yIXB33Sz6w-1; Fri, 14 Apr 2023 04:33:35 -0400 X-MC-Unique: MnmzvaFxOGu7yIXB33Sz6w-1 X-Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 68B8F8996E3; Fri, 14 Apr 2023 08:33:34 +0000 (UTC) X-Received: from osteffen-laptop.redhat.com (unknown [10.39.193.167]) by smtp.corp.redhat.com (Postfix) with ESMTP id A2FC3492C13; Fri, 14 Apr 2023 08:33:32 +0000 (UTC) From: "Oliver Steffen" To: devel@edk2.groups.io Cc: Anthony Perard , Ard Biesheuvel , Gerd Hoffmann , Jiewen Yao , Jordan Justen , Julien Grall , Leif Lindholm , Ray Ni , Sami Mujawar , Zhichao Gao , Oliver Steffen Subject: [edk2-devel] [PATCH v4 2/2] ArmVirtPkg: allow setting Firmware Version from build command line Date: Fri, 14 Apr 2023 10:33:23 +0200 Message-Id: <20230414083323.153731-3-osteffen@redhat.com> In-Reply-To: <20230414083323.153731-1-osteffen@redhat.com> References: <20230414083323.153731-1-osteffen@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: 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,osteffen@redhat.com X-Gm-Message-State: eLrFpoRzIdPd67opyR0WAGsgx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1681461219; bh=AycDOUk4giKjYgV8YARkJO5NEuI/p1HCOqy6hnfHPrU=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=TdgL2xjYpqD8xMmbWYAxVzgr5hiYjCv0y7527yltK6YA9HoK9/YPPSZ4C8PTuxObty5 rypxVoO3b9ooFvHWP/7d5d2zoWE3/kNrR9u+AkrDCG8bqZxZrbzgaLoUEwB+ydUVx6WYH MGHnJcTtO0KPJ9P6iVTIBRV4u68bp9NWrhs= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1681461221989100003 Content-Type: text/plain; charset="utf-8"; x-default="true" ArmVirtXen.dsc initializes gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString with with the value of the variable "FIRMWARE_VER". Move that functionality to ArmVirt.dsc.inc to make it available to all ArmVirt packages, and make it conditional: only set the PCD string if FIRMWARE_VER is actually defined. This allows specifying the firmware version string on the build command line with -D FIRMARE_VER=3D... Signed-off-by: Oliver Steffen Reviewed-by: Sami Mujawar --- ArmVirtPkg/ArmVirt.dsc.inc | 4 ++++ ArmVirtPkg/ArmVirtXen.dsc | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index 5b18184be263..2443e8351c99 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -282,6 +282,10 @@ [PcdsFeatureFlag.AARCH64] gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE =20 [PcdsFixedAtBuild.common] +!ifdef $(FIRMWARE_VER) + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER= )" +!endif + gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000 gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000 gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|0 diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc index 58088af6ea3a..a280ae203bae 100644 --- a/ArmVirtPkg/ArmVirtXen.dsc +++ b/ArmVirtPkg/ArmVirtXen.dsc @@ -69,7 +69,6 @@ [BuildOptions] ##########################################################################= ###### =20 [PcdsFixedAtBuild.common] - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER= )" !if $(ARCH) =3D=3D AARCH64 gArmTokenSpaceGuid.PcdVFPEnabled|1 !endif --=20 2.40.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 (#102983): https://edk2.groups.io/g/devel/message/102983 Mute This Topic: https://groups.io/mt/98258184/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-