Ard, PcdShellLibAutoInitialize is specially set to FALSE in old code for Shell.efi build. But in old code line 507, it is set FALSE for Shell.efi build. So the global setting of this PCD can be removed.
Thanks/Ray > -----Original Message----- > From: Ard Biesheuvel [mailto:ard.biesheu...@linaro.org] > Sent: Wednesday, November 29, 2017 3:57 PM > To: Ni, Ruiyu <ruiyu...@intel.com> > Cc: edk2-devel@lists.01.org; Leif Lindholm <leif.lindh...@linaro.org> > Subject: Re: [PATCH v3 4/6] BeagleBoardPkg: Fix build failure due to Tftp > library removal > > On 29 November 2017 at 00:59, Ruiyu Ni <ruiyu...@intel.com> wrote: > > Contributed-under: TianoCore Contribution Agreement 1.1 > > Signed-off-by: Ruiyu Ni <ruiyu...@intel.com> > > Cc: Leif Lindholm <leif.lindh...@linaro.org> > > Cc: Ard Biesheuvel <ard.biesheu...@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 > > - > > Why are you moving this? The TFTP shell library is not the only user > of this PCD. > > > gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10 > > > > # GUID of the UEFI Shell > > @@ -487,6 +482,14 @@ [Components.common] > > > NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf > > > NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMainte > nanceManagerUiLib.inf > > } > > + > > + # > > + # Shell > > + # > > + > ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand. > inf { > > + <PcdsFixedAtBuild> > > + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > > + } > > ShellPkg/Application/Shell/Shell.inf { > > <LibraryClasses> > > > ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellComma > ndLib.inf > > @@ -497,7 +500,6 @@ [Components.common] > > > NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Com > mandsLib.inf > > > NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1Com > mandsLib.inf > > > NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1 > CommandsLib.inf > > - > NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib > .inf > > > HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingL > ib.inf > > PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf > > > BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfg > CommandLib.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 > > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
