EmulatorPkg: Move Unix/UnixX64.* to EmulatorPkg.*

EmulatorPkg/Unix/UnixX64.dsc => EmulatorPkg/EmulatorPkg.dsc
EmulatorPkg/Unix/UnixX64.fdf => EmulatorPkg/EmulatorPkg.fdf

Signed-off-by: jljusten

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11925 6f19259b-4bc3-4df7-8a09-765794883524

4 files changed, 16 insertions, 866 deletions

diff --git a/EmulatorPkg/Unix/UnixX64.dsc b/EmulatorPkg/Unix/UnixX64.dsc
deleted file mode 100644
index 6fb76e1c0c..0000000000
--- a/EmulatorPkg/Unix/UnixX64.dsc
+++ /dev/null
@@ -1,455 +0,0 @@
-## @file

-#

-# UEFI/PI Emulation Platform with UEFI HII interface supported.

-#

-# The Emulation Platform can be used to debug individual modules, prior to creating

-#       a real platform. This also provides an example for how an DSC is created.

-# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

-# Portions copyright (c) 2010 - 2011, Apple Inc. All rights reserved.<BR>

-#

-#    This program and the accompanying materials

-#    are licensed and made available under the terms and conditions of the BSD License

-#    which accompanies this distribution. The full text of the license may be found at

-#    http://opensource.org/licenses/bsd-license.php

-#

-#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-#

-##

-

-################################################################################

-#

-# Defines Section - statements that will be processed to create a Makefile.

-#

-################################################################################

-[Defines]

-  PLATFORM_NAME                  = EmuUnix

-  PLATFORM_GUID                  = 05FD064D-1073-E844-936C-A0E16317107D

-  PLATFORM_VERSION               = 0.3

-  DSC_ SPECIFICATION             = 0x00010005

-!if $(BUILD_32)

-  OUTPUT_DIRECTORY               = Build/EmuUnixIa32

-!else

-  OUTPUT_DIRECTORY               = Build/EmuUnixX64

-!endif

-

-  SUPPORTED_ARCHITECTURES        = X64|IA32

-  BUILD_TARGETS                  = DEBUG|RELEASE

-  SKUID_IDENTIFIER               = DEFAULT

-  FLASH_DEFINITION               = EmulatorPkg/Unix/UnixX64.fdf

-

-################################################################################

-#

-# SKU Identification section - list of all SKU IDs supported by this Platform.

-#

-################################################################################

-[SkuIds]

-  0|DEFAULT

-

-################################################################################

-#

-# Library Class section - list of all Library Classes needed by this Platform.

-#

-################################################################################

-[LibraryClasses]

-  #

-  # Entry point

-  #

-  PeiCoreEntryPoint|MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf

-  PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf

-  DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf

-  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf

-  UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf

-  #

-  # Basic

-  #

-  BaseLib|MdePkg/Library/BaseLib/BaseLib.inf

-  SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf

-  PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf

-  CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf

-  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf

-  PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf

-  BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

-

-  #

-  # UEFI & PI

-  #

-  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf

-  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf

-  UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf

-  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf

-  UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf

-  HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf

-  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

-  UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf

-

-  PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf

-  DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf

-  DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf

-  #

-  # Generic Modules

-  #

-  UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf

-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf

-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf

-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf

-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf

-  OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf

-  GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf

-  SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf

-  TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf

-  SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf

-  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf

-  #

-  # Platform

-  #

-  PlatformBdsLib|EmulatorPkg/Library/EmuBdsLib/EmuBdsLib.inf

-  KeyMapLib|EmulatorPkg/Library/KeyMapLibNull/KeyMapLibNull.inf

-

-  #

-  # Misc

-  #

-  DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf

-  PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf

-  DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf

-  PeiServicesTablePointerLib|EmulatorPkg/Library/PeiServicesTablePointerLibMagicPage/PeiServicesTablePointerLibMagicPage.inf

-  DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf

-

-

-[LibraryClasses.common.SEC]

-  PeiServicesLib|EmulatorPkg/Library/SecPeiServicesLib/SecPeiServicesLib.inf

-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

-  PeCoffGetEntryPointLib|EmulatorPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.inf

-  PeCoffExtraActionLib|EmulatorPkg/Library/PeiEmuPeCoffExtraActionLib/PeiEmuPeCoffExtraActionLib.inf

-  SerialPortLib|EmulatorPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.inf

-  PpiListLib|EmulatorPkg/Library/SecPpiListLib/SecPpiListLib.inf

-  DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

-  TimerLib|EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.inf

-

-[LibraryClasses.common.USER_DEFINED, LibraryClasses.common.BASE]

-  DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf

-  PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf

-  MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf

-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

-  PpiListLib|EmulatorPkg/Library/SecPpiListLib/SecPpiListLib.inf

-  ThunkPpiList|EmulatorPkg/Library/ThunkPpiList/ThunkPpiList.inf

-  ThunkProtocolList|EmulatorPkg/Library/ThunkProtocolList/ThunkProtocolList.inf

-  PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf

-  PpiListLib|EmulatorPkg/Library/SecPpiListLib/SecPpiListLib.inf

-  PeiServicesLib|EmulatorPkg/Library/SecPeiServicesLib/SecPeiServicesLib.inf

-

-

-[LibraryClasses.common.PEIM, LibraryClasses.common.PEI_CORE]

-  HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf

-  MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf

-  ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf

-  PeCoffGetEntryPointLib|EmulatorPkg/Library/PeiEmuPeCoffGetEntryPointLib/PeiEmuPeCoffGetEntryPointLib.inf

-  PeCoffExtraActionLib|EmulatorPkg/Library/PeiEmuPeCoffExtraActionLib/PeiEmuPeCoffExtraActionLib.inf

-  ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf

-  SerialPortLib|EmulatorPkg/Library/PeiEmuSerialPortLib/PeiEmuSerialPortLib.inf

-  ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf

-  TimerLib|EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.inf

-

-[LibraryClasses.common.PEI_CORE]

-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

-

-[LibraryClasses.common.PEIM]

-  PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf

-

-[LibraryClasses.common.DXE_CORE]

-  HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf

-  MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf

-  ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

-  PeCoffExtraActionLib|EmulatorPkg/Library/DxeEmuPeCoffExtraActionLib/DxeEmuPeCoffExtraActionLib.inf

-  ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf

-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

-  TimerLib|EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.inf

-  EmuThunkLib|EmulatorPkg/Library/DxeEmuLib/DxeEmuLib.inf

-

-[LibraryClasses.common.DXE_RUNTIME_DRIVER, LibraryClasses.common.UEFI_DRIVER, LibraryClasses.common.DXE_DRIVER, LibraryClasses.common.UEFI_APPLICATION]

-  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

-  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

-  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf

-  ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

-  EmuThunkLib|EmulatorPkg/Library/DxeEmuLib/DxeEmuLib.inf

-  PeCoffExtraActionLib|EmulatorPkg/Library/DxeEmuPeCoffExtraActionLib/DxeEmuPeCoffExtraActionLib.inf

-  ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

-  TimerLib|EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.inf

-

-[LibraryClasses.common.UEFI_DRIVER]

-  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

-

-[LibraryClasses.common.UEFI_APPLICATION]

-  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

-

-

-################################################################################

-#

-# Pcd Section - list of all EDK II PCD Entries defined by this Platform.

-#

-################################################################################

-[PcdsFeatureFlag]

-  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE

-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|TRUE

-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst|FALSE

-  gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE

-

-[PcdsFixedAtBuild]

-  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000040

-  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x0f

-  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x1f

-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizeNonPopulateCapsule|0x0

-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizePopulateCapsule|0x0

-

-  gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwareFdSize|0x002a0000

-  gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwareBlockSize|0x10000

-  gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwareVolume|L"../FV/FV_RECOVERY.fd"

-

-  gEmulatorPkgTokenSpaceGuid.PcdEmuMemorySize|L"64!64"

-

-!if $(BUILD_NEW_SHELL)

-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }

-!else

-!if $(USE_NEW_SHELL)

-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }

-!endif

-!endif

-

-#define BOOT_WITH_FULL_CONFIGURATION                  0x00

-#define BOOT_WITH_MINIMAL_CONFIGURATION               0x01

-#define BOOT_ASSUMING_NO_CONFIGURATION_CHANGES        0x02

-#define BOOT_WITH_FULL_CONFIGURATION_PLUS_DIAGNOSTICS 0x03

-#define BOOT_WITH_DEFAULT_SETTINGS                    0x04

-#define BOOT_ON_S4_RESUME                             0x05

-#define BOOT_ON_S5_RESUME                             0x06

-#define BOOT_ON_S2_RESUME                             0x10

-#define BOOT_ON_S3_RESUME                             0x11

-#define BOOT_ON_FLASH_UPDATE                          0x12

-#define BOOT_IN_RECOVERY_MODE                         0x20

-  gEmulatorPkgTokenSpaceGuid.PcdEmuBootMode|0

-

-  gEmulatorPkgTokenSpaceGuid.PcdEmuApCount|L"1"

-

-  # For a CD-ROM/DVD use L"diag.dmg:RO:2048"

-  gEmulatorPkgTokenSpaceGuid.PcdEmuVirtualDisk|L"disk.dmg:FW"

-  gEmulatorPkgTokenSpaceGuid.PcdEmuGop|L"GOP Window"

-  gEmulatorPkgTokenSpaceGuid.PcdEmuFileSystem|L".!../../../../EdkShellBinPkg/Bin"

-  gEmulatorPkgTokenSpaceGuid.PcdEmuSerialPort|L"/dev/ttyS0"

-  gEmulatorPkgTokenSpaceGuid.PcdEmuNetworkInterface|L"en0"

-

-  gEmulatorPkgTokenSpaceGuid.PcdEmuCpuModel|L"Intel(R) Processor Model"

-  gEmulatorPkgTokenSpaceGuid.PcdEmuCpuSpeed|L"3000"

-

-  #  0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8

-  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|1

-

-################################################################################

-#

-# Pcd Dynamic Section - list of all EDK II PCD Entries defined by this Platform

-#

-################################################################################

-

-[PcdsDynamicDefault.common.DEFAULT]

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0

-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0

-

-[PcdsDynamicHii.common.DEFAULT]

-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|L"Setup"|gEmuSystemConfigGuid|0x0|80

-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|L"Setup"|gEmuSystemConfigGuid|0x4|25

-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|10

-

-

-###################################################################################################

-#

-# Components Section - list of the modules and components that will be processed by compilation

-#                      tools and the EDK II tools to generate PE32/PE32+/Coff image files.

-#

-# Note: The EDK II DSC file is not used to specify how compiled binary images get placed

-#       into firmware volume images. This section is just a list of modules to compile from

-#       source into UEFI-compliant binaries.

-#       It is the FDF file that contains information on combining binary files into firmware

-#       volume images, whose concept is beyond UEFI and is described in PI specification.

-#       Binary modules do not need to be listed in this section, as they should be

-#       specified in the FDF file. For example: Shell binary (Shell_Full.efi), FAT binary (Fat.efi),

-#       Logo (Logo.bmp), and etc.

-#       There may also be modules listed in this section that are not required in the FDF file,

-#       When a module listed here is excluded from FDF file, then UEFI-compliant binary will be

-#       generated for it, but the binary will not be put into any firmware volume.

-#

-###################################################################################################

-

-!ifndef $(SKIP_MAIN_BUILD)

-[Components.X64]

-  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf {

-    <LibraryClasses>

-      # turn off CR3 write so that DXE IPL will not crash emulator

-      BaseLib|UnixPkg/Library/UnixBaseLib/UnixBaseLib.inf

-  }

-

-[Components.IA32]

-  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf

-!endif

-

-[Components]

-!ifdef $(UNIX_SEC_BUILD)

-  ##

-  #  Emulator, OS POSIX application

-  ##

-  EmulatorPkg/Unix/Host/Host.inf

-!endif

-

-!ifndef $(SKIP_MAIN_BUILD)

-  #

-  # Generic SEC

-  #

-  EmulatorPkg/Sec/Sec.inf

-

-  ##

-  #  PEI Phase modules

-  ##

-  MdeModulePkg/Core/Pei/PeiMain.inf

-  MdeModulePkg/Universal/PCD/Pei/Pcd.inf  {

-   <LibraryClasses>

-      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

-  }

-  MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf

-  MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf

-

-  IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf

-  EmulatorPkg/BootModePei/BootModePei.inf

-  MdeModulePkg/Universal/Variable/Pei/VariablePei.inf

-  EmulatorPkg/AutoScanPei/AutoScanPei.inf

-  EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.inf

-  EmulatorPkg/FlashMapPei/FlashMapPei.inf

-  EmulatorPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.inf

-

-  ##

-  #  DXE Phase modules

-  ##

-  MdeModulePkg/Core/Dxe/DxeMain.inf {

-    <LibraryClasses>

-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

-      NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf

-      NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf

-  }

-  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf {

-    <LibraryClasses>

-      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

-  }

-

-  MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf

-  MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf {

-   <LibraryClasses>

-      DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

-      SerialPortLib|EmulatorPkg/Library/DxeEmuStdErrSerialPortLib/DxeEmuStdErrSerialPortLib.inf

-  }

-

-  MdeModulePkg/Universal/Metronome/Metronome.inf

-  EmulatorPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf

-  EmulatorPkg/ResetRuntimeDxe/Reset.inf

-  MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf

-  EmulatorPkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf

-  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf

-  MdeModulePkg/Universal/EbcDxe/EbcDxe.inf

-  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf

-  EmulatorPkg/EmuThunkDxe/EmuThunk.inf

-  EmulatorPkg/CpuRuntimeDxe/Cpu.inf

-  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf

-  EmulatorPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf

-  EmulatorPkg/TimerDxe/Timer.inf

-

-

-  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf

-  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf

-  MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf

-  MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf

-  MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf

-  MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf

-  MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf

-  EmbeddedPkg/SerialDxe/SerialDxe.inf {

-   <LibraryClasses>

-      DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf

-      SerialPortLib|EmulatorPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.inf

-  }

-

-  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

-  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf

-  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

-  #{

-  #  <LibraryClasses>

-  #    NULL|EmulatorPkg/Library/DevicePathTextLib/DevicePathTextLib.inf

