From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4001:c0b::243; helo=mail-it0-x243.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-it0-x243.google.com (mail-it0-x243.google.com [IPv6:2607:f8b0:4001:c0b::243]) (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 AFB4521A1099A for ; Tue, 12 Dec 2017 10:23:53 -0800 (PST) Received: by mail-it0-x243.google.com with SMTP id p139so765272itb.1 for ; Tue, 12 Dec 2017 10:28:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=qRv1lmCdaul1MD/ik30TiREeD/xZaJIsDIjzKUAaBaA=; b=Rls9Zan9XdYOZ+DD0RJJReC0DG2VIVGlmlMQnAyDclQXScHdhwR+GzPnf//r89u/Vm USsr/jOuq6c/k9GqA8OtqYkjzNXLsnrUuabtqdRQV2rpbTRGnQkr6LVoaQm37+FuXD2H FIwEMG+b2DE+rrSfTbylOAeyhJwH/wIdRgFYA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=qRv1lmCdaul1MD/ik30TiREeD/xZaJIsDIjzKUAaBaA=; b=Ntl0rLIDgUGnBMtUM78tQuaMfol/HUzOpjp7HmqYdLPwQRGB8BiQAB2b7EC3NRC6iQ 3hdIG4MptU3RgzahrcDHsy/ObCIMjmBAPz7DPgjEIDziiFnWlg+X3IZookMjtzci8qLk sceCecYQGIR/rjUACckDJRQ/qoYYX7lZprvtKIRFL1I5NcGzlGJA5d3UB9qhclA6EX9I +WKWqmxHp6I++ZOU6gqG4oQut3RRohVmQnU6t7bmo3e1KDBtjVXPOe5p0GESXYPrLou1 e6hYn0AbbHdFROw6Umucv1YHNnQqKfh5DhxttPm1Xm6AzRT+/VmTWppFUtfgBJ6QL8y0 bjPg== X-Gm-Message-State: AKGB3mIH35r+3xctgqZCUmQRYzTABvHYXOtotZuQ0bDHBcIh57+Kc2zn 1Eh/9BgdAx/h+FREhmUoUwyGyzUBmA19io80C7rNDFHv3v0= X-Google-Smtp-Source: ACJfBotUaqygwF0Hv4jiqAKzRi7aPKSRyU80LRz/DjmiROw70vJqh3n7H+wczzp2YUryBgW8HF2NO+ve0QXpqdI7NRA= X-Received: by 10.36.219.214 with SMTP id c205mr645859itg.65.1513103311871; Tue, 12 Dec 2017 10:28:31 -0800 (PST) MIME-Version: 1.0 Received: by 10.107.104.16 with HTTP; Tue, 12 Dec 2017 10:28:31 -0800 (PST) In-Reply-To: <20171212182419.fxaftkg2oj6cmt4m@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> From: Ard Biesheuvel Date: Tue, 12 Dec 2017 18:28:31 +0000 Message-ID: To: Leif Lindholm Cc: "edk2-devel@lists.01.org" , Daniel Thompson , Masami Hiramatsu 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:23:53 -0000 Content-Type: text/plain; charset="UTF-8" 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 ?