EmulatorPkg: Disable TftpDynamicCommand and LogoDxe for XCODE5
authorAndrew Fish <afish@apple.com>
Thu, 15 Aug 2019 16:59:41 +0000 (09:59 -0700)
committerMichael D Kinney <michael.d.kinney@intel.com>
Mon, 19 Aug 2019 16:57:27 +0000 (09:57 -0700)
Disable TftpDynamicCommand for XCODE5 because this command
places HII content in an PE/COFF resource section that is not
supported by the XCODE5 tool chain, and the missing HII
content causes the load of this command to ASSERT().

Disable the LogoDxe module that places the logo bitmap in
a PE/COFF resource section that is not supported by the
XCODE5 tool chain, and the missing HII content causes
the load of this module to ASSERT().

Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Andrew Fish <afish@apple.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Tested-by: Andrew Fish <afish@apple.com>
EmulatorPkg/EmulatorPkg.dsc
EmulatorPkg/EmulatorPkg.fdf

index 0af2d1f..20f1187 100644 (file)
 \r
   MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
   MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
+!if "XCODE5" not in $(TOOL_CHAIN_TAG)\r
   MdeModulePkg/Logo/LogoDxe.inf\r
+!endif\r
   MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.inf\r
   MdeModulePkg/Application/UiApp/UiApp.inf {\r
    <LibraryClasses>\r
 \r
   FatPkg/EnhancedFatDxe/Fat.inf\r
 \r
+!if "XCODE5" not in $(TOOL_CHAIN_TAG)\r
   ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {\r
     <PcdsFixedAtBuild>\r
       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
   }\r
+!endif\r
   ShellPkg/Application/Shell/Shell.inf {\r
     <LibraryClasses>\r
       ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf\r
index ec411e8..295f6f1 100644 (file)
@@ -178,7 +178,9 @@ INF  MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
 INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
 INF  MdeModulePkg/Universal/PrintDxe/PrintDxe.inf\r
 INF  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
+!if "XCODE5" not in $(TOOL_CHAIN_TAG)\r
 INF  MdeModulePkg/Logo/LogoDxe.inf\r
+!endif\r
 INF  MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.inf\r
 INF  RuleOverride = UI MdeModulePkg/Application/UiApp/UiApp.inf\r
 INF  MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf\r
@@ -194,7 +196,9 @@ INF  EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf
 \r
 INF FatPkg/EnhancedFatDxe/Fat.inf\r
 \r
+!if "XCODE5" not in $(TOOL_CHAIN_TAG)\r
 INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf\r
+!endif\r
 INF  ShellPkg/Application/Shell/Shell.inf\r
 \r
 [Rule.Common.SEC]\r