From mboxrd@z Thu Jan 1 00:00:00 1970 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.web09.17900.1665560128723486817 for ; Wed, 12 Oct 2022 00:35:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=e/vt3Ytr; spf=pass (domain: redhat.com, ip: 170.10.133.124, mailfrom: osteffen@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665560127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=4pFbIhzZlrvadkPduH2kRRoGMJU0UlnKPjv6lGudz5Y=; b=e/vt3YtrfRd2wtMlQ90z+/HcsV4JntFMqOy3avmSdv2rXewXohHrszy9O99RPaIEoAzI4C mDJPMyFcUTteYN+bWL0S+elRkyfNBeiUtKZFGmi0CCu1vElRIujou06bSahzbsROAvlkHD pEd49vfi2KWh8BbxUbdI1RTDCZpvQkc= Received: from mail-lj1-f200.google.com (mail-lj1-f200.google.com [209.85.208.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-638-fgg2y8dKOByFmj7mjEnp9w-1; Wed, 12 Oct 2022 03:35:27 -0400 X-MC-Unique: fgg2y8dKOByFmj7mjEnp9w-1 Received: by mail-lj1-f200.google.com with SMTP id q5-20020a2e84c5000000b0025ec9ff93c8so6544581ljh.15 for ; Wed, 12 Oct 2022 00:35:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4pFbIhzZlrvadkPduH2kRRoGMJU0UlnKPjv6lGudz5Y=; b=5i0hiGMR5Utm5qbbqga7lx1i2V9ZeMAapxSuwI7z8619hckvWxTtVhDdm4IFm9E6nQ S9HXBRElCsLOWPZaPgowAzYpq2F5VR7ae+cZkjc6PyQCxV2g5UIjGTtZkxmi6wnlhY/q pDxvFS7lY7retMCtogxaMU5PFpccNgTMHxVvOuzecWDH7zdDJaRRPsIGmVkFnOt+HalI KtVOah+hu1XoR7DdNEvlP0jpmgaz7E2jjTs1xmVzC/V2XlLCcurm/frU45eYYLazVLgv S/bieBrsPcFdUJ45N6U38zJJQ/ZdCx2YXYeYvptP4LEj0z6Oq3/6ycLg9M+LLS8nFy/a NxNg== X-Gm-Message-State: ACrzQf1XZo6pBvmnb3/jPD/hdlmwmUPOF1FT/ffeEFgLDk+M3/IdN2Ht 9LNO1U0HcB67yoVTUFSv5X5uHZY1zQe6pxXwgazY93eM4dBiq2M7slC98gGfGHkWujgiARERhrj hAoyzqvpNMwXut1nlTHZZ9S8yhxHxfg== X-Received: by 2002:ac2:46c9:0:b0:4a4:47cc:fc9d with SMTP id p9-20020ac246c9000000b004a447ccfc9dmr678460lfo.1.1665560125221; Wed, 12 Oct 2022 00:35:25 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5D95ucbNPUt1kPlh6y1uKNBcMdNxKwB3d7N4qWfCyoKbrmuhGLLHD7Dv6jRGuS53vbOTIhDyOtKvpfC6Egy+Y= X-Received: by 2002:ac2:46c9:0:b0:4a4:47cc:fc9d with SMTP id p9-20020ac246c9000000b004a447ccfc9dmr678454lfo.1.1665560125018; Wed, 12 Oct 2022 00:35:25 -0700 (PDT) Received: from 567203818698 named unknown by gmailapi.google.com with HTTPREST; Wed, 12 Oct 2022 07:35:23 +0000 From: "Oliver Steffen" X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221012073504.511854-1-osteffen@redhat.com> References: <20221012073504.511854-1-osteffen@redhat.com> MIME-Version: 1.0 Date: Wed, 12 Oct 2022 07:35:23 +0000 Message-ID: Subject: [PATCH 2/2] ArmVirtPkg: allow setting Firmware Version from build command line To: devel@edk2.groups.io 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 , Oliver Steffen X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" 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 --- 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 -- 2.37.3