BaseTools/BinToPcd: Fix Python 2.7.x compatibility issue

[mirror_edk2.git] / EmulatorPkg / EmulatorPkg.fdf

diff --git a/EmulatorPkg/EmulatorPkg.fdf b/EmulatorPkg/EmulatorPkg.fdf
index 8ac9098463f63500f943f10c1c454172896c2699..314eb7b895a74a4d238002ba3688c174f10ab944 100644 (file)
--- a/EmulatorPkg/EmulatorPkg.fdf
+++ b/EmulatorPkg/EmulatorPkg.fdf
@@ -1,7 +1,7 @@
 ## @file\r
 # This is Emulator FDF file with UEFI HII features enabled\r
 #\r
 ## @file\r
 # This is Emulator FDF file with UEFI HII features enabled\r
 #\r

-# Copyright (c) 2008 - 2015, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2008 - 2017, 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
 # Portions copyright (c) 2009 - 2011, Apple Inc. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials\r


@@ -203,14 +203,10 @@ INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
 INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf\r
 INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
 \r
 INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf\r
 INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
 \r

-\r
-!if $(BUILD_FAT)\r

 INF FatPkg/EnhancedFatDxe/Fat.inf\r
 INF FatPkg/EnhancedFatDxe/Fat.inf\r

-!else\r
-INF  RuleOverride = BINARY FatBinPkg/EnhancedFatDxe/Fat.inf\r
-!endif\r

 \r
 !ifndef $(USE_OLD_SHELL)\r
 \r
 !ifndef $(USE_OLD_SHELL)\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
 INF  ShellPkg/Application/Shell/Shell.inf\r
 !else\r
 INF  RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf\r