From patchwork Thu Nov 30 12:00:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 120149 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp570682qgn; Thu, 30 Nov 2017 04:01:00 -0800 (PST) X-Google-Smtp-Source: AGs4zMbeB9hRXDKFjq9u6zb6TH9iTXedsbqlWTV2+XGHBcBURA4M5oMwWuMMoPbnYj6OMzm6KMHs X-Received: by 10.84.208.227 with SMTP id c32mr2368714plj.290.1512043260085; Thu, 30 Nov 2017 04:01:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512043260; cv=none; d=google.com; s=arc-20160816; b=UxplqnvShueEUUnaFVWuHYljdFsyPpqz8wKImV9qzx3hulSeKZavp20V04vMbyhZZb lCQu8ZCXzdlJg1jRB9rzRw1dG4Ovd1ShT0ThECHOsMfLiWMgxGZa7FH8VgqJCIlHkYNh PQ42/LSUtWpMo+47QhPdqMPBlZUeV1vMs37lQF136sEw8622ATq1Cntn0Mv9hSI+NrsQ dcRFIgqEHisx0233pocUI5NUIaHNj91LGOVWhIGs4GI73NKLApZGNNp/RzRi0FgHnWuM 4z1i1zZerS3FHlNjwBF1X/RKefRHdhHu9B5S/UOd7Q69XySFyU/YVrlWKueNznFbpRIB cwjQ== 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=WPA9O5UD35O2m09Ljq7WrAEn8Orbi9qZog/H0S/ScKQ=; b=dF68BFRGVmbJjsGhvojV+nWq0BMV6npTNIa4d2ICIzQm2axf/XenTZq3Oxzq3kN/V+ OZKmRGIp3brY29NR5ilSoK5YCsg2p8Za91PJpxJEIt3bpysT6m4ZLApQGPhIENDcdNbp Kn3X3a8YaZNSM8C1lMxEaQ7fOJjuosWDbpfGKL25m9sOwCX/JeMBJwtGKM9Yz8oYiKcA 0VyvVbecwHzzvgAw9m9UloDZQ7oJAlSpCxGBG1QZpC6Aucz3NK/AvsaI/5TkQyl18ueu n3F+owmJpjDXSP7dNZ/Ov59EpKlyiF2z3AIrjuvHpKgFGb/APVS/HM/ZWP49SAb2Q8gG haEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ci5Pfu9s; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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. [198.145.21.10]) by mx.google.com with ESMTPS id l2si3125272pfg.320.2017.11.30.04.00.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Nov 2017 04:01:00 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ci5Pfu9s; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 85B80220C1C39; Thu, 30 Nov 2017 03:56:33 -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::242; helo=mail-wm0-x242.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::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 C52F9221660ED for ; Thu, 30 Nov 2017 03:56:31 -0800 (PST) Received: by mail-wm0-x242.google.com with SMTP id v19so11945928wmh.5 for ; Thu, 30 Nov 2017 04:00:56 -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=/8VWZODfVCWYwu6ozg0vsxDpECl5KI3Q4dyH6DoQBMc=; b=ci5Pfu9sAyjf2hhnUQsHKBKhqJRXV9torlJEmnAuxjWy0AvrCmR3aTHSKWuSNCZaa+ UUdyY3jIlN2uKW/QD38So6nT3ma7O4uTLhsrvJbvobJQ31EuBYTo0pJetRzb4BXq4QW4 MAxPLQznCCUIC5J8OqmSAKiVNfL1Kq1VQpyMc= 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=/8VWZODfVCWYwu6ozg0vsxDpECl5KI3Q4dyH6DoQBMc=; b=AFK9Z//X0dyFPbG2Z5Mj5LT54ToWQTW1zDKGs2w+la8WLETka0OZlEp6AvfD8C2q0P 11n8yaisZicmxpqtn2a7r5y1m3RuTtwRAeYuEHx/Kbovp7KTnMP6dKtYPd0246i4PSHb pWQd+PXz6JH4/hhndJCuIqsvDUbu+vNFiGBEK3mrahc+v6DuRhXo8Th776LNOfM/8XoB 1xOZOJkHYZStXWWezYCgh2u8mzJVXbb5u/weDu2FDcHDfO2xL59SGA07mldJwDebNOTL zgZm3E4XhxtaESyhUbrBsZCCqFfzJPq+ICbqw5R9T/jEKw/6mzTvVYJ5JX0wbrnq7z0f t0zA== X-Gm-Message-State: AJaThX5FNtVo5fCSeQaaRjK8BB/kqqI+oPPjZgXnf+j2yZWuwu/s/f7M ZquY0DgogxZg42wz3x0PNo9D23M5pbI= X-Received: by 10.28.110.24 with SMTP id j24mr1841599wmc.100.1512043255102; Thu, 30 Nov 2017 04:00:55 -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 w133sm2753148wmg.9.2017.11.30.04.00.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Nov 2017 04:00:53 -0800 (PST) From: Leif Lindholm To: edk2-devel@lists.01.org Date: Thu, 30 Nov 2017 12:00:52 +0000 Message-Id: <20171130120052.1224-1-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 Subject: [edk2] [PATCH edk2-platforms] Platform, Silicon: Update Hisilicon Shell tftp command config 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" EDK2 changed the tftp shell command from a library to a dynamic command. Update configuration files to reflect this. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Leif Lindholm --- Platform/Hisilicon/D02/Pv660D02.dsc | 6 +++--- Platform/Hisilicon/D02/Pv660D02.fdf | 3 +++ Platform/Hisilicon/D03/D03.dsc | 6 +++--- Platform/Hisilicon/D03/D03.fdf | 3 +++ Platform/Hisilicon/D05/D05.dsc | 6 +++--- Platform/Hisilicon/D05/D05.fdf | 3 +++ Platform/Hisilicon/HiKey/HiKey.dsc | 4 +++- Platform/Hisilicon/HiKey/HiKey.fdf | 3 +++ Silicon/Hisilicon/Hisilicon.dsc.inc | 7 ++++--- 9 files changed, 28 insertions(+), 13 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 d5eb963e8f..ab7c7ba7b7 100644 --- a/Platform/Hisilicon/D02/Pv660D02.dsc +++ b/Platform/Hisilicon/D02/Pv660D02.dsc @@ -434,12 +434,12 @@ [Components.common] !ifdef $(INCLUDE_DP) NULL|ShellPkg/Library/UefiDpLib/UefiDpLib.inf !endif #$(INCLUDE_DP) -!ifdef $(INCLUDE_TFTP_COMMAND) - NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf -!endif #$(INCLUDE_TFTP_COMMAND) gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 } +!ifdef $(INCLUDE_TFTP_COMMAND) + ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf +!endif #$(INCLUDE_TFTP_COMMAND) diff --git a/Platform/Hisilicon/D02/Pv660D02.fdf b/Platform/Hisilicon/D02/Pv660D02.fdf index e0bb0ab273..f0934a86f4 100644 --- a/Platform/Hisilicon/D02/Pv660D02.fdf +++ b/Platform/Hisilicon/D02/Pv660D02.fdf @@ -266,6 +266,9 @@ [FV.FvMain] # Build Shell from latest source code instead of prebuilt binary # INF ShellPkg/Application/Shell/Shell.inf +!ifdef $(INCLUDE_TFTP_COMMAND) + INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf +!endif #$(INCLUDE_TFTP_COMMAND) # # Bds diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc index 6b141dcdcb..00b459ab35 100644 --- a/Platform/Hisilicon/D03/D03.dsc +++ b/Platform/Hisilicon/D03/D03.dsc @@ -499,12 +499,12 @@ [Components.common] !ifdef $(INCLUDE_DP) NULL|ShellPkg/Library/UefiDpLib/UefiDpLib.inf !endif #$(INCLUDE_DP) -!ifdef $(INCLUDE_TFTP_COMMAND) - NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf -!endif #$(INCLUDE_TFTP_COMMAND) gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 } +!ifdef $(INCLUDE_TFTP_COMMAND) + ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf +!endif #$(INCLUDE_TFTP_COMMAND) diff --git a/Platform/Hisilicon/D03/D03.fdf b/Platform/Hisilicon/D03/D03.fdf index 37a7e2827d..0b38eb48fa 100644 --- a/Platform/Hisilicon/D03/D03.fdf +++ b/Platform/Hisilicon/D03/D03.fdf @@ -279,6 +279,9 @@ [FV.FvMain] # Build Shell from latest source code instead of prebuilt binary # INF ShellPkg/Application/Shell/Shell.inf +!ifdef $(INCLUDE_TFTP_COMMAND) + INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf +!endif #$(INCLUDE_TFTP_COMMAND) # # Bds diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc index 00cf0f20d2..41cd3c8680 100644 --- a/Platform/Hisilicon/D05/D05.dsc +++ b/Platform/Hisilicon/D05/D05.dsc @@ -647,12 +647,12 @@ [Components.common] !ifdef $(INCLUDE_DP) NULL|ShellPkg/Library/UefiDpLib/UefiDpLib.inf !endif #$(INCLUDE_DP) -!ifdef $(INCLUDE_TFTP_COMMAND) - NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf -!endif #$(INCLUDE_TFTP_COMMAND) gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 } +!ifdef $(INCLUDE_TFTP_COMMAND) + ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf +!endif #$(INCLUDE_TFTP_COMMAND) diff --git a/Platform/Hisilicon/D05/D05.fdf b/Platform/Hisilicon/D05/D05.fdf index a5e6546748..78ab0c89e6 100644 --- a/Platform/Hisilicon/D05/D05.fdf +++ b/Platform/Hisilicon/D05/D05.fdf @@ -300,6 +300,9 @@ [FV.FvMain] # Build Shell from latest source code instead of prebuilt binary # INF ShellPkg/Application/Shell/Shell.inf +!ifdef $(INCLUDE_TFTP_COMMAND) + INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf +!endif #$(INCLUDE_TFTP_COMMAND) # # Bds diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/HiKey.dsc index 957e4d4a9e..0c8ef813ee 100644 --- a/Platform/Hisilicon/HiKey/HiKey.dsc +++ b/Platform/Hisilicon/HiKey/HiKey.dsc @@ -464,7 +464,6 @@ [Components.common] NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf - NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf @@ -473,3 +472,6 @@ [Components.common] gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 } +!ifdef $(INCLUDE_TFTP_COMMAND) + ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf +!endif #$(INCLUDE_TFTP_COMMAND) diff --git a/Platform/Hisilicon/HiKey/HiKey.fdf b/Platform/Hisilicon/HiKey/HiKey.fdf index d277bd6ce3..f74d868307 100644 --- a/Platform/Hisilicon/HiKey/HiKey.fdf +++ b/Platform/Hisilicon/HiKey/HiKey.fdf @@ -180,6 +180,9 @@ [FV.FvMain] # UEFI applications # INF ShellPkg/Application/Shell/Shell.inf +!ifdef $(INCLUDE_TFTP_COMMAND) + INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf +!endif #$(INCLUDE_TFTP_COMMAND) # # Bds diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisilicon.dsc.inc index 761df16f4e..8bcb29a313 100644 --- a/Silicon/Hisilicon/Hisilicon.dsc.inc +++ b/Silicon/Hisilicon/Hisilicon.dsc.inc @@ -100,6 +100,10 @@ [LibraryClasses.common] NonDiscoverableDeviceRegistrationLib|MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf + FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf + ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf + SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf + # # It is not possible to prevent the ARM compiler for generic intrinsic functions. # This library provides the instrinsic functions generate by a given compiler. @@ -176,13 +180,10 @@ [LibraryClasses.common.UEFI_APPLICATION] PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf - ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf - FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf [LibraryClasses.common.UEFI_DRIVER,LibraryClasses.common.UEFI_APPLICATION] DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf - SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf [LibraryClasses.common.UEFI_DRIVER]