From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::241; helo=mail-wr0-x241.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) (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 4D191221523A5 for ; Mon, 4 Dec 2017 09:09:00 -0800 (PST) Received: by mail-wr0-x241.google.com with SMTP id l22so18123861wrc.11 for ; Mon, 04 Dec 2017 09:13:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=KiHBEU6vo5ahKzonPTyYfnKxCCz3O+H7IJfdZlFOFd0=; b=XenSw6OqYvpGuukk9eGFsM6S5w6O+DDUG6oOb0sV8AwmsqNdJeHJVHAtnn6vRWkzei s5a5RMOBCOQJAuUQ9wTNvodnQR7/0r8/CSycT3Dw7n9B7MEoF10tuCuta3xcmUg413zl BfFm/1mFG3bW9xiEMwOwhYg49rGGlrzcZFvk8= 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; bh=KiHBEU6vo5ahKzonPTyYfnKxCCz3O+H7IJfdZlFOFd0=; b=cX8MNORBKhw/f1WTBRfQgOM8eSGJyPBald8uruHqwHAo0h2+ACqV0lzXWVkOHU2tle budVd8QegRrxW2TLRW0GloaqC5NnQ2b4n+6uxn2VYw3YsKq5AwBXJPEM6ah+wiK2TIaO /bR2E6fguKnywufim8g7WRW3Au4K8qFbgEVHPv1Jw6h5UoA6FHSIZpD8X6WrYG4471Tw KmDfvWoXvswDhiVGKcVxVwm6yqOtE4G+f5e/8ZRp2NlMBIkdLennjGNKKYa2sH0Ej4IA S8KUgNzfVODqPSO/y6HVVcTwrg1LrXAIWnivvTriyEL5rVV/uILaiOKoGeVQG6PW5MAC Qt8w== X-Gm-Message-State: AJaThX63RrVNlXCkLVmGl+4NkGm1gcdD1WDQIvY0ZURUpziZOmKRQF7C SEdrhLu5y7ULweaNojuQrM3NroN76sk= X-Google-Smtp-Source: AGs4zMaer+O+Lh43Gd3ED4+B6VQcokvgz6lrHKs2Weml5gxpB+gJRy69kIjSzoEJW37IivhhSl09YQ== X-Received: by 10.223.142.143 with SMTP id q15mr14713734wrb.6.1512407608133; Mon, 04 Dec 2017 09:13:28 -0800 (PST) Received: from vanye.hemma.eciton.net (cpc92316-cmbg19-2-0-cust118.5-4.cable.virginm.net. [82.12.0.119]) by smtp.gmail.com with ESMTPSA id i3sm11514586wre.33.2017.12.04.09.13.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Dec 2017 09:13:26 -0800 (PST) From: Leif Lindholm To: edk2-devel@lists.01.org Cc: ard.biesheuvel@linaro.org Date: Mon, 4 Dec 2017 17:13:24 +0000 Message-Id: <20171204171325.3359-1-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 Subject: [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:09:00 -0000 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 --- 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