From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=209.132.183.28; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 98C6A211944DE for ; Thu, 22 Nov 2018 07:19:30 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F1FE7CF37; Thu, 22 Nov 2018 15:19:29 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-200.rdu2.redhat.com [10.10.120.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id DB6A41001F54; Thu, 22 Nov 2018 15:19:28 +0000 (UTC) To: Liming Gao , edk2-devel@lists.01.org Cc: Jordan Justen References: <20181122134348.27056-1-liming.gao@intel.com> From: Laszlo Ersek Message-ID: <8a04e1d8-9f5b-f9bd-e37f-797dc2132279@redhat.com> Date: Thu, 22 Nov 2018 16:19:27 +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: <20181122134348.27056-1-liming.gao@intel.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 22 Nov 2018 15:19:30 +0000 (UTC) Subject: Re: [Patch] OvmfPkg: Don't include TftpDynamicCommand in XCODE5 tool chain X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Nov 2018 15:19:31 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Hi Liming, On 11/22/18 14:43, Liming Gao wrote: > https://bugzilla.tianocore.org/show_bug.cgi?id=1355 > XCODE doesn't support HII resource section. TftpDynamicCommand driver depends > on HII resource section. To let OvmfPkg boot to shell on XCODE5 tool chain, > don't include TftpDynamicCommand driver. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Liming Gao > Cc: Jordan Justen > Cc: Laszlo Ersek > --- > OvmfPkg/OvmfPkgIa32.dsc | 2 ++ > OvmfPkg/OvmfPkgIa32.fdf | 2 ++ > OvmfPkg/OvmfPkgIa32X64.dsc | 2 ++ > OvmfPkg/OvmfPkgIa32X64.fdf | 2 ++ > OvmfPkg/OvmfPkgX64.dsc | 2 ++ > OvmfPkg/OvmfPkgX64.fdf | 2 ++ > 6 files changed, 12 insertions(+) > > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index eccf34d3d1..6c70009149 100644 > --- a/OvmfPkg/OvmfPkgIa32.dsc > +++ b/OvmfPkg/OvmfPkgIa32.dsc > @@ -829,10 +829,12 @@ > OvmfPkg/Csm/Csm16/Csm16.inf > !endif > > +!if $(TOOL_CHAIN_TAG) != XCODE5 > ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { > > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > } > +!endif > ShellPkg/Application/Shell/Shell.inf { > > ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf > diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf > index f7f9ab06bb..1b4d51195f 100644 > --- a/OvmfPkg/OvmfPkgIa32.fdf > +++ b/OvmfPkg/OvmfPkgIa32.fdf > @@ -288,7 +288,9 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour > INF FatPkg/EnhancedFatDxe/Fat.inf > INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf > > +!if $(TOOL_CHAIN_TAG) != XCODE5 > INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf > +!endif > INF ShellPkg/Application/Shell/Shell.inf > > INF MdeModulePkg/Logo/LogoDxe.inf > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > index 4ac4faf5dc..515f1c157e 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > @@ -838,10 +838,12 @@ > OvmfPkg/Csm/Csm16/Csm16.inf > !endif > > +!if $(TOOL_CHAIN_TAG) != XCODE5 > ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { > > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > } > +!endif > ShellPkg/Application/Shell/Shell.inf { > > ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf > diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf > index 067ea1993e..c8a6ca3d11 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.fdf > +++ b/OvmfPkg/OvmfPkgIa32X64.fdf > @@ -289,7 +289,9 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour > INF FatPkg/EnhancedFatDxe/Fat.inf > INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf > > +!if $(TOOL_CHAIN_TAG) != XCODE5 > INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf > +!endif > INF ShellPkg/Application/Shell/Shell.inf > > INF MdeModulePkg/Logo/LogoDxe.inf > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index ecd5db416c..35e6287d03 100644 > --- a/OvmfPkg/OvmfPkgX64.dsc > +++ b/OvmfPkg/OvmfPkgX64.dsc > @@ -836,10 +836,12 @@ > OvmfPkg/Csm/Csm16/Csm16.inf > !endif > > +!if $(TOOL_CHAIN_TAG) != XCODE5 > ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { > > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > } > +!endif > ShellPkg/Application/Shell/Shell.inf { > > ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf > diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf > index 067ea1993e..c8a6ca3d11 100644 > --- a/OvmfPkg/OvmfPkgX64.fdf > +++ b/OvmfPkg/OvmfPkgX64.fdf > @@ -289,7 +289,9 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour > INF FatPkg/EnhancedFatDxe/Fat.inf > INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf > > +!if $(TOOL_CHAIN_TAG) != XCODE5 > INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf > +!endif > INF ShellPkg/Application/Shell/Shell.inf > > INF MdeModulePkg/Logo/LogoDxe.inf > thanks for the patch! In commit 4a64cbda8615 ("OvmfPkg: Don't add -mno-mmx -mno-sse option for XCODE5 tool chain", 2018-01-16), you added similar conditions (thanks for that as well!), but there, you quoted the XCODE5 string, such as: +!if $(TOOL_CHAIN_TAG) != "XCODE5" ... +!endif For consistency, can you please update this patch the same way? No need to repost for that, just please fix it up before you push it. With that update: Reviewed-by: Laszlo Ersek Thank you! Laszlo