| Message ID | 1520391833-9344-1-git-send-email-heyi.guo@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | [edk2,1/2] Hisilicon/D0x: fix tftp command init failure | expand |
On Wed, Mar 07, 2018 at 11:03:52AM +0800, Heyi Guo wrote: > We need to set PcdShellLibAutoInitialize to FALSE for > TftpDynamicCommand, or else we will get initialization failure when > loading TftpDynamicCommand module, for EFI Shell has not been started > at this moment. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Heyi Guo <heyi.guo@linaro.org> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> > Cc: Leif Lindholm <leif.lindholm@linaro.org> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org> As requested on other thread, pushed separately as 06866930dc. > --- > Platform/Hisilicon/D03/D03.dsc | 5 ++++- > Platform/Hisilicon/D05/D05.dsc | 5 ++++- > 2 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc > index c4963063794b..cb0669d639d1 100644 > --- a/Platform/Hisilicon/D03/D03.dsc > +++ b/Platform/Hisilicon/D03/D03.dsc > @@ -517,5 +517,8 @@ [Components.common] > gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 > } > !ifdef $(INCLUDE_TFTP_COMMAND) > - ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf > + ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { > + <PcdsFixedAtBuild> > + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > + } > !endif #$(INCLUDE_TFTP_COMMAND) > diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc > index 0792b0814ea1..8373a821a496 100644 > --- a/Platform/Hisilicon/D05/D05.dsc > +++ b/Platform/Hisilicon/D05/D05.dsc > @@ -675,5 +675,8 @@ [Components.common] > gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 > } > !ifdef $(INCLUDE_TFTP_COMMAND) > - ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf > + ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { > + <PcdsFixedAtBuild> > + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > + } > !endif #$(INCLUDE_TFTP_COMMAND) > -- > 2.7.4 > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc index c4963063794b..cb0669d639d1 100644 --- a/Platform/Hisilicon/D03/D03.dsc +++ b/Platform/Hisilicon/D03/D03.dsc @@ -517,5 +517,8 @@ [Components.common] gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 } !ifdef $(INCLUDE_TFTP_COMMAND) - ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf + ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { + <PcdsFixedAtBuild> + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE + } !endif #$(INCLUDE_TFTP_COMMAND) diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc index 0792b0814ea1..8373a821a496 100644 --- a/Platform/Hisilicon/D05/D05.dsc +++ b/Platform/Hisilicon/D05/D05.dsc @@ -675,5 +675,8 @@ [Components.common] gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 } !ifdef $(INCLUDE_TFTP_COMMAND) - ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf + ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { + <PcdsFixedAtBuild> + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE + } !endif #$(INCLUDE_TFTP_COMMAND)
We need to set PcdShellLibAutoInitialize to FALSE for TftpDynamicCommand, or else we will get initialization failure when loading TftpDynamicCommand module, for EFI Shell has not been started at this moment. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Heyi Guo <heyi.guo@linaro.org> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: Leif Lindholm <leif.lindholm@linaro.org> --- Platform/Hisilicon/D03/D03.dsc | 5 ++++- Platform/Hisilicon/D05/D05.dsc | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel