From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mx.groups.io with SMTP id smtpd.web12.2333.1582801678417136222 for ; Thu, 27 Feb 2020 03:07:58 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=XXg1k6y0; spf=pass (domain: linaro.org, ip: 209.85.221.66, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wr1-f66.google.com with SMTP id v4so2765165wrs.8 for ; Thu, 27 Feb 2020 03:07:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=L6Yh4z/v+PytoiZhmQ0AleG9ImgzJJgRc9N8q953M7Y=; b=XXg1k6y01QNHnvcs2vdm+Uu+e7zALWgadX9KwFpyjlk7EQQwDaoX98K3fMeBU6BDal MAfusw0nkaqUPACnRmqpDCwphGEt4KGD1m5MAdRwRSWO4rcDohaX6LccITJYwY+0Y5c4 cfsTi6W2es40dPf3ENE6KupNgnuj9gmfYtAJxJ9C/g5AjMpxmHOdzg4tSyKCwRrYbRtP G6O8pcljnQSuu0jhhxVJyubSXE+kiqF+CGEhnDBl4NfSu8k7r0ugPaz8pRzvhkPM4M6c tMHE5j5WuCVkcqhxcYa/t0IwPQFe/RoeqHdWRm5XnpffRHFSoAsFK5IUSvINHT5P+/4O K9Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=L6Yh4z/v+PytoiZhmQ0AleG9ImgzJJgRc9N8q953M7Y=; b=R2RhD5SxintY4I3aLc+/rlnk0swtY71tewhuIdS6laSSD0Hw/ghMRAexbfbOu03euo 2dhsGgNyJy5kZ26j0UMgW5NqkgOJWwSzcMPIsIWs+4TrLrIRuduPfCk0TMK5Do0/BzPa BDMDD9BeDjCCJ5vZ6vzHwc5F+I6XHQAkQEZlcVqX+YRUm6MtpgIorJGMEl6D3L555rEV kcDPmhruoq71H+ejuRgqyNnDfVgtO27n9SNlCEFWp0AfK/agV9uJJqNtdbnIok3KfZgt Ph8VuRNirllfrWGTgBrg3wO859wQdnRhT1f6TPN2FEHwCXtlViFuFN8AZw8a9LsEudKR mOoQ== X-Gm-Message-State: APjAAAVK0EM2FCcAPrD1Plx6G1e7pnekhjmCN2rIl8z2V+2cgxKHWjBY DhXRJmxP25DUo+lQuXCkfe/inJT8LQjW+ZocR10BVQ== X-Google-Smtp-Source: APXvYqzANWlstib/kuLJFRRhIzmykFQbwwLUViMEroA5iuw+tbU/zJc0dkHdN5zrhmKkk+z26b1GqmVyTgSDc4/cVoo= X-Received: by 2002:adf:f84a:: with SMTP id d10mr4358850wrq.208.1582801676824; Thu, 27 Feb 2020 03:07:56 -0800 (PST) MIME-Version: 1.0 References: <20200226194343.2985-1-ard.biesheuvel@linaro.org> <20200226194343.2985-5-ard.biesheuvel@linaro.org> <6f2c100c-6e91-5f7d-f4a9-89968f375299@redhat.com> In-Reply-To: <6f2c100c-6e91-5f7d-f4a9-89968f375299@redhat.com> From: "Ard Biesheuvel" Date: Thu, 27 Feb 2020 12:07:45 +0100 Message-ID: Subject: Re: [edk2-devel] [PATCH v3 4/6] OvmfPkg: add the 'initrd' dynamic shell command To: Laszlo Ersek Cc: edk2-devel-groups-io , Leif Lindholm , "Kinney, Michael D" , Jian J Wang , "Wu, Hao A" , "Ni, Ray" , Zhichao Gao Content-Type: text/plain; charset="UTF-8" On Thu, 27 Feb 2020 at 12:07, Laszlo Ersek 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 > > Reviewed-by: Laszlo Ersek > > --- > > 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 { > > + > > + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > > + } > > ShellPkg/Application/Shell/Shell.inf { > > > > 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 { > > + > > + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > > + } > > ShellPkg/Application/Shell/Shell.inf { > > > > 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 { > > + > > + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > > + } > > ShellPkg/Application/Shell/Shell.inf { > > > > 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 { > > + > > + 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 > > >