-  #}

-

-  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf

-  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf

-  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

-  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf

-  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf

-  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf

-  IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf

-

-  EmulatorPkg/EmuBusDriverDxe/EmuBusDriverDxe.inf

-  EmulatorPkg/EmuGopDxe/EmuGopDxe.inf

-  EmulatorPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystemDxe.inf

-  EmulatorPkg/EmuBlockIoDxe/EmuBlockIoDxe.inf

-  EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf

-

-  MdeModulePkg/Application/HelloWorld/HelloWorld.inf

-

-  #

-  # Network stack drivers

-  #

-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf

-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf

-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf

-  MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf

-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf

-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf

-  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf

-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf

-  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf

-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

-

-  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf

-  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

-  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

-  MdeModulePkg/Universal/PrintDxe/PrintDxe.inf

-  MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf {

-    <LibraryClasses>

-      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

-  }

-

-!if $(BUILD_FAT)

-  FatPkg/EnhancedFatDxe/Fat.inf

-!endif

-

-!if $(BUILD_NEW_SHELL)

-  ShellPkg/Application/Shell/Shell.inf {

-    <LibraryClasses>

-      ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf

-      NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf

-      NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf

-      NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf

-      NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf

-      NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf

-      NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf

-      NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf

-      HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf

-      FileHandleLib|ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf

-      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf

-      SortLib|ShellPkg/Library/UefiSortLib/UefiSortLib.inf

-      PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf

-      MemoryAllocationLib|EmulatorPkg/Library/GuardUefiMemoryAllocationLib/GuardUefiMemoryAllocationLib.inf

-#      SafeBlockIoLib|ShellPkg/Library/SafeBlockIoLib/SafeBlockIoLib.inf

-#      SafeOpenProtocolLib|ShellPkg/Library/SafeOpenProtocolLib/SafeOpenProtocolLib.inf

-

-    <PcdsFixedAtBuild>

-      gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF

-      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

-      gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000

-  }

-!endif

-

-!endif

-

diff --git a/EmulatorPkg/Unix/UnixX64.fdf b/EmulatorPkg/Unix/UnixX64.fdf
deleted file mode 100644
index 0778612f58..0000000000
--- a/EmulatorPkg/Unix/UnixX64.fdf
+++ /dev/null
@@ -1,395 +0,0 @@
-## @file

-# This is Unix FDF file with UEFI HII features enabled

-#

-# Copyright (c) 2008 - 2011, Intel Corporation. All rights reserved.<BR>

-# Portions copyright (c) 2009 - 2011, Apple Inc. All rights reserved.<BR>

-#

-#    This program and the accompanying materials

-#    are licensed and made available under the terms and conditions of the BSD License

-#    which accompanies this distribution. The full text of the license may be found at

-#    http://opensource.org/licenses/bsd-license.php

-#

-#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-#

-

-################################################################################

-#

-# FD Section

-# The [FD] Section is made up of the definition statements and a

-# description of what goes into  the Flash Device Image.  Each FD section

-# defines one flash "device" image.  A flash device image may be one of

-# the following: Removable media bootable image (like a boot floppy

-# image,) an Option ROM image (that would be "flashed" into an add-in

-# card,) a System "Flash"  image (that would be burned into a system's

-# flash) or an Update ("Capsule") image that will be used to update and

-# existing system flash.

-#

-################################################################################

-[FD.Fv_Recovery]

-#

-# In OS X PEIMs are really XIP, so we need to make this address match the malloced

-# buffer for the FD (0x41000000). If this address does not match the FV will get

-# relocated in place (works, but not a great idea).

-#

-BaseAddress   = 0x102000000|gEmulatorPkgTokenSpaceGuid.PcdEmuFdBaseAddress   #The base address of the FLASH Device.

-Size          = 0x005a0000|gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwareFdSize  #The size in bytes of the FLASH Device

-ErasePolarity = 1

-BlockSize     = 0x10000

-NumBlocks     = 0x5a

-

-################################################################################

-#

-# Following are lists of FD Region layout which correspond to the locations of different

-# images within the flash device.

-#

-# Regions must be defined in ascending order and may not overlap.

-#

-# A Layout Region start with a eight digit hex offset (leading "0x" required) followed by

-# the pipe "|" character, followed by the size of the region, also in hex with the leading

-# "0x" characters. Like:

-# Offset|Size

-# PcdOffsetCName|PcdSizeCName

-# RegionType <FV, DATA, or FILE>

-#

-################################################################################

-0x00000000|0x00580000

-gEmulatorPkgTokenSpaceGuid.PcdEmuFlashFvRecoveryBase|gEmulatorPkgTokenSpaceGuid.PcdEmuFlashFvRecoverySize

-FV = FvRecovery

-

-0x00580000|0x0000c000

-gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize

-#NV_VARIABLE_STORE

-DATA = {

-  ## This is the EFI_FIRMWARE_VOLUME_HEADER

-  # ZeroVector []

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-  # FileSystemGuid: gEfiSystemNvDataFvGuid         =

-  #  { 0xFFF12B8D, 0x7696, 0x4C8B, { 0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50 }}

-  0x8D, 0x2B, 0xF1, 0xFF, 0x96, 0x76, 0x8B, 0x4C,

-  0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50,

-  # FvLength: 0x20000

-  0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,

-  # Signature "_FVH"       #Attributes

-  0x5f, 0x46, 0x56, 0x48, 0xff, 0xfe, 0x04, 0x00,

-  # HeaderLength #CheckSum #ExtHeaderOffset #Reserved #Revision

-  0x48, 0x00, 0x36, 0x09, 0x00, 0x00, 0x00, 0x02,

-  # Blockmap[0]: 2 Blocks * 0x10000 Bytes / Block

-  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,

-  # Blockmap[1]: End

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-  ## This is the VARIABLE_STORE_HEADER

-  #Signature: gEfiVariableGuid =

-  #  { 0xddcf3616, 0x3275, 0x4164, { 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d }}

-  0x16, 0x36, 0xcf, 0xdd, 0x75, 0x32, 0x64, 0x41,

-  0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d,

-  #Size: 0xc000 (gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize) - 0x48 (size of EFI_FIRMWARE_VOLUME_HEADER) = 0xBFB8

-  # This can speed up the Variable Dispatch a bit.

-  0xB8, 0xBF, 0x00, 0x00,

-  #FORMATTED: 0x5A #HEALTHY: 0xFE #Reserved: UINT16 #Reserved1: UINT32

-  0x5A, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

-}

-

-0x0058c000|0x00002000

-#NV_EVENT_LOG

-gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogBase|gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageEventLogSize

-

-0x0058e000|0x00002000

-gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize

-#NV_FTW_WORKING

-DATA = {

-  # EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER->Signature = gEfiSystemNvDataFvGuid         =

-  #  { 0xFFF12B8D, 0x7696, 0x4C8B, { 0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50 }}

-  0x8D, 0x2B, 0xF1, 0xFF, 0x96, 0x76, 0x8B, 0x4C,

-  0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50,

-  # Crc:UINT32            #WorkingBlockValid:1, WorkingBlockInvalid:1, Reserved

-  0x77, 0x13, 0x9B, 0xD7, 0xFE, 0xFF, 0xFF, 0xFF,

-  # WriteQueueSize: UINT64

-  0xE0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

-}

-

-0x00590000|0x00010000

-#NV_FTW_SPARE

-gEmulatorPkgTokenSpaceGuid.PcdEmuFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize

-

-################################################################################

-#

-# FV Section

-#

-# [FV] section is used to define what components or modules are placed within a flash

-# device file.  This section also defines order the components and modules are positioned

-# within the image.  The [FV] section consists of define statements, set statements and

-# module statements.

-#

-################################################################################

-[FV.FvRecovery]

-FvAlignment        = 16         #FV alignment and FV attributes setting.

-ERASE_POLARITY     = 1

-MEMORY_MAPPED      = TRUE

-STICKY_WRITE       = TRUE

-LOCK_CAP           = TRUE

-LOCK_STATUS        = TRUE

-WRITE_DISABLED_CAP = TRUE

-WRITE_ENABLED_CAP  = TRUE

-WRITE_STATUS       = TRUE

-WRITE_LOCK_CAP     = TRUE

-WRITE_LOCK_STATUS  = TRUE

-READ_DISABLED_CAP  = TRUE

-READ_ENABLED_CAP   = TRUE

-READ_STATUS        = TRUE

-READ_LOCK_CAP      = TRUE

-READ_LOCK_STATUS   = TRUE

-

-################################################################################

-#

-# The INF statements point to EDK component and EDK II module INF files, which will be placed into this FV image.

-# Parsing tools will scan the INF file to determine the type of component or module.

-# The component or module type is used to reference the standard rules

-# defined elsewhere in the FDF file.

-#

-# The format for INF statements is:

-# INF $(PathAndInfFileName)

-#

-################################################################################

-##

-#  PEI Phase modules

-##

-##

-#  PEI Apriori file example, more PEIM module added later.

-##

-APRIORI PEI {

-  INF  MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf

-  INF  MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf

-  INF  MdeModulePkg/Universal/PCD/Pei/Pcd.inf

-  }

-APRIORI DXE {

-  INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf

-  INF  MdeModulePkg/Universal/Metronome/Metronome.inf

-  }

-INF  EmulatorPkg/Sec/Sec.inf

-INF  MdeModulePkg/Core/Pei/PeiMain.inf

-INF  MdeModulePkg/Universal/PCD/Pei/Pcd.inf

-INF  MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf

-INF  MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf

-INF  EmulatorPkg/BootModePei/BootModePei.inf

-INF  EmulatorPkg/AutoScanPei/AutoScanPei.inf

-INF  EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.inf

-INF  EmulatorPkg/FlashMapPei/FlashMapPei.inf

-INF  EmulatorPkg/ThunkPpiToProtocolPei/ThunkPpiToProtocolPei.inf

-INF  MdeModulePkg/Universal/Variable/Pei/VariablePei.inf

-INF  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf

-

-##

-#  DXE Phase modules

-##

-INF  MdeModulePkg/Core/Dxe/DxeMain.inf

-INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf

-INF  MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf

-INF  MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf

-INF  MdeModulePkg/Universal/Metronome/Metronome.inf

-INF  EmulatorPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf

-INF  EmulatorPkg/ResetRuntimeDxe/Reset.inf

-INF  MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf

-INF  EmulatorPkg/FvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf

-INF  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf

-INF  MdeModulePkg/Universal/EbcDxe/EbcDxe.inf

-INF  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf

-INF  EmulatorPkg/EmuThunkDxe/EmuThunk.inf

-INF  EmulatorPkg/CpuRuntimeDxe/Cpu.inf

-INF  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf

-INF  EmulatorPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf

-INF  EmulatorPkg/TimerDxe/Timer.inf

-INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf

-INF  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf

-INF  MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf

-INF  MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf

-INF  MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf

-INF  MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf

-INF  MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf

-

-INF  EmbeddedPkg/SerialDxe/SerialDxe.inf

-INF  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

-INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

-INF  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf

-INF  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf

-INF  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

-INF  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf

-INF  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf

-INF  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf

-INF  IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf

-INF  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf

-

-INF  EmulatorPkg/EmuBusDriverDxe/EmuBusDriverDxe.inf

-INF  EmulatorPkg/EmuGopDxe/EmuGopDxe.inf

-INF  EmulatorPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystemDxe.inf

-INF  EmulatorPkg/EmuBlockIoDxe/EmuBlockIoDxe.inf

-INF  EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf

-

-INF  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

-INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

-INF  MdeModulePkg/Universal/PrintDxe/PrintDxe.inf

-INF  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf

-INF  MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf

-INF  MdeModulePkg/Application/HelloWorld/HelloWorld.inf

-

-#

-# Network stack drivers

-#

-!if $(NETWORK_SUPPORT)

-INF  EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf

-!endif

-INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf

-INF  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf

-INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf

-INF  MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf

-INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf

-INF  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf

-INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf

-INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf

-INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf

-INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

-

-

-!if $(BUILD_FAT)

-INF FatPkg/EnhancedFatDxe/Fat.inf

-!else

-INF  RuleOverride = BINARY FatBinPkg/EnhancedFatDxe/Fat.inf

-!endif

-

-!if $(BUILD_NEW_SHELL)

-INF  ShellPkg/Application/Shell/Shell.inf

-!else

-!if $(USE_NEW_SHELL)

-INF  RuleOverride = BINARY ShellBinPkg/UefiShell/UefiShell.inf

-!else

-INF  RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf

-!endif

-!endif

-

-FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {

-  SECTION RAW = MdeModulePkg/Logo/Logo.bmp

-}

-

-

-################################################################################

-#

-# Rules are use with the [FV] section's module INF type to define

-# how an FFS file is created for a given INF file. The following Rule are the default

-# rules for the different module type. User can add the customized rules to define the

-# content of the FFS file.

-#

-################################################################################

-

-

-############################################################################

-# Example of a DXE_DRIVER FFS file with a Checksum encapsulation section   #

-############################################################################

-#

-#[Rule.Common.DXE_DRIVER]

-#  FILE DRIVER = $(NAMED_GUID) {

-#    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex

-#    COMPRESS PI_STD {

-#      GUIDED {

-#        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi

-#        UI       STRING="$(MODULE_NAME)" Optional

-#        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

-#      }

-#    }

-#  }

-#

-############################################################################

-[Rule.Common.SEC]

-  FILE SEC = $(NAMED_GUID)  {

-    PE32     PE32    Align=32       $(INF_OUTPUT)/$(MODULE_NAME).efi

-    UI       STRING ="$(MODULE_NAME)" Optional

-    VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

-  }

-

-

-[Rule.Common.PEI_CORE]

-  FILE PEI_CORE = $(NAMED_GUID) {

-    PE32     PE32    Align=32       $(INF_OUTPUT)/$(MODULE_NAME).efi

-    UI       STRING ="$(MODULE_NAME)" Optional

-    VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

-  }

-

-[Rule.Common.PEIM]

