Laszlo: Thanks. I will update the patch to keep the consistent style.
Thanks Liming > -----Original Message----- > From: Laszlo Ersek [mailto:[email protected]] > Sent: Thursday, November 22, 2018 11:19 PM > To: Gao, Liming <[email protected]>; [email protected] > Cc: Justen, Jordan L <[email protected]> > Subject: Re: [Patch] OvmfPkg: Don't include TftpDynamicCommand in XCODE5 tool > chain > > 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 <[email protected]> > > Cc: Jordan Justen <[email protected]> > > Cc: Laszlo Ersek <[email protected]> > > --- > > 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 { > > <PcdsFixedAtBuild> > > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > > } > > +!endif > > ShellPkg/Application/Shell/Shell.inf { > > <LibraryClasses> > > > > 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 { > > <PcdsFixedAtBuild> > > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > > } > > +!endif > > ShellPkg/Application/Shell/Shell.inf { > > <LibraryClasses> > > > > 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 { > > <PcdsFixedAtBuild> > > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > > } > > +!endif > > ShellPkg/Application/Shell/Shell.inf { > > <LibraryClasses> > > > > 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 <[email protected]> > > Thank you! > Laszlo _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
