From patchwork Mon Dec 4 17:13:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 120575 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4692356qgn; Mon, 4 Dec 2017 09:13:32 -0800 (PST) X-Google-Smtp-Source: AGs4zMa8jQSneaqJFY6S8edjSjJ1Kq55UsXtFBbGATdATma8+/+8Sj9E9FoKidMJ0ylak2C0ad6h X-Received: by 10.101.74.200 with SMTP id c8mr14360781pgu.369.1512407612418; Mon, 04 Dec 2017 09:13:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512407612; cv=none; d=google.com; s=arc-20160816; b=I+uMbknyphYmrb/g6IYzKKyRpDrDt9GMYcxDT2I2pnIypq6lt9EH564x42Yx69KAQ/ fvJtMxWDQ5C9yJoWgeU0PEiSSt91H0U23sN4enlkjCIk3QvE2gyg/PulD/w6igoKJNs9 5ixFJt/aSgLHgC45vq0CJsEBoDhLUPPBx4KxwMN7SNR2/1jxlJCz4e7KOyf8ThtVOnpG hROSe5dLHl71IK4FzzXAmOlX1i4NxMEVQbl+NLpSbLn+1pk60VnFCpCbCZzjqOo1NmNB 5bxXtIKr5gGhYXrt1lvmypOVuRzS9u6lqLe+9V4vnE3PjWGQuMIQo7ubuHjpOlB7PMKX rjOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=fm/Jx/t81NwW9BNRZixLq7ODQi2uaQ7vOm8XukdV7e4=; b=UnfhV5mPKN8wIUDPYCml/VYVaTm2B9jJrjFrD1K2UCjYOdQvG9Vb2gIqGPs8Mtljoz wFn/J0/rQTSfmZ3X89aljiO8Cupi6hlMJI9/S7OuedR2PVZ1doVebsSfD5mF1dpzOaWm j7WWmUQBePGE8oP2UV6XkMkM+OCWZmSp9I/wouja9itb75Ftr4PX31CGerSO2x8jjSiU +fE13kxgdxUVqcIjNGk44oHLiD755QThNNq1mAdpxXIhg0EMSEIz48ErsSNAWTcWMf6k ga39frsIahyUMv5Tew3GGW+ZHFl5JiqRk6iYRwKNtXZ9v6bt+o4IoDJwgdadjEZ1XY9J acaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=XenSw6Oq; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id i78si10552012pfa.191.2017.12.04.09.13.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Dec 2017 09:13:32 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=XenSw6Oq; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 75C4D2034A76F; Mon, 4 Dec 2017 09:09:01 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org 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-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 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: [edk2] [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: , Cc: ard.biesheuvel@linaro.org MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" 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(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ard Biesheuvel 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" From patchwork Mon Dec 4 17:13:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 120576 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4692387qgn; Mon, 4 Dec 2017 09:13:34 -0800 (PST) X-Google-Smtp-Source: AGs4zMZG311WteREWfzMJ3dLPpjQ3TUpMq4I0opd0tqOrs9QzSHTwHJQv8u0eSmsCbqxZzMDB3V0 X-Received: by 10.84.204.8 with SMTP id a8mr15130439ple.399.1512407614205; Mon, 04 Dec 2017 09:13:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512407614; cv=none; d=google.com; s=arc-20160816; b=PktnDWKVyIH98hZ24lTMhi6MRkCeLLbPkJOLGjNyPUr8KrSjq4zEFEqg6T9pFOzDAV 8VMo79zfoFGMc+iJWmBrfBkcqgnBnLeLRua75/vIHmwV+N1m0PS0uhvIpOc3qVi7cOee pOCJgOaI3b7/Z1nu+mAQm4Ade+rSSpQ57NkWXde/Nq1bluXfO0rkXCxw5um3Ro6Cs0CM p1G7Rjv0VEnBNd4aNooVCCUfEgZL9srNS9VWfTmd9tK738DnxGbycr6MGIGV72TTKxsO rJkBVZkSfrZ7S+yZMwOtEhARnXQE7FfAJd7nRKxs8EdnBVGSMynsmsZHyv3Kt+HM83dc /IEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=Znwkn/w1K74vX6dok8dD3AXzi9R9Y9cLqETZ0cs6dhU=; b=xAiIt9UXipyfnHaUSmlxIpG0eq8dB8AihgbRHy9x7naHRCsmqJ+kqN69oqtPcFJ1wQ EkBrrjBe85fcRdBBVxt/Kuc08QcHZUJGL1HczviII2vfHWD9T2GQBDujcAq+1ezWglsA 9NS6xSK9yQFTkD7SnieldxcjeajmilVWDIkvDRum03dhz08dk0UIYPZyR++KKj7yD1UC NaQ1RpeI9d71RHg26xRnpUiVvtNhPAAQII+xxkoeIvASE0pLsO/f418HNx1YTkHt6ykP /Irf4AkdXqyQ3aB0Gb+OMcPJSfQeY/Jya9XsRG+afN76lnbLfcs4PXclVFeXzAreEMV/ 0uCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=fBnnEcqH; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id r9si9691533pge.200.2017.12.04.09.13.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Dec 2017 09:13:34 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=fBnnEcqH; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id B4CE420352A89; Mon, 4 Dec 2017 09:09:03 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::241; helo=mail-wm0-x241.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::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 D214D221523A5 for ; Mon, 4 Dec 2017 09:09:01 -0800 (PST) Received: by mail-wm0-x241.google.com with SMTP id f9so15716848wmh.0 for ; Mon, 04 Dec 2017 09:13:31 -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:in-reply-to:references; bh=PTiFYQgSAYNQ49zxdMEHrmaN4myPwJuGiWNbQaNJEgU=; b=fBnnEcqHuLbLLppYaCuj+XAIuOVDSu85dvqLqKLKI3nwnScY8iA35BidJPAyVb6dkF GcmPFZKbyopqBwGucxKBNg4pJm8MPyoLpM+QyP6cxmr8WAQmj1pBVNpOCNS1sZPHuMLN mup7xM1KF63sSDOczTEMe4fPopDuUUcKZGFOA= 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=PTiFYQgSAYNQ49zxdMEHrmaN4myPwJuGiWNbQaNJEgU=; b=sWbDlixT5TI7U6Rkhu6KFs3sKHxTJpPpDx10ofAgRIj3RcZnYwYrNPfyRfcmNCHz5v vpGAdJzAUkLKjlqObO5MrAYyykRUi5hx7X8zVWKr2IZzljelSbAr6De3HIxCRJoXnDR6 WU3hTxSP3a8QbmdfhPjjrNpEgUvp0LThtR4YrE11uIIUY/qwtIzS2wL3JYougUtSq3AF OrGMhwUY8dpvYg7H60DQKkigk6ngp0eBbBcY8jknqoiknOJlnBxDAqtmdFsJk13sku0J ZSMd+Zn+aGPbtFbAJwrewio5VgYdb31AyQQxwet8aZMBFqmYPnWYlN9Wuh7N6dOMjnVa pVTw== X-Gm-Message-State: AKGB3mJgjYmQswZGzJmz8xuKjT6rb0jL2vtTAd/6JwyULMeXfJf2ygKy r1CP0wy/q30EaiRwkMA2iQpmls8/zn0= X-Received: by 10.28.66.25 with SMTP id p25mr3417847wma.154.1512407609803; Mon, 04 Dec 2017 09:13:29 -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.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Dec 2017 09:13:28 -0800 (PST) From: Leif Lindholm To: edk2-devel@lists.01.org Date: Mon, 4 Dec 2017 17:13:25 +0000 Message-Id: <20171204171325.3359-2-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171204171325.3359-1-leif.lindholm@linaro.org> References: <20171204171325.3359-1-leif.lindholm@linaro.org> Subject: [edk2] [PATCH edk2-platforms 2/2] Platform/Hisilicon: fix conditional inclusion of tftp shell command 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: , Cc: ard.biesheuvel@linaro.org MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" D02, D03 and D05 all have nice conditional clauses to only include the non-standard tftp shell command ifdef(INCLUDE_TFTP_COMMAND). Unfortunately, they all explicitly set DEFINE INCLUDE_TFTP_COMMAND=1 in their platform description files, meaning there is no way to exclude the command without an editor. So remove the DEFINE and let people specify on the command line whether to include it, as originally intended. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Leif Lindholm --- Platform/Hisilicon/D02/Pv660D02.dsc | 1 - Platform/Hisilicon/D03/D03.dsc | 1 - Platform/Hisilicon/D05/D05.dsc | 1 - 3 files changed, 3 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ard Biesheuvel diff --git a/Platform/Hisilicon/D02/Pv660D02.dsc b/Platform/Hisilicon/D02/Pv660D02.dsc index ab7c7ba7b7..a2a94945e5 100644 --- a/Platform/Hisilicon/D02/Pv660D02.dsc +++ b/Platform/Hisilicon/D02/Pv660D02.dsc @@ -28,7 +28,6 @@ [Defines] BUILD_TARGETS = DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT FLASH_DEFINITION = Platform/Hisilicon/D02/$(PLATFORM_NAME).fdf - DEFINE INCLUDE_TFTP_COMMAND=1 !include Silicon/Hisilicon/Hisilicon.dsc.inc diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc index 00b459ab35..d37c370648 100644 --- a/Platform/Hisilicon/D03/D03.dsc +++ b/Platform/Hisilicon/D03/D03.dsc @@ -28,7 +28,6 @@ [Defines] BUILD_TARGETS = DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT FLASH_DEFINITION = Platform/Hisilicon/$(PLATFORM_NAME)/$(PLATFORM_NAME).fdf - DEFINE INCLUDE_TFTP_COMMAND=1 !include Silicon/Hisilicon/Hisilicon.dsc.inc diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc index 60eca3c6fc..1574c3feef 100644 --- a/Platform/Hisilicon/D05/D05.dsc +++ b/Platform/Hisilicon/D05/D05.dsc @@ -29,7 +29,6 @@ [Defines] SKUID_IDENTIFIER = DEFAULT FLASH_DEFINITION = Platform/Hisilicon/$(PLATFORM_NAME)/$(PLATFORM_NAME).fdf DEFINE EDK2_SKIP_PEICORE=0 - DEFINE INCLUDE_TFTP_COMMAND=1 DEFINE NETWORK_IP6_ENABLE = FALSE DEFINE HTTP_BOOT_ENABLE = FALSE