## @file\r
# This is Emulator FDF file with UEFI HII features enabled\r
#\r
-# Copyright (c) 2008 - 2013, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2008 - 2015, 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
INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf\r
INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf\r
\r
-INF EmbeddedPkg/SerialDxe/SerialDxe.inf\r
+INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf\r
INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
INF EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf\r
\r
INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
+INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf\r
INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
INF MdeModulePkg/Universal/PrintDxe/PrintDxe.inf\r
INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf\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/Ip4ConfigDxe/Ip4ConfigDxe.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/Tcp4Dxe/Tcp4Dxe.inf\r
INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
\r
-\r
-!if $(BUILD_FAT)\r
INF FatPkg/EnhancedFatDxe/Fat.inf\r
-!else\r
-INF RuleOverride = BINARY FatBinPkg/EnhancedFatDxe/Fat.inf\r
-!endif\r
\r
-!if $(BUILD_NEW_SHELL)\r
+!ifndef $(USE_OLD_SHELL)\r
INF ShellPkg/Application/Shell/Shell.inf\r
!else\r
-!if $(USE_NEW_SHELL)\r
-INF RuleOverride = BINARY ShellBinPkg/UefiShell/UefiShell.inf\r
-!else\r
INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf\r
!endif\r
-!endif\r
\r
FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
\r
[Rule.Common.SEC]\r
FILE SEC = $(NAMED_GUID) {\r
- PE32 PE32 Align=32 $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+ PE32 PE32 Align=Auto $(INF_OUTPUT)/$(MODULE_NAME).efi\r
UI STRING ="$(MODULE_NAME)" Optional\r
VERSION STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
}\r
\r
[Rule.Common.PEI_CORE]\r
FILE PEI_CORE = $(NAMED_GUID) {\r
- PE32 PE32 Align=32 $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+ PE32 PE32 Align=Auto $(INF_OUTPUT)/$(MODULE_NAME).efi\r
UI STRING ="$(MODULE_NAME)" Optional\r
VERSION STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
}\r
[Rule.Common.PEIM]\r
FILE PEIM = $(NAMED_GUID) {\r
PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex\r
- PE32 PE32 Align=32 $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+ PE32 PE32 Align=Auto $(INF_OUTPUT)/$(MODULE_NAME).efi\r
UI STRING="$(MODULE_NAME)" Optional\r
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
}\r