From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: "edk2-devel@lists.01.org" <edk2-devel@lists.01.org>,
Leif Lindholm <leif.lindholm@linaro.org>
Subject: Re: [PATCH v2 4/6] BeagleBoardPkg: Fix build failure due to Tftp library removal
Date: Tue, 28 Nov 2017 15:53:43 +0000 [thread overview]
Message-ID: <CAKv+Gu-kB2WtWjdWnDib991DBwqx2HTMjwR-NO_dW+z4YxdS2A@mail.gmail.com> (raw)
In-Reply-To: <20171128120009.176316-5-ruiyu.ni@intel.com>
On 28 November 2017 at 12:00, Ruiyu Ni <ruiyu.ni@intel.com> wrote:
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
> BeagleBoardPkg/BeagleBoardPkg.dsc | 17 +++++++++--------
> BeagleBoardPkg/BeagleBoardPkg.fdf | 3 ++-
> 2 files changed, 11 insertions(+), 9 deletions(-)
>
> diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc
> index 4f7c0bd645..b6fdb90035 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
> @@ -496,8 +499,6 @@ [Components.common]
> NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
> NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
> NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
> - NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
Why is this line ^^^ being removed as well?
> - 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
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
next prev parent reply other threads:[~2017-11-28 15:49 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-28 12:00 [PATCH v2 0/6] Fix build failure due to tftp/dp library removal Ruiyu Ni
2017-11-28 12:00 ` [PATCH v2 1/6] ShellPkg/tftp: Correct file comments header of Tftp.uni Ruiyu Ni
2017-11-28 12:00 ` [PATCH v2 2/6] EmulatorPkg: Fix build failure due to Tftp library removal Ruiyu Ni
2017-11-28 12:00 ` [PATCH v2 3/6] ArmVirtPkg: " Ruiyu Ni
2017-11-28 12:00 ` [PATCH v2 4/6] BeagleBoardPkg: " Ruiyu Ni
2017-11-28 15:53 ` Ard Biesheuvel [this message]
2017-11-28 12:00 ` [PATCH v2 5/6] CorebootPayloadPkg: Fix build failure due to Tftp/Dp " Ruiyu Ni
2017-11-28 12:00 ` [PATCH v2 6/6] OvmfPkg: Add tftp dynamic command Ruiyu Ni
2017-11-28 12:07 ` [PATCH v2 0/6] Fix build failure due to tftp/dp library removal Leif Lindholm
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAKv+Gu-kB2WtWjdWnDib991DBwqx2HTMjwR-NO_dW+z4YxdS2A@mail.gmail.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox