From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4003:c06::242; helo=mail-oi0-x242.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-oi0-x242.google.com (mail-oi0-x242.google.com [IPv6:2607:f8b0:4003:c06::242]) (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 BDBD3221523A5 for ; Mon, 4 Dec 2017 09:10:06 -0800 (PST) Received: by mail-oi0-x242.google.com with SMTP id u193so12220260oie.1 for ; Mon, 04 Dec 2017 09:14:36 -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=mp+JOj9Ybay2kZwYR6cMGR6HuwJoOI9sNz4x033Mwz4=; b=iriP6zJEzBgSEaGSJtcJEuMabAo1lnvdQPG3BO9HVnN1pzt+TvGdKrBOAORkheR3LM 74WeeBZjDKZfOkLDAzZiGWF8Ri8SOUwMQniDWssX2Axyja+XrNuHGC0RB14ORqyVSI8J ur6wwY7Qoach4LKrFEPXaldjqYKZI5BndjkMo= 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=mp+JOj9Ybay2kZwYR6cMGR6HuwJoOI9sNz4x033Mwz4=; b=ZPYOBOnBRaEesik3O8YdF5CvZHlDeEaoe6UuH2Sv5uNGw1QSsUPLow3c3VEtBCGQ84 Hq++w+7gsuaMzqcluGlAGD/rp9Kro9SBWVsGqs8amP4cEcS2WPaNnhdMFvNTT4/4PyCJ njykjU6Q7gxM2lMc7JJxy54A1vj6TQ5UVh1j9DA93YbZTWxlZEEaAEYMHdynyIA4xd20 B3/mc64/wi5h0kZDtiVb21R5BsgtAJ7y79DxzZLkK9mh1PtuIJ61piyYY8f6VlGqvesq VI6ViIUoceh35ZFgSutsrxAERUOWSpMpJRKBZMQ/mWaKKvyZLIfS8+lH1QbCMrgX/eeY qhmQ== X-Gm-Message-State: AJaThX7T6f8nCDKxQf+8iN9CYBrW14FwpIw2guED6zBq+GEO4AMkcC1b libTF8RDVAYbbZSaF/TEXzqeresQ9G/KRbukk3qN+g== X-Google-Smtp-Source: AGs4zMYSzaV9+742347e4DD989uItztjlB9Oia8jm/2Cm62/tiBcLQ/W/qQEmHmHBo3oueilCvWVSE/7GhJR32DiW0Q= X-Received: by 10.202.44.134 with SMTP id s128mr15186268ois.240.1512407675949; Mon, 04 Dec 2017 09:14:35 -0800 (PST) MIME-Version: 1.0 Received: by 10.157.46.103 with HTTP; Mon, 4 Dec 2017 09:14:35 -0800 (PST) In-Reply-To: <20171204171325.3359-1-leif.lindholm@linaro.org> References: <20171204171325.3359-1-leif.lindholm@linaro.org> From: Ard Biesheuvel Date: Mon, 4 Dec 2017 17:14:35 +0000 Message-ID: To: Leif Lindholm Cc: "edk2-devel@lists.01.org" Subject: Re: [PATCH edk2-platforms 1/2] Platform/Hisilicon: fix D05 .dsc line endings 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: Mon, 04 Dec 2017 17:10:07 -0000 Content-Type: text/plain; charset="UTF-8" On 4 December 2017 at 17:13, Leif Lindholm wrote: > Commit b324d85a466b, > ("Hisilicon D03/D05: get firmware version from FIRMWARE_VER"), > added some non CRLF line endings, resolve this. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Leif Lindholm Reviewed-by: Ard Biesheuvel > --- > Platform/Hisilicon/D05/D05.dsc | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc > index efd748e5ef..60eca3c6fc 100644 > --- a/Platform/Hisilicon/D05/D05.dsc > +++ b/Platform/Hisilicon/D05/D05.dsc > @@ -181,11 +181,11 @@ [PcdsFixedAtBuild.common] > > gHisiTokenSpaceGuid.PcdIsMPBoot|1 > gHisiTokenSpaceGuid.PcdSocketMask|0x3 > - !ifdef $(FIRMWARE_VER) > - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" > - !else > + !ifdef $(FIRMWARE_VER) > + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" > + !else > gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"Development build base on Hisilicon D05 UEFI 17.10 Release" > - !endif > + !endif > > gHisiTokenSpaceGuid.PcdBiosVersionString|L"10.01.01T18" > > -- > 2.11.0 >