From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg0-x231.google.com (mail-pg0-x231.google.com [IPv6:2607:f8b0:400e:c05::231]) (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 E421021E1B76D for ; Thu, 21 Sep 2017 04:04:02 -0700 (PDT) Received: by mail-pg0-x231.google.com with SMTP id 7so3328002pgd.13 for ; Thu, 21 Sep 2017 04:07:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IHHgaXMWs3he51p2OHrY9W45aCFcWl3+2hQ424RuhmA=; b=Trr19+AOhWKs7rSBRK47HLv2e/NceMa+D/iThgYBV2Eoo5GVeX9BLO5bxy8xufiiie Ra82C/z3gNauiERDd9IeizEEyWmyi/H83lbfnH6/J59zA4cN7EwIquGgTyFrTybxvDxY ii8qHXBCya+ccsKpreX5lYMQBBhMvBnN4I3bU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IHHgaXMWs3he51p2OHrY9W45aCFcWl3+2hQ424RuhmA=; b=V6nIcTIb8NdlfHblpaN5CYnuzHtfH7/b31ygGKjT80EU8NBmshf+Qt/0UXGWrke2Oq 6z94SKQJsLCxX9qjVGisZVwty7l6Fndg9DUna2fe+ymeVuXuJjkl8ko+qfkz6rqj6L/J /iF1D6c6Zz4CFqUaID55ZcIJBV7vM1eliR76Rx+mhVB3TAjJRYb+I/B1VPW0R1NPBMly c/Q+hij1LGYJcjryvSzd7RvtLIePtPfLg/lIaC10sJM3AezqJDw/7oyNHzrbkO+L7iFX xxHT7pW8Nj4/nW4la3WBZibrmFE5ZUqtqPUHyB66pMjjvkvPMjaYrXbPSnxocPtbXO8G I5Vg== X-Gm-Message-State: AHPjjUiMh9l5+ytLp1gv63V7o7hzKCpNOnDTtmkvs5ClyuNDs3EGNh3v rqV/Iiv4EvNxsHGEkCbs9CtUNw== X-Google-Smtp-Source: AOwi7QAHyLSds1FRzMzVLmvmwLB0uQbIMd5cJ1LbXce5ZFwDYvL+OjkY13X6HbzC0Z6f75t36SHUig== X-Received: by 10.98.178.66 with SMTP id x63mr5333239pfe.332.1505992029447; Thu, 21 Sep 2017 04:07:09 -0700 (PDT) Received: from localhost.localdomain ([119.145.15.121]) by smtp.gmail.com with ESMTPSA id x124sm2090762pfx.56.2017.09.21.04.07.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 04:07:08 -0700 (PDT) From: Heyi Guo To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Cc: ard.biesheuvel@linaro.org, guoheyi@huawei.com, wanghuiqiang@huawei.com, huangming23@huawei.com, zhangjinsong2@huawei.com, waip23@126.com, Ming Huang Date: Thu, 21 Sep 2017 18:59:46 +0800 Message-Id: <1505991597-52989-8-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1505991597-52989-1-git-send-email-heyi.guo@linaro.org> References: <1505991597-52989-1-git-send-email-heyi.guo@linaro.org> Subject: [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 11:04:03 -0000 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 --- 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