From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.120]) by mx.groups.io with SMTP id smtpd.web12.393.1582674395926818421 for ; Tue, 25 Feb 2020 15:46:36 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=BH3CsFQz; spf=pass (domain: redhat.com, ip: 207.211.31.120, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582674395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WqunIn0QnFegDNmFmToBP4157hsOHcp1Su/c3HJAe6M=; b=BH3CsFQzp+Uj5YXdvFRyUddWzjZ7VbnDG9NccYBasIgZ9pWpa7QjEbHCjwn8ySn2NFAyWV mLK6tjdxnIDAJ3yyd93xFGqRXjJ3WtT5EmLGzMiEBVsWdQyNc1QeF0N8FGeZkfL2tPlLfU bmxw5Ms9Ufrhjlnxgw1fh9FmWTsnJgY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-157--Q58_RZ2PYO_wmODjdBoeQ-1; Tue, 25 Feb 2020 18:46:33 -0500 X-MC-Unique: -Q58_RZ2PYO_wmODjdBoeQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A83DA1083E82; Tue, 25 Feb 2020 23:46:31 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-117-104.ams2.redhat.com [10.36.117.104]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2E7571CB; Tue, 25 Feb 2020 23:46:29 +0000 (UTC) Subject: Re: [edk2-devel] [PATCH v2 3/6] ArmVirtPkg: add the 'initrd' dynamic shell command To: devel@edk2.groups.io, ard.biesheuvel@linaro.org Cc: leif@nuviainc.com, pjones@redhat.com, mjg59@google.com, agraf@csgraf.de, daniel.kiper@oracle.com, michael.d.kinney@intel.com, jian.j.wang@intel.com, hao.a.wu@intel.com, ray.ni@intel.com, zhichao.gao@intel.com References: <20200225093908.6707-1-ard.biesheuvel@linaro.org> <20200225093908.6707-4-ard.biesheuvel@linaro.org> From: "Laszlo Ersek" Message-ID: <0861de2b-e19a-76b4-ca9b-139080ba7cbd@redhat.com> Date: Wed, 26 Feb 2020 00:46:28 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200225093908.6707-4-ard.biesheuvel@linaro.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit 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 > --- > 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 { > + > + 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 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 >