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.129.124]) by mx.groups.io with SMTP id smtpd.web12.6483.1665750873491245398 for ; Fri, 14 Oct 2022 05:34:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=iB8P3Y5m; spf=pass (domain: redhat.com, ip: 170.10.129.124, mailfrom: osteffen@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665750872; 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=ZWAOOxx096mL/VI7FzZyy1iqryZn4+Ra4YcsT0iNtBk=; b=iB8P3Y5mny6HeBaG7OwZzwj5Nj2e+dyT406MUM7wGEM4kYLKalZCXGxi2bfJu5NlJHIDOU ct36yC4Yy1k4r6AuRKNOid1y1zb55bjzi7Rgr2AU439H1A5cx+GQfE5ixEsTJsUPpc3pHC gUYH4HCkXj0J+KI71mZysGu5nYwlQ04= Received: from mail-lj1-f198.google.com (mail-lj1-f198.google.com [209.85.208.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-175-xv5TymUbPo-YZvjJj0Y-Vw-1; Fri, 14 Oct 2022 08:34:31 -0400 X-MC-Unique: xv5TymUbPo-YZvjJj0Y-Vw-1 Received: by mail-lj1-f198.google.com with SMTP id a13-20020a2ebe8d000000b0026bfc93da46so2067914ljr.16 for ; Fri, 14 Oct 2022 05:34:31 -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=ZWAOOxx096mL/VI7FzZyy1iqryZn4+Ra4YcsT0iNtBk=; b=3HxnxjKhzt81VYw+KeKueNgVmL+mm0nxF425aluYG8WQn5+CHy50dIz9HeL0DkW/FR ZSgOLtEqsG986RGDgUFnH8POmTiKLSfWzGPadZXwM+XyO4Jggdm3fqxW+kGIrm7DpCCj J6r9Z9k5jiR+xY0GbK2lEoeTAroUQAQna6InT24OA03fC9jrYJAAQ2+ckJ4Udu3zfMqO 0ipZnbw9u6XjGHbss55n29Y7223jxnpBAJEpwgILv31YDGBmwsyy9ol7cI3TAo99qWJv g9tkuBBOQ3x1hBt7LW4ssxrpQ8WqD05sSG1XevLBknHiZ7AIp58YWZKLkHK728IoZ2PE qaAQ== X-Gm-Message-State: ACrzQf16vyO17GVmyNUfaYDnnZaniRlAYvUKp8bjYU+6NFE4hJWqDsIt CtP9ao/+S34fEHHLwCPaEacVJLkq1ROHGzozqOJR2ACzQU5a3Zj7zobGuwYMHc6dYMtpfS8LbS4 F8BlWx9T7M8G1Ao6W0NDxrEUQbDv6pg== X-Received: by 2002:ac2:4986:0:b0:4a2:7b62:747 with SMTP id f6-20020ac24986000000b004a27b620747mr1572255lfl.92.1665750869078; Fri, 14 Oct 2022 05:34:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6288VsiPEFSPpeC0ilgIVxK8xwUU6Wy7p6Feh7kDWiytaHIa3Do06/yZgvxy7j8FPMB0gO3rN14tqYi+MOuhY= X-Received: by 2002:ac2:4986:0:b0:4a2:7b62:747 with SMTP id f6-20020ac24986000000b004a27b620747mr1572243lfl.92.1665750868847; Fri, 14 Oct 2022 05:34:28 -0700 (PDT) Received: from 567203818698 named unknown by gmailapi.google.com with HTTPREST; Fri, 14 Oct 2022 05:34:27 -0700 From: "Oliver Steffen" X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221014123408.302491-1-osteffen@redhat.com> References: <20221014123408.302491-1-osteffen@redhat.com> MIME-Version: 1.0 Date: Fri, 14 Oct 2022 05:34:27 -0700 Message-ID: Subject: [PATCH v2 1/2] OvmfPkg: 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 , nd@arm.com, 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", 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 --- 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