From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:400e:c05::236; helo=mail-pg0-x236.google.com; envelope-from=heyi.guo@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pg0-x236.google.com (mail-pg0-x236.google.com [IPv6:2607:f8b0:400e:c05::236]) (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 7BFF420945BD0 for ; Thu, 28 Sep 2017 20:23:43 -0700 (PDT) Received: by mail-pg0-x236.google.com with SMTP id v23so76358pgc.5 for ; Thu, 28 Sep 2017 20:26:58 -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=j4F0TkCDviqlktS2yhOWzo1gIOr/MjOUf/5kz5fkhvI=; b=ODG3TqAFgRNypoJPwlTjeeQlmf8vfLNaDbsWYxV0RfzIDnSqrY2x2xYpZ3A354YRoH +F8HuKzwIybOvwRaTCl9C+lJQUshbinOY6794ac6FHW3ofyUs0hUMGBfl5dv6Wpo02v4 wyNQNTtSzfGp/K0YLKaOX9w/ffD9vA6QSaUT0= 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=j4F0TkCDviqlktS2yhOWzo1gIOr/MjOUf/5kz5fkhvI=; b=WHcldzh/QjWa29ERxLfe0ZUiS2vg+l4frzQcmdXMNdoabRU2vhz7TUItVmdhHkyH4i L1K9AucfPKO+SZfKMBqAFkXO8Kl+rj4YuOhFFVvxIwb6HIbznysdj+uu6N1Qm6lP54Qo tohCu+OjB5V7fR/4ru3uFIO+j4n0ZVBu8/bf0Cr9k/6EQM5EEWemVlFkU2deb4KtVkw4 g9crSpl+6gzPePCGLBSW53Y6jpmWCQYDoLycIO1YcYedyWOI+TODFusamdYBQEf5HGNY 1ujdocfKupj62Y6gdAReHmukC0wFxOBUkCNqyr7PM28WRg/wveow60JwFUphE45FkzUZ 970A== X-Gm-Message-State: AHPjjUhEuSSVOjStRpDwgq9LUu/jeKyKawSEGuoP51TJMAW1WVB6gCHP Sc+Z57QCWL6WfJ85er5oCih/Eg== X-Google-Smtp-Source: AOwi7QBy9wK9BxViS68HK9bUixPZJO/kBFnTICFjgu2ue5lbmIXulZMquJ3S77jNuuxtXXnOWmpf0g== X-Received: by 10.84.133.98 with SMTP id 89mr5674740plf.294.1506655618663; Thu, 28 Sep 2017 20:26:58 -0700 (PDT) Received: from localhost.localdomain ([119.145.15.121]) by smtp.gmail.com with ESMTPSA id g16sm5094376pfd.6.2017.09.28.20.26.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Sep 2017 20:26:58 -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, mengfanrong@huawei.com, waip23@126.com, Ming Huang , Heyi Guo Date: Fri, 29 Sep 2017 11:19:43 +0800 Message-Id: <1506655190-56231-5-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1506655190-56231-1-git-send-email-heyi.guo@linaro.org> References: <1506655190-56231-1-git-send-email-heyi.guo@linaro.org> Subject: [PATCH edk2-platforms v5 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: Fri, 29 Sep 2017 03:23:43 -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 Signed-off-by: Heyi Guo 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