EmulatorPkg: Disable TftpDynamicCommand and LogoDxe for XCODE5

[mirror_edk2.git] / EmulatorPkg / EmulatorPkg.fdf

diff --git a/EmulatorPkg/EmulatorPkg.fdf b/EmulatorPkg/EmulatorPkg.fdf
index 5b5f81443dff29c92b5952cf8a5711159c6f5a94..295f6f1db8ab8ee38c9fa8f37628b93492fad798 100644 (file)
--- a/EmulatorPkg/EmulatorPkg.fdf
+++ b/EmulatorPkg/EmulatorPkg.fdf
@@ -4,13 +4,7 @@
 # Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>\r
 # Portions copyright (c) 2009 - 2011, Apple Inc. All rights reserved.<BR>\r
 #\r
-# This program and the accompanying materials\r
-# are licensed and made available under the terms and conditions of the BSD License\r
-# which accompanies this distribution. The full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+# SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 \r
 [FD.Fv_Recovery]\r
@@ -86,6 +80,7 @@ DATA = {
 gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize\r
 \r
 [FV.FvRecovery]\r
+FvNameGuid         = 6D99E806-3D38-42c2-A095-5F4300BFD7DC\r
 FvAlignment        = 16         #FV alignment and FV attributes setting.\r
 ERASE_POLARITY     = 1\r
 MEMORY_MAPPED      = TRUE\r
@@ -170,7 +165,6 @@ INF  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
 INF  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
 INF  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf\r
 INF  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf\r
-INF  IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf\r
 INF  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf\r
 \r
 INF  EmulatorPkg/EmuBusDriverDxe/EmuBusDriverDxe.inf\r
@@ -184,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
@@ -196,24 +192,14 @@ INF  MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
 !if $(NETWORK_SUPPORT)\r
 INF  EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf\r
 !endif\r
-INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf\r
-INF  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf\r
-INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf\r
-INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf\r
-INF  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf\r
-INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
-INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
-INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf\r
-INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
+!include NetworkPkg/Network.fdf.inc\r
 \r
 INF FatPkg/EnhancedFatDxe/Fat.inf\r
 \r
-!ifndef $(USE_OLD_SHELL)\r
+!if "XCODE5" not in $(TOOL_CHAIN_TAG)\r
 INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf\r
-INF  ShellPkg/Application/Shell/Shell.inf\r
-!else\r
-INF  RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf\r
 !endif\r
+INF  ShellPkg/Application/Shell/Shell.inf\r
 \r
 [Rule.Common.SEC]\r
   FILE SEC = $(NAMED_GUID)  {\r