From nobody Sun May 19 13:34:28 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+102953+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+102953+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1681399978; cv=none; d=zohomail.com; s=zohoarc; b=ekuMe6WCKL7axqnu5Y8eIZ5ki9e5VGJ3qsOu/zWHTeFOdsT3w9X+PqOyobr+/vgNzjphwNcR+gdeYkCHVKD7NpLZ8FIm+AeAY1BQvVEZDOUgFQzyIVDoa+JGm2If1nxkox3qKyh6GvGQrH8lht9+J4ILPw2qP9FiQCtl/44RDbU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681399978; 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=Vdmx4E78WvtI0yWR/cQgjlHqkfovKEQ5qkni5kE4l54=; b=lsgnID5BbVqSneEVrF7GcM+SpDBboUyD6s38J49vhHze2bw6+Rtd9pYKIwiZA4Jk+QUzqFluDpcgXzTIwPok7ildLFfvWV515v7XZHJMVRadCGfQmPBQqGgzw5MTkgzPsIqo94lIsYaJnT5ZVsDjKhgVmAoQRq2nCba9mDLoWkQ= 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+102953+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 1681399978845899.2469569924307; Thu, 13 Apr 2023 08:32:58 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id kISuYY1788612x4GDe8ZZ8a5; Thu, 13 Apr 2023 08:32:58 -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.16744.1681399977396865360 for ; Thu, 13 Apr 2023 08:32:57 -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-115-pGmlCExNNqSu_PVts9X8Zw-1; Thu, 13 Apr 2023 11:32:53 -0400 X-MC-Unique: pGmlCExNNqSu_PVts9X8Zw-1 X-Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 01C53280AA38; Thu, 13 Apr 2023 15:32:52 +0000 (UTC) X-Received: from osteffen-laptop.redhat.com (unknown [10.39.195.81]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4BC4EC16028; Thu, 13 Apr 2023 15:32:50 +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 v3 1/2] OvmfPkg: allow setting Firmware Version from build command line Date: Thu, 13 Apr 2023 17:32:08 +0200 Message-Id: <20230413153209.128585-2-osteffen@redhat.com> In-Reply-To: <20230413153209.128585-1-osteffen@redhat.com> References: <20230413153209.128585-1-osteffen@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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: qKPiouwGtAEo5j1sjDcQWVbHx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1681399978; bh=aCrdasU8zPMJTcXkNGGvd0xbAzKwvClTaA9arKd5ZJw=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=qj6ItjH6uULrWvR81cd28uHQBewAYhfhb+itoyawk+ouvk6rMDRCiDiaKrbH7vdC5MJ Ev0lTMtvtY7itXdzO2RkGUzWqZjN46Kq9PjxXaxiWGD86eoSePQYs5BS8/QIexA4aTe1k OKqygIAC5rabjWJzUR69UXDV3MbGmQRCEz0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1681399979698100001 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 | 3 +++ OvmfPkg/OvmfPkgIa32X64.dsc | 3 +++ OvmfPkg/OvmfPkgX64.dsc | 5 ++++- OvmfPkg/OvmfXen.dsc | 3 +++ 5 files changed, 22 insertions(+), 1 deletion(-) 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..76f0d23a2648 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -488,6 +488,9 @@ [PcdsFeatureFlag] !endif =20 [PcdsFixedAtBuild] +!ifdef $(FIRMWARE_VER) + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER= )" +!endif gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1 !if $(SMM_REQUIRE) =3D=3D FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FAL= SE diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index 065b54450647..e10db29ce6f6 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -494,6 +494,9 @@ [PcdsFeatureFlag] !endif =20 [PcdsFixedAtBuild] +!ifdef $(FIRMWARE_VER) + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER= )" +!endif gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1 !if $(SMM_REQUIRE) =3D=3D FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FAL= SE diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 3d405cd4ade0..4afbbe1f0d2f 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,7 +516,8 @@ [PcdsFeatureFlag] gEfiMdeModulePkgTokenSpaceGuid.PcdRequireSelfSignedPk|TRUE !endif =20 -[PcdsFixedAtBuild] + +[PcdsFixedAtBuild.X64] gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1 !if $(SMM_REQUIRE) =3D=3D FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FAL= SE diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc index 8bfc16c2d3d6..c6e96a9c14e0 100644 --- a/OvmfPkg/OvmfXen.dsc +++ b/OvmfPkg/OvmfXen.dsc @@ -364,6 +364,9 @@ [PcdsFeatureFlag] !endif =20 [PcdsFixedAtBuild] +!ifdef $(FIRMWARE_VER) + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER= )" +!endif gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1 gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FAL= SE --=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 (#102953): https://edk2.groups.io/g/devel/message/102953 Mute This Topic: https://groups.io/mt/98243018/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 Sun May 19 13:34:28 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+102954+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+102954+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1681399979; cv=none; d=zohomail.com; s=zohoarc; b=lBTl2SGXyw5K8zLDGj7pvUlw2RRM4SRMgj+FnHoKA5Iq5AArH4w+M9qNn4YJe4mdq2BkezqkTK2pmyqekR3HttRg/KB36rgFo5M5Ntb1nrZzjohGSfL02TPcLnPo90zlEIz0xlZn4Zn/GGpzbUT5lZ4R5X2RiFShXTnKwo8fSaQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681399979; 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=+V8FmlyptSRzhQ7YHZDxSA5nzg2F4hFCYu15c1I5iXI=; b=Z2spYdb2eH7n1sXwhgVYa6p5EhbVZ5BtamomxNupqZI66VXh4lvEbh14TBgNOKgRVV22bFfDCyCGG1k5fZvsa/mj0+XFOsqD0MuozlO6QGyIUfSj09y9Ui1/u03x0VzdIULCi9jfYjQCDwzOFR6kQSyzaa0lscOji3NMDs+YZkM= 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+102954+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 1681399979590605.4482371874768; Thu, 13 Apr 2023 08:32:59 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 9QjdYY1788612x5ejg2yiiLV; Thu, 13 Apr 2023 08:32:59 -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.16745.1681399978595499553 for ; Thu, 13 Apr 2023 08:32:58 -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-267-WXPXg6wzN7W5_Z4ThubYSg-1; Thu, 13 Apr 2023 11:32:54 -0400 X-MC-Unique: WXPXg6wzN7W5_Z4ThubYSg-1 X-Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E4574857F81; Thu, 13 Apr 2023 15:32:53 +0000 (UTC) X-Received: from osteffen-laptop.redhat.com (unknown [10.39.195.81]) by smtp.corp.redhat.com (Postfix) with ESMTP id 387F5C158BB; Thu, 13 Apr 2023 15:32:52 +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 v3 2/2] ArmVirtPkg: allow setting Firmware Version from build command line Date: Thu, 13 Apr 2023 17:32:09 +0200 Message-Id: <20230413153209.128585-3-osteffen@redhat.com> In-Reply-To: <20230413153209.128585-1-osteffen@redhat.com> References: <20230413153209.128585-1-osteffen@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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: FDCqsp7J0uHD7IoEKwURMIRzx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1681399979; bh=ccyoPr641wmPYFURzN8GMCciFFGI2+MPnVERlvVldf8=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=EujSEGX77IhIHhJOZVdxmB4ty0Q5+bfFxPwDyH5coeFmU7I3fPyb/L8SqoyorF3v4e/ AFD/6cdJdQ2bjLLNN6Y0jsCeK5cUDSU9pk4mN0U4QUSk/ZSclpAA4YH4xDae9TJS3O29/ aabVMqY/jt1cb84ivpNEO4yzJDHcwmwbaYM= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1681399979801100002 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 (#102954): https://edk2.groups.io/g/devel/message/102954 Mute This Topic: https://groups.io/mt/98243019/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-