From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::242; helo=mail-wm0-x242.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 1AA3321A1099A for ; Tue, 12 Dec 2017 10:28:32 -0800 (PST) Received: by mail-wm0-x242.google.com with SMTP id 64so557196wme.3 for ; Tue, 12 Dec 2017 10:33:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=NTEsxBj+ukYTmh2xcD+bCL6Y1OLzbrHdn3LpjlLmV9E=; b=cDawNe32eiIoNJNu4nmEXWVYgRFPA71wyC/9+9njukmmO3IRIldKh6N/5oClknqU2X ZJY8F0/HOHVhZ29ZZ87Eo/LQXa6b5Y0DhdVv7aHGAhCmHxBMNNKaZm13UqkaJL1167ym E0e2pyGuUKLXIK0HLF8WzYoR+jUZB06UYaSVI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=NTEsxBj+ukYTmh2xcD+bCL6Y1OLzbrHdn3LpjlLmV9E=; b=CR1YwbkRraUMgq2HdjU4nLVaqfSvPw+cX59hY4C8QoVDgdaQo7tEIvOohtWC20dIiu D9vP0TXADuiPHplF9awjnc/LdmwPdfGjd7UHOIq0oHLBy8BToMFlZErwYE3sevENoHif hcQ6UkMO5BrQLVTNH03Wdl/fgO5BxHn4tLOlIVbRdPoFJRexKkqvClj6dqXmbiyYVWdV FhXbrfKkoSjldaGgtCXBr0TJX8u9kIzgEunqQoYpGPZsGuWamsjYBbe+Ux6jLZ4Lnjvp RFQPBkKE3Ncj/aQSQ0y4Lb6oXqSAXYm6bUaXK0FyQrP6vhYfgzGVVrml1QkasZAOY3jJ 3q+w== X-Gm-Message-State: AKGB3mLhO+KdwjvJ93SO4hhw6JQlcM2KR/cSqYqxWNZcjrF1T7sT1lBI 98luy4eXjy/FJPH4Q/O1Cj99LxHaj+M= X-Google-Smtp-Source: ACJfBovtCGv8fEd6cv+b/+9Sfiacdfb7cmzHwDSAFy1c1Jgz3sNL0fRORuKy3gkc4Fz6VDBdpbn/ew== X-Received: by 10.28.192.24 with SMTP id q24mr2452531wmf.98.1513103589765; Tue, 12 Dec 2017 10:33:09 -0800 (PST) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id s86sm310934wma.29.2017.12.12.10.33.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Dec 2017 10:33:08 -0800 (PST) Date: Tue, 12 Dec 2017 18:33:07 +0000 From: Leif Lindholm To: Ard Biesheuvel Cc: "edk2-devel@lists.01.org" , Daniel Thompson , Masami Hiramatsu Message-ID: <20171212183307.shevkybwvpt6fakw@bivouac.eciton.net> References: <20171212103807.18836-1-ard.biesheuvel@linaro.org> <20171212103807.18836-3-ard.biesheuvel@linaro.org> <20171212181719.bp4g56wdcnt56vtj@bivouac.eciton.net> <20171212182419.fxaftkg2oj6cmt4m@bivouac.eciton.net> MIME-Version: 1.0 In-Reply-To: User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [PATCH edk2-platforms 2/8] Platform/Socionext/SynQuacer: expose build number as firmware version X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Dec 2017 18:28:32 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Dec 12, 2017 at 06:28:31PM +0000, Ard Biesheuvel wrote: > On 12 December 2017 at 18:24, Leif Lindholm wrote: > > On Tue, Dec 12, 2017 at 06:20:00PM +0000, Ard Biesheuvel wrote: > >> On 12 December 2017 at 18:17, Leif Lindholm wrote: > >> > On Tue, Dec 12, 2017 at 10:38:01AM +0000, Ard Biesheuvel wrote: > >> >> Expose the contents of the .DSC macro BUILD_NUMBER via the > >> >> PCD gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString (if > 1), > >> >> and as the FMP system firmware version (for capsule update). > >> >> > >> >> Also, set the firmware vendor to 'Linaro Enterprise Group', to > >> >> distinguish our builds from builds by other parties. > >> >> > >> >> Contributed-under: TianoCore Contribution Agreement 1.1 > >> >> Signed-off-by: Ard Biesheuvel > >> >> --- > >> >> Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 8 +++++++- > >> >> Platform/Socionext/DeveloperBox/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf | 1 + > >> >> Platform/Socionext/DeveloperBox/SystemFirmwareDescriptor/SystemFirmwareDescriptorTable.aslc | 6 ++++-- > >> >> Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 8 +++++++- > >> >> Platform/Socionext/SynQuacerEvalBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptor.inf | 1 + > >> >> Platform/Socionext/SynQuacerEvalBoard/SystemFirmwareDescriptor/SystemFirmwareDescriptorTable.aslc | 6 ++++-- > >> >> 6 files changed, 24 insertions(+), 6 deletions(-) > >> >> > >> >> diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc > >> >> index 8fbd7b2d908f..5ec26f9cdd34 100644 > >> >> --- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc > >> >> +++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc > >> >> @@ -26,6 +26,7 @@ [Defines] > >> >> BUILD_TARGETS = DEBUG|RELEASE > >> >> SKUID_IDENTIFIER = DEFAULT > >> >> FLASH_DEFINITION = Platform/Socionext/DeveloperBox/DeveloperBox.fdf > >> >> + BUILD_NUMBER = 1 > >> >> > >> >> [BuildOptions] > >> >> RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 > >> >> @@ -222,7 +223,7 @@ [PcdsFeatureFlag] > >> >> gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE > >> >> > >> >> [PcdsFixedAtBuild.common] > >> >> - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"Linaro" > >> >> + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|L"Linaro Enterprise Group" > >> > > >> > Actually, could you just delete this Pcd and let it fall back to the > >> > default value of "EDK II"? > >> > > >> > >> Yes. But perhaps it makes sense to put $(FW_VENDOR) in there if it is > >> defined, so we can set it at build time? I would like to have a way to > >> put something in the FirmwareVendor field in the UEFI system table > >> that can help us identify firmware builds done by Linaro. > > > > Sure, that makes sense. Although we already have FIRMWARE_VER for > > similar purposes, so something to match that name? > > I.e. FIRMWARE_VENDOR. > > > > Yes, so replace the hunk above with > > @@ -222,7 +227,9 @@ [PcdsFeatureFlag] > gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE > > [PcdsFixedAtBuild.common] > - gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"Linaro" > +!ifdef $(FIRMWARE_VENDOR) > + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|L"$(FIRMWARE_VENDOR)" > +!endif > > # non-secure SRAM > gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase|0x2E000000 > > ? Works for me: Reviewed-by: Leif Lindholm