Re: [edk2-devel] [PATCH 2/2] ArmVirtPkg: allow setting Firmware Version from build command line

[Sami Mujawar]

Hi Oliver,

Thank you for this patch.

These changes look good to me.

Reviewed-by: Sami Mujawar <sami.muja...@arm.com>

Regards,

Sami Mujawar

On 12/10/2022 08:35 am, Oliver Steffen wrote:

Initialize
gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString
with with the value of the variable "FIRMWARE_VER"
in all flavors of ArmVirtPkg.

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 <ostef...@redhat.com>
---
  ArmVirtPkg/ArmVirtCloudHv.dsc    | 1 +
  ArmVirtPkg/ArmVirtKvmTool.dsc    | 1 +
  ArmVirtPkg/ArmVirtQemu.dsc       | 1 +
  ArmVirtPkg/ArmVirtQemuKernel.dsc | 1 +
  4 files changed, 4 insertions(+)

diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc
index 7ca7a391d9cf..7e3aa84cd321 100644
--- a/ArmVirtPkg/ArmVirtCloudHv.dsc
+++ b/ArmVirtPkg/ArmVirtCloudHv.dsc
@@ -86,6 +86,7 @@ [PcdsFeatureFlag.common]
    gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE

  [PcdsFixedAtBuild.common]
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)"
  !if $(ARCH) == AARCH64
    gArmTokenSpaceGuid.PcdVFPEnabled|1
  !endif
diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc
index 3bd3ebd6e0b3..e07ed6fc4ca8 100644
--- a/ArmVirtPkg/ArmVirtKvmTool.dsc
+++ b/ArmVirtPkg/ArmVirtKvmTool.dsc
@@ -113,6 +113,7 @@ [PcdsFeatureFlag.common]
    gPcAtChipsetPkgTokenSpaceGuid.PcdRtcUseMmio|TRUE

  [PcdsFixedAtBuild.common]
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)"
    gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000000F

    gArmPlatformTokenSpaceGuid.PcdCoreCount|1
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 9369a88858fd..4963b2006165 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -135,6 +135,7 @@ [PcdsFeatureFlag.common]
    gArmVirtTokenSpaceGuid.PcdTpm2SupportEnabled|$(TPM2_ENABLE)

  [PcdsFixedAtBuild.common]
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)"
  !if $(ARCH) == AARCH64
    gArmTokenSpaceGuid.PcdVFPEnabled|1
  !endif
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 7f7d15d6eee3..8454be6c2bfd 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -115,6 +115,7 @@ [PcdsFeatureFlag.common]
    gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE

  [PcdsFixedAtBuild.common]
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)"
  !if $(ARCH) == AARCH64
    gArmTokenSpaceGuid.PcdVFPEnabled|1
  !endif

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#95062): https://edk2.groups.io/g/devel/message/95062
Mute This Topic: https://groups.io/mt/94276443/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-