[PATCH v4 0/3] Fix build failure due to tftp/dp library removal

[PATCH v4 0/3] Fix build failure due to tftp/dp library removal

[Ruiyu Ni]

commit 0961002 and 92034c4 converted the tftp and dp from
NULL class library to dynamic command drivers.
Some platforms referencing the original tftp/dp NULL class
libraries need the platform DSC/FDF change to reference to the
new dynamic command drivers.

v4: Revise the commit message to mention the commit number which breaks
    the build.

v3: Fix the patch issue in BeagleBordPkg change, which wrongly removed
    UefiShellNetwork1CommandsLib.
    Update OvmfPkg change to correct the copyright year and add more
    commit message.

v2: v1 still causes build failures. I tried best to verify the build.
    OVMF boot is also tried.

Ruiyu Ni (3):
  EmulatorPkg: Fix build failure due to Tftp library removal
  ArmVirtPkg: Fix build failure due to Tftp library removal
  BeagleBoardPkg: Fix build failure due to Tftp library removal

 ArmVirtPkg/ArmVirt.dsc.inc           | 11 +++++++----
 ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc |  3 ++-
 ArmVirtPkg/ArmVirtXen.fdf            |  3 ++-
 BeagleBoardPkg/BeagleBoardPkg.dsc    | 16 +++++++++-------
 BeagleBoardPkg/BeagleBoardPkg.fdf    |  3 ++-
 EmulatorPkg/EmulatorPkg.dsc          | 10 ++++++----
 EmulatorPkg/EmulatorPkg.fdf          |  3 ++-
 7 files changed, 30 insertions(+), 19 deletions(-)

-- 
2.15.0.gvfs.1.preview.4

[PATCH v4 1/3] EmulatorPkg: Fix build failure due to Tftp library removal

[Ruiyu Ni]

The TFTP command was converted from a NULL class library
instance to a dynamic shell command in commit 0961002352e9.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Andrew Fish <afish@apple.com>
---
 EmulatorPkg/EmulatorPkg.dsc | 10 ++++++----
 EmulatorPkg/EmulatorPkg.fdf |  3 ++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc
index ce0ae64dba..818691ce3a 100644
--- a/EmulatorPkg/EmulatorPkg.dsc
+++ b/EmulatorPkg/EmulatorPkg.dsc
@@ -109,6 +109,8 @@ [LibraryClasses]
   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
   SortLib|MdeModulePkg/Library/BaseSortLib/BaseSortLib.inf
   UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
+  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
+  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
 
 [LibraryClasses.common.SEC]
   PeiServicesLib|EmulatorPkg/Library/SecPeiServicesLib/SecPeiServicesLib.inf
@@ -378,6 +380,10 @@ [Components]
   FatPkg/EnhancedFatDxe/Fat.inf
 
 !ifndef $(USE_OLD_SHELL)
