From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-x230.google.com (mail-wr0-x230.google.com [IPv6:2a00:1450:400c:c0c::230]) (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 6F6D321E1B74B for ; Thu, 21 Sep 2017 06:00:23 -0700 (PDT) Received: by mail-wr0-x230.google.com with SMTP id o42so4515800wrb.3 for ; Thu, 21 Sep 2017 06:03:30 -0700 (PDT) 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=NbbF20ECScUG8AoG2DdgHjJIvpbfXArxwxxpSCw37tE=; b=PeJoBPZG5MZlRbCIo450QHU8LP4QDc1G5qJ0xtscRmuX5Y1h0aQ5pIV63au2Ex9Ys8 xWX9pcYpytvowG+/Eo78ykK8La4a4+RLQE2pJjra7vUhlOVQMXCL8305LrD/9zN8cw4G hV4dMnj65kh3x497TOevsauSlqD9TXQG364yc= 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=NbbF20ECScUG8AoG2DdgHjJIvpbfXArxwxxpSCw37tE=; b=BuGbVv1uSroz+KjURIlh7Vs+Hf9+4KmeF2sKIFoiI23fA8xoy/SqCDettVSAhqrzat obZZCWUmFxde1lEP0EhN6T3jvXzu0Fg5TR+fjkahGZWQStZyqPFBtSDyT9fEmgFzF7My VSbM4hp05XFeC42BcDxWX/eSl+gMTfLUUaFtKCBGjgJWeFfyhdfAIuKccK1r9A4e9a7Q tlHRW+64/OHDR+Q/vC+9Rso31UYtHTDKxl44t3gJVQxTRsjVnMRPXMIjeRV3SImdJRqH gqlL2HEca2yTTnRJGxagXYqtm7yG2bI3tsPs2pFse2Xg3PHfH2STzrrfh6XYq3RgOpte Vmfw== X-Gm-Message-State: AHPjjUhMHnyl9faSTKmr3yZvyoWUUAEKfhyNOlW7Z+JKKTTT313z2G0k J1g9RbBKrh4JrjIrdy2WMn3JmQ== X-Google-Smtp-Source: AOwi7QDTbxte5FUdsOufd2oBZ5R+OYz0eZgxz26aUPP/g7fI08NlR+TLPA+pEsS9AtJcQLJpSOwiAA== X-Received: by 10.223.176.13 with SMTP id f13mr1685975wra.220.1505999008964; Thu, 21 Sep 2017 06:03:28 -0700 (PDT) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id d9sm2091856wrd.37.2017.09.21.06.03.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Sep 2017 06:03:27 -0700 (PDT) Date: Thu, 21 Sep 2017 14:03:26 +0100 From: Leif Lindholm To: Heyi Guo Cc: linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org, ard.biesheuvel@linaro.org, guoheyi@huawei.com, wanghuiqiang@huawei.com, huangming23@huawei.com, zhangjinsong2@huawei.com, waip23@126.com, Ming Huang Message-ID: <20170921130326.s4xnddg3wnnvuqg7@bivouac.eciton.net> References: <1505991597-52989-1-git-send-email-heyi.guo@linaro.org> <1505991597-52989-8-git-send-email-heyi.guo@linaro.org> MIME-Version: 1.0 In-Reply-To: <1505991597-52989-8-git-send-email-heyi.guo@linaro.org> User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [PATCH edk2-platforms v3 04/11] Hisilicon D03/D05: get firmware version from FIRMWARE_VER 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: Thu, 21 Sep 2017 13:00:23 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Sep 21, 2017 at 06:59:46PM +0800, Heyi Guo wrote: > From: Ming Huang > > Value of the environment variable FIRMWARE_VER is GIT SHA by default, > and you can add the environment variable FIRMWARE_VER to EXTRA_OPTIONS > at build time to specify something else, eg. "16.12-". > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ming Huang Reviewed-by: Leif Lindholm > --- > Platform/Hisilicon/D03/D03.dsc | 6 +++++- > Platform/Hisilicon/D05/D05.dsc | 6 +++++- > 2 files changed, 10 insertions(+), 2 deletions(-) > > diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc > index 7e25ffb..fca6781 100644 > --- a/Platform/Hisilicon/D03/D03.dsc > +++ b/Platform/Hisilicon/D03/D03.dsc > @@ -170,7 +170,11 @@ > gHisiTokenSpaceGuid.PcdAlgSmmuBaseAddress|0xd0040000 > > > - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"Hisilicon D03 UEFI 16.12 Release" > + !ifdef $(FIRMWARE_VER) > + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" > + !else > + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"Development build base on Hisilicon D03 UEFI 17.10 Release" > + !endif > > gHisiTokenSpaceGuid.PcdBiosVersionString|L"10.01.01T18" > > diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc > index 7cd5758..aa61c0e 100644 > --- a/Platform/Hisilicon/D05/D05.dsc > +++ b/Platform/Hisilicon/D05/D05.dsc > @@ -188,7 +188,11 @@ > > gHisiTokenSpaceGuid.PcdIsMPBoot|1 > gHisiTokenSpaceGuid.PcdSocketMask|0x3 > - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"Hisilicon D05 UEFI 16.12 Release" > + !ifdef $(FIRMWARE_VER) > + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" > + !else > + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"Development build base on Hisilicon D05 UEFI 17.10 Release" > + !endif > > gHisiTokenSpaceGuid.PcdBiosVersionString|L"10.01.01T18" > > -- > 1.9.1 >