Skip to content

Commit a818a87

Browse files
osteffenrhmergify[bot]
authored andcommitted
ArmVirtPkg: allow setting Firmware Version from build command line
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 <[email protected]> Reviewed-by: Sami Mujawar <[email protected]>
1 parent 8d59bbf commit a818a87

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

ArmVirtPkg/ArmVirt.dsc.inc

+4
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,10 @@
282282
gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE
283283

284284
[PcdsFixedAtBuild.common]
285+
!ifdef $(FIRMWARE_VER)
286+
gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)"
287+
!endif
288+
285289
gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000
286290
gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000
287291
gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|0

ArmVirtPkg/ArmVirtXen.dsc

-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
################################################################################
7070

7171
[PcdsFixedAtBuild.common]
72-
gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)"
7372
!if $(ARCH) == AARCH64
7473
gArmTokenSpaceGuid.PcdVFPEnabled|1
7574
!endif

0 commit comments

Comments
 (0)