* [PATCH v2 1/2] OvmfPkg: allow setting Firmware Version from build command line [not found] <20221014123408.302491-1-osteffen@redhat.com> @ 2022-10-14 12:34 ` Oliver Steffen 2022-10-14 12:34 ` [PATCH v2 2/2] ArmVirtPkg: " Oliver Steffen 1 sibling, 0 replies; 3+ messages in thread From: Oliver Steffen @ 2022-10-14 12:34 UTC (permalink / raw) To: devel Cc: Anthony Perard, Ard Biesheuvel, Gerd Hoffmann, Jian J Wang, Jiewen Yao, Jordan Justen, Julien Grall, Leif Lindholm, Liming Gao, Ray Ni, Sami Mujawar, Zhichao Gao, Pawel Polawski, nd, Oliver Steffen 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=... Signed-off-by: Oliver Steffen <osteffen@redhat.com> --- OvmfPkg/OvmfPkgIa32.dsc | 3 +++ OvmfPkg/OvmfPkgIa32X64.dsc | 3 +++ OvmfPkg/OvmfPkgX64.dsc | 3 +++ OvmfPkg/OvmfXen.dsc | 3 +++ 4 files changed, 12 insertions(+) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index e9ba491237ae..da7a390275a0 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -488,6 +488,9 @@ [PcdsFeatureFlag] !endif [PcdsFixedAtBuild] +!ifdef $(FIRMWARE_VER) + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" +!endif gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1 !if $(SMM_REQUIRE) == FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index af566b953f36..3598e3327b4c 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -494,6 +494,9 @@ [PcdsFeatureFlag] !endif [PcdsFixedAtBuild] +!ifdef $(FIRMWARE_VER) + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" +!endif gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1 !if $(SMM_REQUIRE) == FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index f39d9cd117e6..0b65442f7c6e 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -514,6 +514,9 @@ [PcdsFeatureFlag] !endif [PcdsFixedAtBuild] +!ifdef $(FIRMWARE_VER) + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" +!endif gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1 !if $(SMM_REQUIRE) == FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc index 58a7c97cddf7..8f64f20c0cfd 100644 --- a/OvmfPkg/OvmfXen.dsc +++ b/OvmfPkg/OvmfXen.dsc @@ -367,6 +367,9 @@ [PcdsFeatureFlag] !endif [PcdsFixedAtBuild] +!ifdef $(FIRMWARE_VER) + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" +!endif gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1 gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE -- 2.37.3 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2 2/2] ArmVirtPkg: allow setting Firmware Version from build command line [not found] <20221014123408.302491-1-osteffen@redhat.com> 2022-10-14 12:34 ` [PATCH v2 1/2] OvmfPkg: allow setting Firmware Version from build command line Oliver Steffen @ 2022-10-14 12:34 ` Oliver Steffen 2022-10-14 13:25 ` Sami Mujawar 1 sibling, 1 reply; 3+ messages in thread From: Oliver Steffen @ 2022-10-14 12:34 UTC (permalink / raw) To: devel Cc: Anthony Perard, Ard Biesheuvel, Gerd Hoffmann, Jian J Wang, Jiewen Yao, Jordan Justen, Julien Grall, Leif Lindholm, Liming Gao, Ray Ni, Sami Mujawar, Zhichao Gao, Pawel Polawski, nd, Oliver Steffen 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=... Signed-off-by: Oliver Steffen <osteffen@redhat.com> --- 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 c39e2506a3ea..49e96c9fb91c 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -289,6 +289,10 @@ [PcdsFeatureFlag.AARCH64] gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE [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] ################################################################################ [PcdsFixedAtBuild.common] - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" !if $(ARCH) == AARCH64 gArmTokenSpaceGuid.PcdVFPEnabled|1 !endif -- 2.37.3 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2 2/2] ArmVirtPkg: allow setting Firmware Version from build command line 2022-10-14 12:34 ` [PATCH v2 2/2] ArmVirtPkg: " Oliver Steffen @ 2022-10-14 13:25 ` Sami Mujawar 0 siblings, 0 replies; 3+ messages in thread From: Sami Mujawar @ 2022-10-14 13:25 UTC (permalink / raw) To: Oliver Steffen, devel Cc: Anthony Perard, Ard Biesheuvel, Gerd Hoffmann, Jian J Wang, Jiewen Yao, Jordan Justen, Julien Grall, Leif Lindholm, Liming Gao, Ray Ni, Zhichao Gao, Pawel Polawski, nd Hi Oliver, Thank you for the updated patch. Reviewed-by: Sami Mujawar <sami.mujawar@arm.com> Regards, Sami Mujawar On 14/10/2022 01:34 pm, Oliver Steffen wrote: > 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=... > > Signed-off-by: Oliver Steffen <osteffen@redhat.com> > --- > 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 c39e2506a3ea..49e96c9fb91c 100644 > --- a/ArmVirtPkg/ArmVirt.dsc.inc > +++ b/ArmVirtPkg/ArmVirt.dsc.inc > @@ -289,6 +289,10 @@ [PcdsFeatureFlag.AARCH64] > gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE > > [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] > ################################################################################ > > [PcdsFixedAtBuild.common] > - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" > !if $(ARCH) == AARCH64 > gArmTokenSpaceGuid.PcdVFPEnabled|1 > !endif ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-14 13:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20221014123408.302491-1-osteffen@redhat.com>
2022-10-14 12:34 ` [PATCH v2 1/2] OvmfPkg: allow setting Firmware Version from build command line Oliver Steffen
2022-10-14 12:34 ` [PATCH v2 2/2] ArmVirtPkg: " Oliver Steffen
2022-10-14 13:25 ` Sami Mujawar
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox