From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mta-01.yadro.com (mta-01.yadro.com [89.207.88.252]) by mx.groups.io with SMTP id smtpd.web12.1148.1589317340786740853 for ; Tue, 12 May 2020 14:02:21 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@yadro.com header.s=mta-01 header.b=C3br7K1K; spf=pass (domain: yadro.com, ip: 89.207.88.252, mailfrom: r.bolshakov@yadro.com) Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id BF13041287; Tue, 12 May 2020 21:02:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yadro.com; h= content-type:content-type:content-transfer-encoding:mime-version :x-mailer:message-id:date:date:subject:subject:from:from :received:received:received; s=mta-01; t=1589317334; x= 1591131735; bh=C2cTAISaie3j0DxdknOAYIitrk6s+fCGAcPiLIvMT2c=; b=C 3br7K1KqNLDUH6WYqfqtjvy+At/lL5a4SUCgx2Ut2mxEdhGRZ55z8p0u7KFpsO9i XfW5eRXwJv1PhBNKgZaIn03zArqa0RmBCP3WncNqDXHpx4gchcX9r9KkO6GWirSv vwMoGBZ+2mXCH8vC8ZHPhdJ2lbgVJ/DLxRNfQKhV7U= X-Virus-Scanned: amavisd-new at yadro.com Received: from mta-01.yadro.com ([127.0.0.1]) by localhost (mta-01.yadro.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id thhthn4F6l5f; Wed, 13 May 2020 00:02:14 +0300 (MSK) Received: from T-EXCH-02.corp.yadro.com (t-exch-02.corp.yadro.com [172.17.10.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mta-01.yadro.com (Postfix) with ESMTPS id 59A9741286; Wed, 13 May 2020 00:02:14 +0300 (MSK) Received: from localhost (172.17.204.212) by T-EXCH-02.corp.yadro.com (172.17.10.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.32; Wed, 13 May 2020 00:02:15 +0300 From: Roman Bolshakov To: CC: Cameron Esfahani , LAHAYE Olivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Roman Bolshakov , Ard Biesheuvel , Liming Gao , Andrew Fish , Laszlo Ersek Subject: [PATCH] OvmfPkg: Skip initrd command on Xcode toolchain Date: Tue, 12 May 2020 23:58:34 +0300 Message-ID: <20200512205832.17032-1-r.bolshakov@yadro.com> X-Mailer: git-send-email 2.26.1 MIME-Version: 1.0 X-Originating-IP: [172.17.204.212] X-ClientProxiedBy: T-EXCH-01.corp.yadro.com (172.17.10.101) To T-EXCH-02.corp.yadro.com (172.17.10.102) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain OVMF booting stops with the assert if built with Xcode on macOS: Loading driver at 0x0001FAB8000 EntryPoint=3D0x0001FABF249 LinuxInitrdDyn= amicShellCommand.efi InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 1F218398 ProtectUefiImageCommon - 0x1F218140 - 0x000000001FAB8000 - 0x0000000000008A60 ASSERT_EFI_ERROR (Status =3D Unsupported) ASSERT LinuxInitrdDynamicShellCommand.c(378): !EFI_ERROR (Status) The assert comes from InitializeHiiPackage() after an attempt to retrieve HII package list from ImageHandle. Xcode still doesn't support HII resource section and LinuxInitrdDynamicShellCommand depends on it. Likewise 277a3958d93a ("OvmfPkg: Don't include TftpDynamicCommand in XCODE5 tool chain"), disable initrd command if built with Xcode toolchain Fixes: 2632178bc683 ("OvmfPkg: add 'initrd' shell command to expose Linux i= nitrd via device path") Cc: Ard Biesheuvel Cc: Liming Gao Cc: Andrew Fish Cc: Laszlo Ersek Signed-off-by: Roman Bolshakov --- OvmfPkg/OvmfPkgIa32.fdf | 2 +- OvmfPkg/OvmfPkgX64.fdf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index fd81b6fa8b..e2b759aa8d 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -290,8 +290,8 @@ INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf =0D !if $(TOOL_CHAIN_TAG) !=3D "XCODE5"=0D INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf=0D -!endif=0D INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand= .inf=0D +!endif=0D INF ShellPkg/Application/Shell/Shell.inf=0D =0D INF MdeModulePkg/Logo/LogoDxe.inf=0D diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index f71134a659..bfca1eff9e 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -291,8 +291,8 @@ INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf =0D !if $(TOOL_CHAIN_TAG) !=3D "XCODE5"=0D INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf=0D -!endif=0D INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand= .inf=0D +!endif=0D INF ShellPkg/Application/Shell/Shell.inf=0D =0D INF MdeModulePkg/Logo/LogoDxe.inf=0D --=20 2.26.1