+  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
+    <PcdsFixedAtBuild>
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
+  }
   ShellPkg/Application/Shell/Shell.inf {
     <LibraryClasses>
       ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
@@ -388,12 +394,8 @@ [Components]
       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
-      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
-      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
       SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
-      UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
       PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
 #      SafeBlockIoLib|ShellPkg/Library/SafeBlockIoLib/SafeBlockIoLib.inf
 #      SafeOpenProtocolLib|ShellPkg/Library/SafeOpenProtocolLib/SafeOpenProtocolLib.inf
diff --git a/EmulatorPkg/EmulatorPkg.fdf b/EmulatorPkg/EmulatorPkg.fdf
index 377de59b5a..314eb7b895 100644
--- a/EmulatorPkg/EmulatorPkg.fdf
+++ b/EmulatorPkg/EmulatorPkg.fdf
@@ -1,7 +1,7 @@
 ## @file
 # This is Emulator FDF file with UEFI HII features enabled
 #
-# Copyright (c) 2008 - 2015, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved.<BR>
 # Portions copyright (c) 2009 - 2011, Apple Inc. All rights reserved.<BR>
 #
 # This program and the accompanying materials
@@ -206,6 +206,7 @@ [FV.FvRecovery]
 INF FatPkg/EnhancedFatDxe/Fat.inf
 
 !ifndef $(USE_OLD_SHELL)
+INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 INF  ShellPkg/Application/Shell/Shell.inf
 !else
 INF  RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
-- 
2.15.0.gvfs.1.preview.4

[PATCH v4 2/3] ArmVirtPkg: Fix build failure due to Tftp library removal

[Ruiyu Ni]

The TFTP command was converted from a NULL class library
instance to a dynamic shell command in commit 0961002352e9.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Julien Grall <julien.grall@linaro.org>
---
 ArmVirtPkg/ArmVirt.dsc.inc           | 11 +++++++----
 ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc |  3 ++-
 ArmVirtPkg/ArmVirtXen.fdf            |  3 ++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index 5d7edff104..9874637a3d 100644
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -1,7 +1,7 @@
 #
 #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
 #  Copyright (c) 2014, Linaro Limited. All rights reserved.
-#  Copyright (c) 2015, Intel Corporation. All rights reserved.
+#  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -55,6 +55,8 @@ [LibraryClasses.common]
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
   UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
+  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
+  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
 
   UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
   OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
@@ -217,8 +219,6 @@ [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]
   UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
@@ -383,6 +383,10 @@ [Components.common]
   #
   # UEFI application (Shell Embedded Boot Loader)
   #
+  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
+    <PcdsFixedAtBuild>
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
+  }
   ShellPkg/Application/Shell/Shell.inf {
     <LibraryClasses>
       ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
@@ -393,7 +397,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
diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
index 744006d13c..89f95b2d99 100644
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
@@ -1,7 +1,7 @@
 #
 #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
 #  Copyright (c) 2014-2016, Linaro Limited. All rights reserved.
-#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
+#  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -103,6 +103,7 @@ [FV.FvMain]
   # UEFI application (Shell Embedded Boot Loader)
   #
   INF ShellPkg/Application/Shell/Shell.inf
+  INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 
   #
   # Bds
diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf
index 70e76df228..6586ce6be5 100644
--- a/ArmVirtPkg/ArmVirtXen.fdf
+++ b/ArmVirtPkg/ArmVirtXen.fdf
@@ -1,7 +1,7 @@
 #
 #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
 #  Copyright (c) 2014, Linaro Limited. All rights reserved.
-#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -169,6 +169,7 @@ [FV.FvMain]
   # UEFI application (Shell Embedded Boot Loader)
   #
   INF ShellPkg/Application/Shell/Shell.inf
+  INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 
   #
   # Bds
-- 
2.15.0.gvfs.1.preview.4

Re: [PATCH v4 2/3] ArmVirtPkg: Fix build failure due to Tftp library removal

[Laszlo Ersek]

Ray,

On 11/29/17 11:14, Ruiyu Ni wrote:
> The TFTP command was converted from a NULL class library
> instance to a dynamic shell command in commit 0961002352e9.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Julien Grall <julien.grall@linaro.org>
> ---
>  ArmVirtPkg/ArmVirt.dsc.inc           | 11 +++++++----
>  ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc |  3 ++-
>  ArmVirtPkg/ArmVirtXen.fdf            |  3 ++-
>  3 files changed, 11 insertions(+), 6 deletions(-)

Can you please incorporate points (2) and (3) as well, from my v3 review?

  https://lists.01.org/pipermail/edk2-devel/2017-November/018191.html

(If you keep posting new versions faster than I can review them, it's
likely that I'll never catch up.)

Thanks,
Laszlo

Re: [PATCH v4 2/3] ArmVirtPkg: Fix build failure due to Tftp library removal

[Laszlo Ersek]

On 11/29/17 14:53, Laszlo Ersek wrote:
> Ray,
> 
> On 11/29/17 11:14, Ruiyu Ni wrote:
>> The TFTP command was converted from a NULL class library
>> instance to a dynamic shell command in commit 0961002352e9.
>>
>> Contributed-under: TianoCore Contribution Agreement 1.1
>> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
>> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> Cc: Julien Grall <julien.grall@linaro.org>
>> ---
>>  ArmVirtPkg/ArmVirt.dsc.inc           | 11 +++++++----
>>  ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc |  3 ++-
>>  ArmVirtPkg/ArmVirtXen.fdf            |  3 ++-
>>  3 files changed, 11 insertions(+), 6 deletions(-)
> 
> Can you please incorporate points (2) and (3) as well, from my v3 review?
> 
>   https://lists.01.org/pipermail/edk2-devel/2017-November/018191.html

I fixed up the commit message as described above.

I also test-built the ArmVirtQemu, ArmVirtQemuKernel and ArmVirtXen
platforms, with the patch applied, for ARM and AARCH64.

[lersek@redhat.com: extend commit message]
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Build-tested-by: Laszlo Ersek <lersek@redhat.com>

Commit 59fcf0706bf4.

Thanks
Laszlo

Re: [PATCH v4 2/3] ArmVirtPkg: Fix build failure due to Tftp library removal

[Ard Biesheuvel]

On 30 November 2017 at 12:22, Laszlo Ersek <lersek@redhat.com> wrote:
> On 11/29/17 14:53, Laszlo Ersek wrote:
>> Ray,
>>
>> On 11/29/17 11:14, Ruiyu Ni wrote:
>>> The TFTP command was converted from a NULL class library
>>> instance to a dynamic shell command in commit 0961002352e9.
>>>
>>> Contributed-under: TianoCore Contribution Agreement 1.1
>>> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
>>> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>>> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>>> Cc: Julien Grall <julien.grall@linaro.org>
>>> ---
>>>  ArmVirtPkg/ArmVirt.dsc.inc           | 11 +++++++----
>>>  ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc |  3 ++-
>>>  ArmVirtPkg/ArmVirtXen.fdf            |  3 ++-
>>>  3 files changed, 11 insertions(+), 6 deletions(-)
>>
>> Can you please incorporate points (2) and (3) as well, from my v3 review?
>>
>>   https://lists.01.org/pipermail/edk2-devel/2017-November/018191.html
>
> I fixed up the commit message as described above.
>
> I also test-built the ArmVirtQemu, ArmVirtQemuKernel and ArmVirtXen
> platforms, with the patch applied, for ARM and AARCH64.
>
> [lersek@redhat.com: extend commit message]
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> Build-tested-by: Laszlo Ersek <lersek@redhat.com>
>
> Commit 59fcf0706bf4.
>

Thanks for taking care of this. The build had been broken long enough

Re: [PATCH v4 2/3] ArmVirtPkg: Fix build failure due to Tftp library removal

[Ni, Ruiyu]

Laszlo,
Thank you very much for that! I will try to become a talkaholic
when writing commit messages next time.


> -----Original Message-----
> From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org]
> Sent: Thursday, November 30, 2017 9:16 PM
> To: Laszlo Ersek <lersek@redhat.com>
> Cc: Ni, Ruiyu <ruiyu.ni@intel.com>; edk2-devel@lists.01.org
> Subject: Re: [edk2] [PATCH v4 2/3] ArmVirtPkg: Fix build failure due to Tftp
> library removal
> 
> On 30 November 2017 at 12:22, Laszlo Ersek <lersek@redhat.com> wrote:
> > On 11/29/17 14:53, Laszlo Ersek wrote:
> >> Ray,
> >>
> >> On 11/29/17 11:14, Ruiyu Ni wrote:
> >>> The TFTP command was converted from a NULL class library instance to
> >>> a dynamic shell command in commit 0961002352e9.
> >>>
> >>> Contributed-under: TianoCore Contribution Agreement 1.1
> >>> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> >>> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> >>> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> >>> Cc: Julien Grall <julien.grall@linaro.org>
> >>> ---
> >>>  ArmVirtPkg/ArmVirt.dsc.inc           | 11 +++++++----
> >>>  ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc |  3 ++-
> >>>  ArmVirtPkg/ArmVirtXen.fdf            |  3 ++-
> >>>  3 files changed, 11 insertions(+), 6 deletions(-)
> >>
> >> Can you please incorporate points (2) and (3) as well, from my v3 review?
> >>
> >>   https://lists.01.org/pipermail/edk2-devel/2017-November/018191.html
> >
> > I fixed up the commit message as described above.
> >
> > I also test-built the ArmVirtQemu, ArmVirtQemuKernel and ArmVirtXen
> > platforms, with the patch applied, for ARM and AARCH64.
> >
> > [lersek@redhat.com: extend commit message]
> > Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> > Build-tested-by: Laszlo Ersek <lersek@redhat.com>
> >
> > Commit 59fcf0706bf4.
> >
> 
> Thanks for taking care of this. The build had been broken long enough

Re: [PATCH v4 2/3] ArmVirtPkg: Fix build failure due to Tftp library removal

[Laszlo Ersek]

On 12/01/17 02:48, Ni, Ruiyu wrote:
> Laszlo,
> Thank you very much for that! I will try to become a talkaholic
> when writing commit messages next time.

I feel a bit of sarcasm directed at me in "talkaholic" :) I do deserve
that classification, no questions asked :)

