On 02/25/20 10:39, 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> > --- > ArmVirtPkg/ArmVirt.dsc.inc | 4 ++++ > ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 1 + > ArmVirtPkg/ArmVirtXen.fdf | 1 + > 3 files changed, 6 insertions(+) > > diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc > index 10037c938eb8..608dfe1aa03d 100644 > --- a/ArmVirtPkg/ArmVirt.dsc.inc > +++ b/ArmVirtPkg/ArmVirt.dsc.inc > @@ -401,6 +401,10 @@ [Components.common] > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 > } > + OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf { > + <PcdsFixedAtBuild> > + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > + }
Please move this higher up, near TftpDynamicCommand. (Otherwise, Shell.inf gets embedded between TftpDynamicCommand and LinuxInitrdDynamicShellCommand, which looks strange.) With that: Reviewed-by: Laszlo Ersek <ler...@redhat.com> Thanks Laszlo > > [Components.AARCH64] > # > diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc > b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc > index 31f615a9d0f9..bfa380815f1a 100644 > --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc > +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc > @@ -103,6 +103,7 @@ [FV.FvMain] > # > INF ShellPkg/Application/Shell/Shell.inf > INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf > + INF > OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf > > # > # Bds > diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf > index 38d4cc163524..6a97bceeacbc 100644 > --- a/ArmVirtPkg/ArmVirtXen.fdf > +++ b/ArmVirtPkg/ArmVirtXen.fdf > @@ -182,6 +182,7 @@ [FV.FvMain] > # > INF ShellPkg/Application/Shell/Shell.inf > INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf > + INF > OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf > > # > # Bds > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#54807): https://edk2.groups.io/g/devel/message/54807 Mute This Topic: https://groups.io/mt/71530297/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-