On Thu, 27 Feb 2020 at 12:07, Laszlo Ersek <ler...@redhat.com> wrote:
>
> On 02/26/20 20:43, Ard Biesheuvel wrote:
> > Add the 'initrd' dynamic shell command to the build so we can load
> > Linux initrds straight from the shell using the new generic protocol,
> > which does not rely on initrd= being passed on the command line.
> >
> > Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
> > Reviewed-by: Laszlo Ersek <ler...@redhat.com>
> > ---
> > OvmfPkg/OvmfPkgIa32.dsc | 4 ++++
> > OvmfPkg/OvmfPkgIa32.fdf | 1 +
> > OvmfPkg/OvmfPkgIa32X64.dsc | 4 ++++
> > OvmfPkg/OvmfPkgIa32X64.fdf | 1 +
> > OvmfPkg/OvmfPkgX64.dsc | 4 ++++
> > OvmfPkg/OvmfPkgX64.fdf | 1 +
> > OvmfPkg/OvmfXen.dsc | 4 ++++
> > OvmfPkg/OvmfXen.fdf | 1 +
> > 8 files changed, 20 insertions(+)
>
> The updates are not complete on this patch.
>
> The order should be "tftp, initrd, shell" everywhere.
>
> Therefore please fix the following two remaining warts (no need to repost).
>
> (1) The order in "OvmfPkg/OvmfPkgIa32.fdf" is still wrong. (It is
> currently "tftp, shell, initrd".)
>
> (2) The order in "OvmfPkg/OvmfXen.dsc" remains wrong ("tftp, shell,
> initrd").
>
> No need to repost; with (1) and (2) fixed, you can keep the R-b.
>
Oops. Apologies for missing that.
> >
> > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
> > index 19728f20b34e..76e52a3de120 100644
> > --- a/OvmfPkg/OvmfPkgIa32.dsc
> > +++ b/OvmfPkg/OvmfPkgIa32.dsc
> > @@ -821,6 +821,10 @@ [Components]
> > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> > }
> > !endif
> > +
> > OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {
> > + <PcdsFixedAtBuild>
> > + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> > + }
> > ShellPkg/Application/Shell/Shell.inf {
> > <LibraryClasses>
> >
> > ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
> > diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
> > index 63607551ed75..b6cd5da4f2b3 100644
> > --- a/OvmfPkg/OvmfPkgIa32.fdf
> > +++ b/OvmfPkg/OvmfPkgIa32.fdf
> > @@ -282,6 +282,7 @@ [FV.DXEFV]
> > INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
> > !endif
> > INF ShellPkg/Application/Shell/Shell.inf
> > +INF
> > OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
> >
> > INF MdeModulePkg/Logo/LogoDxe.inf
> >
> > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
> > index 3c0c229e3a72..842b4a028913 100644
> > --- a/OvmfPkg/OvmfPkgIa32X64.dsc
> > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
> > @@ -834,6 +834,10 @@ [Components.X64]
> > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> > }
> > !endif
> > +
> > OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {
> > + <PcdsFixedAtBuild>
> > + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> > + }
> > ShellPkg/Application/Shell/Shell.inf {
> > <LibraryClasses>
> >
> > ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
> > diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
> > index 0488e5d95ffe..69c133ec08d5 100644
> > --- a/OvmfPkg/OvmfPkgIa32X64.fdf
> > +++ b/OvmfPkg/OvmfPkgIa32X64.fdf
> > @@ -282,6 +282,7 @@ [FV.DXEFV]
> > !if $(TOOL_CHAIN_TAG) != "XCODE5"
> > INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
> > !endif
> > +INF
> > OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
> > INF ShellPkg/Application/Shell/Shell.inf
> >
> > INF MdeModulePkg/Logo/LogoDxe.inf
> > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
> > index f6c1d8d228c6..0b1e45d1f15a 100644
> > --- a/OvmfPkg/OvmfPkgX64.dsc
> > +++ b/OvmfPkg/OvmfPkgX64.dsc
> > @@ -832,6 +832,10 @@ [Components]
> > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> > }
> > !endif
> > +
> > OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {
> > + <PcdsFixedAtBuild>
> > + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> > + }
> > ShellPkg/Application/Shell/Shell.inf {
> > <LibraryClasses>
> >
> > ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
> > diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
> > index 0488e5d95ffe..69c133ec08d5 100644
> > --- a/OvmfPkg/OvmfPkgX64.fdf
> > +++ b/OvmfPkg/OvmfPkgX64.fdf
> > @@ -282,6 +282,7 @@ [FV.DXEFV]
> > !if $(TOOL_CHAIN_TAG) != "XCODE5"
> > INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
> > !endif
> > +INF
> > OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
> > INF ShellPkg/Application/Shell/Shell.inf
> >
> > INF MdeModulePkg/Logo/LogoDxe.inf
> > diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc
> > index 5751ff1f0352..6612018ad6a8 100644
> > --- a/OvmfPkg/OvmfXen.dsc
> > +++ b/OvmfPkg/OvmfXen.dsc
> > @@ -714,6 +714,10 @@ [Components]
> > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> > gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000
> > }
> > +
> > OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {
> > + <PcdsFixedAtBuild>
> > + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> > + }
> >
> > OvmfPkg/PlatformDxe/Platform.inf
> > OvmfPkg/AmdSevDxe/AmdSevDxe.inf
> > diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/OvmfXen.fdf
> > index 05138ffc5b4f..5ca8081c0265 100644
> > --- a/OvmfPkg/OvmfXen.fdf
> > +++ b/OvmfPkg/OvmfXen.fdf
> > @@ -364,6 +364,7 @@ [FV.DXEFV]
> > !if $(TOOL_CHAIN_TAG) != "XCODE5"
> > INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
> > !endif
> > +INF
> > OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
> > INF ShellPkg/Application/Shell/Shell.inf
> >
> > INF MdeModulePkg/Logo/LogoDxe.inf
> >
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#54997): https://edk2.groups.io/g/devel/message/54997
Mute This Topic: https://groups.io/mt/71572295/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
