Platform,Silicon: Update Hisilicon Shell tftp command config

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 <leif.lindholm@linaro.org>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

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 @@
 !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)

 

     <PcdsFixedAtBuild>

       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 @@ READ_LOCK_STATUS   = TRUE
   # 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 @@
 !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)

 

     <PcdsFixedAtBuild>

       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 @@ READ_LOCK_STATUS   = TRUE
   # 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 @@
 !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)

 

     <PcdsFixedAtBuild>

       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 @@ READ_LOCK_STATUS   = TRUE
   # 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 @@
       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 @@
       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 @@ READ_LOCK_STATUS   = TRUE
   # 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 @@
 

   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 @@
   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]