From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4001:c0b::244; helo=mail-it0-x244.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-it0-x244.google.com (mail-it0-x244.google.com [IPv6:2607:f8b0:4001:c0b::244]) (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 747E921A1099A for ; Thu, 30 Nov 2017 05:26:21 -0800 (PST) Received: by mail-it0-x244.google.com with SMTP id r6so8414387itr.3 for ; Thu, 30 Nov 2017 05:30:46 -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=vjOwfw5jfMAX8sh3ZrHiXyV63Wa3wxzPhh0Ja3Bb0Oo=; b=EhYa2V6EcMQRfEgkx1/XNqBuC/SMEn3tcjh6184CPnbZeSFV4oURkvpkDfMcrwJAfd AT/lq3jcZPvb7Geq5FJGDc72dqPNcz4Qs/SEEuGLNh1YsShadqcdYv8Zg7xYFkTbfItA iu6kS768s9if44TPsY9bBNHkO4yHKQk2b4Rzw= 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=vjOwfw5jfMAX8sh3ZrHiXyV63Wa3wxzPhh0Ja3Bb0Oo=; b=AjZc+PFIKLdEiwFgIFs6auRwZ3T7q6OczD7LuNbTd3z5lFjw+boW6cj7FU/BhSo6XO vd4LvtEjNPlh9GHlxncnEOE0Vep7DtACVw+C7jmXz8YpOwe/O7qUyBhmB4Mam5Uuqcqr 8ev/TmXfBlY97kOEflBMwPtc3F/Z8sv+guePB7ObRu5n4iNvBrnJRpSVtVK+Si31pS3Z Eus3XSuXjM6MQoauM3vID326QPIITp9C2zhQVA6EzzjXmgdD/9+QtHZrzvinokwpMqhf k9bExveKMhwCWs+FSOObLcF+IDj7LlzrEXvlU7GRzrbKez9ZYCGvnWURogztwgQ23D3C v+/w== X-Gm-Message-State: AJaThX4++n5gwRDHXBAATOeXhulDBQLF7OpLRWpfe4RXFyd0dlnWGflE /N2YsTLYytavbhbgxWR/fF5mo2e1f4h9SDx+IHrjNiRS X-Google-Smtp-Source: AGs4zMbvEzya6pdQxjIgsVfvDDSE/SeGnSUw99YPQiTqUbbR47CE1b8M4RKdBwlDQUdLXLGcrhHSswRPcs4l8bPb/cc= X-Received: by 10.36.55.138 with SMTP id r132mr3091025itr.34.1512048645897; Thu, 30 Nov 2017 05:30:45 -0800 (PST) MIME-Version: 1.0 Received: by 10.107.104.16 with HTTP; Thu, 30 Nov 2017 05:30:45 -0800 (PST) In-Reply-To: <20171130120052.1224-1-leif.lindholm@linaro.org> References: <20171130120052.1224-1-leif.lindholm@linaro.org> From: Ard Biesheuvel Date: Thu, 30 Nov 2017 13:30:45 +0000 Message-ID: To: Leif Lindholm Cc: "edk2-devel@lists.01.org" Subject: Re: [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: , X-List-Received-Date: Thu, 30 Nov 2017 13:26:21 -0000 Content-Type: text/plain; charset="UTF-8" On 30 November 2017 at 12:00, Leif Lindholm wrote: > 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 Reviewed-by: Ard Biesheuvel > --- > 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(-) > > 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] > -- > 2.11.0 >