-  FILE PEIM = $(NAMED_GUID) {

-     PEI_DEPEX PEI_DEPEX Optional        $(INF_OUTPUT)/$(MODULE_NAME).depex

-     PE32      PE32   Align=32       $(INF_OUTPUT)/$(MODULE_NAME).efi

-     UI       STRING="$(MODULE_NAME)" Optional

-     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

-  }

-

-[Rule.Common.DXE_CORE]

-  FILE DXE_CORE = $(NAMED_GUID) {

-    COMPRESS PI_STD {

-      PE32     PE32           $(INF_OUTPUT)/$(MODULE_NAME).efi

-      UI       STRING="$(MODULE_NAME)" Optional

-      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

-    }

-  }

-

-[Rule.Common.UEFI_DRIVER]

-  FILE DRIVER = $(NAMED_GUID) {

-    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex

-    COMPRESS PI_STD {

-      GUIDED {

-        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi

-        UI       STRING="$(MODULE_NAME)" Optional

-        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

-      }

-    }

-  }

-

-[Rule.Common.DXE_DRIVER]

-  FILE DRIVER = $(NAMED_GUID) {

-    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex

-    COMPRESS PI_STD {

-      GUIDED {

-        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi

-        UI       STRING="$(MODULE_NAME)" Optional

-        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

-      }

-    }

-  }

-

-[Rule.Common.DXE_RUNTIME_DRIVER]

-  FILE DRIVER = $(NAMED_GUID) {

-    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex

-    COMPRESS PI_STD {

-      GUIDED {

-        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi

-        UI       STRING="$(MODULE_NAME)" Optional

-        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

-      }

-    }

-  }

-

-[Rule.Common.UEFI_APPLICATION]

-  FILE APPLICATION = $(NAMED_GUID) {

-    COMPRESS PI_STD {

-      GUIDED {

-        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi

-        UI       STRING="$(MODULE_NAME)" Optional

-        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

-      }

-    }

-  }

-

-[Rule.Common.UEFI_DRIVER.BINARY]

-  FILE DRIVER = $(NAMED_GUID) {

-    DXE_DEPEX DXE_DEPEX Optional      |.depex

-    PE32      PE32                    |.efi

-    UI        STRING="$(MODULE_NAME)" Optional

-    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

-  }

-

-[Rule.Common.UEFI_APPLICATION.BINARY]

-  FILE APPLICATION = $(NAMED_GUID) {

-    PE32      PE32                    |.efi

-    UI        STRING="$(MODULE_NAME)" Optional

-    VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)

-  }

-

diff --git a/EmulatorPkg/Unix/build.sh b/EmulatorPkg/Unix/build.sh
index 98b4f69479..f433b5d199 100755
--- a/EmulatorPkg/Unix/build.sh
+++ b/EmulatorPkg/Unix/build.sh
@@ -71,7 +71,7 @@ then
   TARGET_TOOLS=$UNIXPKG_TOOLS
 fi
 
-BUILD_ROOT_ARCH=$WORKSPACE/Build/EmuUnixIa32/DEBUG_"$UNIXPKG_TOOLS"/IA32
+BUILD_ROOT_ARCH=$WORKSPACE/Build/Emulator32/DEBUG_"$UNIXPKG_TOOLS"/IA32
 
 if  [[ ! -f `which build` || ! -f `which GenFv` ]];
 then
@@ -108,15 +108,15 @@ do
 
   if [[ $arg == cleanall ]]; then
     make -C $WORKSPACE/BaseTools clean
-    build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc -a IA32 -t $TARGET_TOOLS -D SEC_ONLY -n 3 clean
-    build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc -a IA32 -t $UNIXPKG_TOOLS -n 3 clean
+    build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc -a IA32 -t $TARGET_TOOLS -D SEC_ONLY -n 3 clean
+    build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc -a IA32 -t $UNIXPKG_TOOLS -n 3 clean
     build -p $WORKSPACE/ShellPkg/ShellPkg.dsc -a IA32 -t $UNIXPKG_TOOLS -n 3 clean
     exit $?
   fi
 
   if [[ $arg == clean ]]; then
-    build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc -a IA32 -t $TARGET_TOOLS -D SEC_ONLY -n 3 clean
-    build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc -a IA32 -t $UNIXPKG_TOOLS -n 3 clean
+    build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc -a IA32 -t $TARGET_TOOLS -D SEC_ONLY -n 3 clean
+    build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc -a IA32 -t $UNIXPKG_TOOLS -n 3 clean
     exit $?
   fi
 
@@ -127,10 +127,10 @@ done
 # Build the edk2 UnixPkg
 #
 if [[ $TARGET_TOOLS == $UNIXPKG_TOOLS ]]; then
-  build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc      -a IA32 -t $UNIXPKG_TOOLS -D BUILD_32 -D UNIX_SEC_BUILD $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n 3 $1 $2 $3 $4 $5 $6 $7 $8
+  build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc      -a IA32 -t $UNIXPKG_TOOLS -D BUILD_32 -D UNIX_SEC_BUILD $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n 3 $1 $2 $3 $4 $5 $6 $7 $8
 else