Thanks!
Laszlo

[PATCH v4 3/3] BeagleBoardPkg: Fix build failure due to Tftp library removal

[Ruiyu Ni]

The TFTP command was converted from a NULL class library
instance to a dynamic shell command in commit 0961002352e9.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 BeagleBoardPkg/BeagleBoardPkg.dsc | 16 +++++++++-------
 BeagleBoardPkg/BeagleBoardPkg.fdf |  3 ++-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc
index 4f7c0bd645..d67ccf377e 100644
--- a/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -2,7 +2,7 @@
 # Beagle board package.
 #
 # Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR>
-# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
 # Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
 #
 #    This program and the accompanying materials
@@ -355,11 +355,6 @@ [PcdsFixedAtBuild.common]
   # OMAP Interrupt Controller
   gEmbeddedTokenSpaceGuid.PcdInterruptBaseAddress|0x48200000
 
-  # We want to use the Shell Libraries but don't want it to initialise
-  # automatically. We initialise the libraries when the command is called by the
-  # Shell.
-  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
-
   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10
 
   # GUID of the UEFI Shell
@@ -487,6 +482,14 @@ [Components.common]
       NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf
       NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
   }
+
+  #
+  # Shell
+  #
+  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
+    <PcdsFixedAtBuild>
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
+  }
   ShellPkg/Application/Shell/Shell.inf {
     <LibraryClasses>
       ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
@@ -497,7 +500,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
diff --git a/BeagleBoardPkg/BeagleBoardPkg.fdf b/BeagleBoardPkg/BeagleBoardPkg.fdf
index c9c6afd714..71249c7eb3 100644
--- a/BeagleBoardPkg/BeagleBoardPkg.fdf
+++ b/BeagleBoardPkg/BeagleBoardPkg.fdf
@@ -1,7 +1,7 @@
 # FLASH layout file for Beagle board.
 #
 # Copyright (c) 2009, Apple Inc. All rights reserved.<BR>
-# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
 # Copyright (c) 2016, Linaro, Ltd. All rights reserved.<BR>
 #
 #    This program and the accompanying materials
@@ -178,6 +178,7 @@ [FV.FvMain]
   # UEFI application (Shell Embedded Boot Loader)
   #
   INF ShellPkg/Application/Shell/Shell.inf
+  INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 
   #
   # Bds
-- 
2.15.0.gvfs.1.preview.4

Re: [PATCH v4 3/3] BeagleBoardPkg: Fix build failure due to Tftp library removal

[Leif Lindholm]

On Wed, Nov 29, 2017 at 06:15:00PM +0800, Ruiyu Ni wrote:
> The TFTP command was converted from a NULL class library
> instance to a dynamic shell command in commit 0961002352e9.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

> ---
>  BeagleBoardPkg/BeagleBoardPkg.dsc | 16 +++++++++-------
>  BeagleBoardPkg/BeagleBoardPkg.fdf |  3 ++-
>  2 files changed, 11 insertions(+), 8 deletions(-)
> 
> diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc
> index 4f7c0bd645..d67ccf377e 100644
> --- a/BeagleBoardPkg/BeagleBoardPkg.dsc
> +++ b/BeagleBoardPkg/BeagleBoardPkg.dsc
> @@ -2,7 +2,7 @@
>  # Beagle board package.
>  #
>  # Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR>
> -# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
>  # Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
>  #
>  #    This program and the accompanying materials
> @@ -355,11 +355,6 @@ [PcdsFixedAtBuild.common]
>    # OMAP Interrupt Controller
>    gEmbeddedTokenSpaceGuid.PcdInterruptBaseAddress|0x48200000
>  
> -  # We want to use the Shell Libraries but don't want it to initialise
> -  # automatically. We initialise the libraries when the command is called by the
> -  # Shell.
> -  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> -
>    gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10
>  
>    # GUID of the UEFI Shell
> @@ -487,6 +482,14 @@ [Components.common]
>        NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf
>        NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
>    }
> +
> +  #
> +  # Shell
> +  #
> +  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
> +    <PcdsFixedAtBuild>
> +      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> +  }
>    ShellPkg/Application/Shell/Shell.inf {
>      <LibraryClasses>
>        ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
> @@ -497,7 +500,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
> diff --git a/BeagleBoardPkg/BeagleBoardPkg.fdf b/BeagleBoardPkg/BeagleBoardPkg.fdf
> index c9c6afd714..71249c7eb3 100644
> --- a/BeagleBoardPkg/BeagleBoardPkg.fdf
> +++ b/BeagleBoardPkg/BeagleBoardPkg.fdf
> @@ -1,7 +1,7 @@
>  # FLASH layout file for Beagle board.
>  #
>  # Copyright (c) 2009, Apple Inc. All rights reserved.<BR>
> -# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
>  # Copyright (c) 2016, Linaro, Ltd. All rights reserved.<BR>
>  #
>  #    This program and the accompanying materials
> @@ -178,6 +178,7 @@ [FV.FvMain]
>    # UEFI application (Shell Embedded Boot Loader)
>    #
>    INF ShellPkg/Application/Shell/Shell.inf
> +  INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
>  
>    #
>    # Bds
> -- 
> 2.15.0.gvfs.1.preview.4
> 

Re: [PATCH v4 3/3] BeagleBoardPkg: Fix build failure due to Tftp library removal

[Laszlo Ersek]

On 11/29/17 12:30, Leif Lindholm wrote:
> On Wed, Nov 29, 2017 at 06:15:00PM +0800, Ruiyu Ni wrote:
>> The TFTP command was converted from a NULL class library
>> instance to a dynamic shell command in commit 0961002352e9.
>>
>> Contributed-under: TianoCore Contribution Agreement 1.1
>> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
>> Cc: Leif Lindholm <leif.lindholm@linaro.org>
>> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> 
> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

Commit ef1b70ff08ed.

Thanks
Laszlo