From patchwork Wed Oct 8 14:40:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 38482 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 54E2A202E7 for ; Wed, 8 Oct 2014 14:40:39 +0000 (UTC) Received: by mail-wg0-f70.google.com with SMTP id a1sf5296550wgh.9 for ; Wed, 08 Oct 2014 07:40:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:date:from:to:message-id:references :mime-version:in-reply-to:user-agent:subject:precedence:reply-to :list-id:list-unsubscribe:list-archive:list-post:list-help :list-subscribe:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-disposition :content-type:content-transfer-encoding; bh=NBtq/unwTomUmEM/LBK10Ii8FHadUwJ8//oDz8th4og=; b=Hr/Uh33ZAD0d9amz8+Jonv3GDdMyjLeR2/mjuCqmmHh+3oFdk/C//Zw7xjQEJ3A+oh huye4NkkEpHRsNhusUjnzvf3OzQYlvzric8hEhyzt9RuAVB5mwJUrarSPk7fjq23zW4v +K8Lmwgxzzon0++7lQeBNIqG2nB+a3GoEDEkNddMSsj8AslzpdhPqwauo3W1/84GXVB1 ppTTN9BOpBzYnPWq+Vdyi/lyLej5u78vwiJ0Ai7Z0+3VbhApWKeVX7AAt3erijDatTIN G9eYNZr0lK8SHmkZtgOR24RJd1e+qHHRhN7uyko1ucdS8b4wFu0Ergs6rHTzj4f/+QBp SyvA== X-Gm-Message-State: ALoCoQn3hUTyHaRg3khFctYejfiVSLrgiG/+r4Kp/gUSxdqWBce2TCr29EZ1MBoGA5ibp4l7wfI8 X-Received: by 10.180.82.74 with SMTP id g10mr5273473wiy.0.1412779238484; Wed, 08 Oct 2014 07:40:38 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.10.72 with SMTP id g8ls70287lab.23.gmail; Wed, 08 Oct 2014 07:40:38 -0700 (PDT) X-Received: by 10.112.190.69 with SMTP id go5mr11620826lbc.32.1412779238256; Wed, 08 Oct 2014 07:40:38 -0700 (PDT) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com [209.85.215.47]) by mx.google.com with ESMTPS id og9si235871lbc.114.2014.10.08.07.40.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 08 Oct 2014 07:40:38 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by mail-la0-f47.google.com with SMTP id pv20so8473897lab.6 for ; Wed, 08 Oct 2014 07:40:38 -0700 (PDT) X-Received: by 10.112.62.200 with SMTP id a8mr11206431lbs.34.1412779238126; Wed, 08 Oct 2014 07:40:38 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp75036lbz; Wed, 8 Oct 2014 07:40:37 -0700 (PDT) X-Received: by 10.50.33.71 with SMTP id p7mr7358711igi.4.1412779236876; Wed, 08 Oct 2014 07:40:36 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id q16si31901325ign.26.2014.10.08.07.40.36 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 08 Oct 2014 07:40:36 -0700 (PDT) Received-SPF: pass (google.com: domain of edk2-devel-bounces@lists.sourceforge.net designates 216.34.181.88 as permitted sender) client-ip=216.34.181.88; Received: from localhost ([127.0.0.1] helo=sfs-ml-2.v29.ch3.sourceforge.com) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1XbsPh-0005h1-Rz; Wed, 08 Oct 2014 14:40:25 +0000 Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1XbsPg-0005gv-IK for edk2-devel@lists.sourceforge.net; Wed, 08 Oct 2014 14:40:24 +0000 Received-SPF: pass (sog-mx-2.v43.ch3.sourceforge.com: domain of linaro.org designates 209.85.212.170 as permitted sender) client-ip=209.85.212.170; envelope-from=leif.lindholm@linaro.org; helo=mail-wi0-f170.google.com; Received: from mail-wi0-f170.google.com ([209.85.212.170]) by sog-mx-2.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1XbsPf-0008D8-Pc for edk2-devel@lists.sourceforge.net; Wed, 08 Oct 2014 14:40:24 +0000 Received: by mail-wi0-f170.google.com with SMTP id hi2so12370772wib.3 for ; Wed, 08 Oct 2014 07:40:17 -0700 (PDT) X-Received: by 10.180.109.162 with SMTP id ht2mr11830038wib.12.1412779217316; Wed, 08 Oct 2014 07:40:17 -0700 (PDT) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by mx.google.com with ESMTPSA id ua8sm334760wjc.7.2014.10.08.07.40.16 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 08 Oct 2014 07:40:16 -0700 (PDT) Date: Wed, 8 Oct 2014 15:40:14 +0100 From: Leif Lindholm To: edk2-devel@lists.sourceforge.net Message-ID: <20141008144014.GN22224@bivouac.eciton.net> References: <1412778512-5398-1-git-send-email-leif.lindholm@linaro.org> MIME-Version: 1.0 In-Reply-To: <1412778512-5398-1-git-send-email-leif.lindholm@linaro.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Score: -1.5 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1XbsPf-0008D8-Pc Subject: Re: [edk2] [PATCH] ArmVExpressPkg: enable specifying firmware version string on build X-BeenThere: edk2-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list Reply-To: edk2-devel@lists.sourceforge.net List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: edk2-devel-bounces@lists.sourceforge.net X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: leif.lindholm@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Content-Disposition: inline Sigh, and I generated that against the wrong branch. Here is one that actually applies on current master: >From 34f8069eb293d524824fe10efba30993c2cb1eb4 Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Wed, 8 Oct 2014 15:20:04 +0100 Subject: [PATCH] ArmVExpressPkg: enable specifying firmware version string on build If FIRMWARE_VER is defined on the build command line, set gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString based on it. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Leif Lindholm --- ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc index fb2efd5..c97aa58 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc @@ -256,6 +256,9 @@ [PcdsFixedAtBuild.common] gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express" +!ifdef $(FIRMWARE_VER) + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" +!endif gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"VExpress" gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000