-  build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc      -a IA32 -t $TARGET_TOOLS  -D BUILD_32 -D UNIX_SEC_BUILD -D SKIP_MAIN_BUILD -n 3 $1 $2 $3 $4 $5 $6 $7 $8  modules
-  build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc      -a IA32 -t $UNIXPKG_TOOLS -D BUILD_32 $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n 3 $1 $2 $3 $4 $5 $6 $7 $8
+  build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc      -a IA32 -t $TARGET_TOOLS  -D BUILD_32 -D UNIX_SEC_BUILD -D SKIP_MAIN_BUILD -n 3 $1 $2 $3 $4 $5 $6 $7 $8  modules
+  build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc      -a IA32 -t $UNIXPKG_TOOLS -D BUILD_32 $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n 3 $1 $2 $3 $4 $5 $6 $7 $8
   cp $WORKSPACE/Build/EmuUnixIa32/DEBUG_"$TARGET_TOOLS"/IA32/Host $WORKSPACE/Build/EmuUnixIa32/DEBUG_"$UNIXPKG_TOOLS"/IA32
 fi
 exit $?
diff --git a/EmulatorPkg/Unix/build64.sh b/EmulatorPkg/Unix/build64.sh
index 6ddbe2d50d..cafc675b50 100755
--- a/EmulatorPkg/Unix/build64.sh
+++ b/EmulatorPkg/Unix/build64.sh
@@ -72,7 +72,7 @@ then
   TARGET_TOOLS=$UNIXPKG_TOOLS
 fi
 
-BUILD_ROOT_ARCH=$WORKSPACE/Build/EmuUnixX64/DEBUG_"$UNIXPKG_TOOLS"/X64
+BUILD_ROOT_ARCH=$WORKSPACE/Build/Emulator/DEBUG_"$UNIXPKG_TOOLS"/X64
 
 if  [[ ! -f `which build` || ! -f `which GenFv` ]];
 then
@@ -109,15 +109,15 @@ do
 
   if [[ $arg == cleanall ]]; then
     make -C $WORKSPACE/BaseTools clean
-    build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc -a X64 -t $TARGET_TOOLS -D SEC_ONLY -n 3 clean
-    build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc -a X64 -t $UNIXPKG_TOOLS -n 3 clean
+    build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc -a X64 -t $TARGET_TOOLS -D SEC_ONLY -n 3 clean
+    build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc -a X64 -t $UNIXPKG_TOOLS -n 3 clean
     build -p $WORKSPACE/ShellPkg/ShellPkg.dsc -a X64 -t $UNIXPKG_TOOLS -n 3 clean
     exit $?
   fi
 
   if [[ $arg == clean ]]; then
-    build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc -a X64 -t $TARGET_TOOLS -D SEC_ONLY -n 3 clean
-    build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc -a X64 -t $UNIXPKG_TOOLS -n 3 clean
+    build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc -a X64 -t $TARGET_TOOLS -D SEC_ONLY -n 3 clean
+    build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc -a X64 -t $UNIXPKG_TOOLS -n 3 clean
     exit $?
   fi
 
@@ -128,10 +128,10 @@ done
 # Build the edk2 UnixPkg
 #
 if [[ $TARGET_TOOLS == $UNIXPKG_TOOLS ]]; then
-  build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc      -a X64 -t $UNIXPKG_TOOLS -D UNIX_SEC_BUILD $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n 3 $1 $2 $3 $4 $5 $6 $7 $8
+  build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc      -a X64 -t $UNIXPKG_TOOLS -D UNIX_SEC_BUILD $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n 3 $1 $2 $3 $4 $5 $6 $7 $8
 else
-  build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc      -a X64 -t $TARGET_TOOLS  -D UNIX_SEC_BUILD -D SKIP_MAIN_BUILD -n 3 $1 $2 $3 $4 $5 $6 $7 $8  modules
-  build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc      -a X64 -t $UNIXPKG_TOOLS $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n 3 $1 $2 $3 $4 $5 $6 $7 $8
+  build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc      -a X64 -t $TARGET_TOOLS  -D UNIX_SEC_BUILD -D SKIP_MAIN_BUILD -n 3 $1 $2 $3 $4 $5 $6 $7 $8  modules
+  build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc      -a X64 -t $UNIXPKG_TOOLS $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n 3 $1 $2 $3 $4 $5 $6 $7 $8
   cp $WORKSPACE/Build/EmuUnixX64/DEBUG_"$TARGET_TOOLS"/X64/Host $WORKSPACE/Build/EmuUnixX64/DEBUG_"$UNIXPKG_TOOLS"/X64
 fi
 exit $?