X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=InOsEmuPkg%2FUnix%2FUnixX64.dsc;h=a601c0cbceb70350db4f7269feba24491da0c1c6;hp=53d460ce09d1665694efe7e20abe4b4f51ed7c66;hb=5dcda296a4af4cee45a90c9048f66e96a95928f2;hpb=9ab6800fe381b89fc29a1beca3fbc12f0c656962

diff --git a/InOsEmuPkg/Unix/UnixX64.dsc b/InOsEmuPkg/Unix/UnixX64.dsc
index 53d460ce09..a601c0cbce 100644
--- a/InOsEmuPkg/Unix/UnixX64.dsc
+++ b/InOsEmuPkg/Unix/UnixX64.dsc
@@ -1,6 +1,6 @@
 ## @file
 #
-# EFI/Framework Emulation Platform with UEFI HII interface supported.
+# 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.
@@ -108,7 +108,7 @@
   PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
   DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
   DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
-
+  PeiServicesTablePointerLib|InOsEmuPkg/Library/PeiServicesTablePointerLibMagicPage/PeiServicesTablePointerLibMagicPage.inf
 
 [LibraryClasses.common.SEC]
   PeiServicesLib|InOsEmuPkg/Library/SecPeiServicesLib/SecPeiServicesLib.inf
@@ -130,8 +130,6 @@
   PpiListLib|InOsEmuPkg/Library/SecPpiListLib/SecPpiListLib.inf
   PeiServicesLib|InOsEmuPkg/Library/SecPeiServicesLib/SecPeiServicesLib.inf
 
-#  PeCoffExtraActionLib|InOsEmuPkg/Library/PeiEmuPeCoffExtraActionLib/PeiEmuPeCoffExtraActionLib.inf
-
 
 [LibraryClasses.common.PEIM, LibraryClasses.common.PEI_CORE]
   HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
@@ -144,11 +142,9 @@
 
 [LibraryClasses.common.PEI_CORE]
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
-  PeiServicesTablePointerLib|InOsEmuPkg/Library/PeiCoreServicesTablePointerLib/PeiCoreServicesTablePointerLib.inf
 
 [LibraryClasses.common.PEIM]
   PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
-  PeiServicesTablePointerLib|InOsEmuPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
 
 [LibraryClasses.common.DXE_CORE]
   HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
@@ -218,18 +214,21 @@
 #define BOOT_IN_RECOVERY_MODE                         0x20
   gInOsEmuPkgTokenSpaceGuid.PcdEmuBootMode|0
   
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuApCount|L"0"
+  gInOsEmuPkgTokenSpaceGuid.PcdEmuApCount|L"1"
 
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuPhysicalDisk|L"E:RW;245760;512"
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuVirtualDisk|L"FW;40960;512"
+  # For a CD-ROM/DVD use L"diag.dmg:RO:2048"
+  gInOsEmuPkgTokenSpaceGuid.PcdEmuVirtualDisk|L"disk.dmg:FW"
   gInOsEmuPkgTokenSpaceGuid.PcdEmuGop|L"GOP Window"
-  gInOsEmuPkgTokenSpaceGuid.PcdEmuFileSystem|L".!../../../../EdkShellBinPkg/Bin/Ia32/Apps"
+  gInOsEmuPkgTokenSpaceGuid.PcdEmuFileSystem|L".!../../../../EdkShellBinPkg/Bin"
   gInOsEmuPkgTokenSpaceGuid.PcdEmuSerialPort|L"/dev/ttyS0"
   gInOsEmuPkgTokenSpaceGuid.PcdEmuNetworkInterface|L"en0"
 
   gInOsEmuPkgTokenSpaceGuid.PcdEmuCpuModel|L"Intel(R) Processor Model"
   gInOsEmuPkgTokenSpaceGuid.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
@@ -268,7 +267,7 @@
 [Components]
 !if $(SEC_ONLY)
   ##
-  #  SEC Phase modules
+  #  Emulator, OS POSIX application
   ##
   InOsEmuPkg/Unix/Sec/SecMain.inf
 !else
@@ -317,7 +316,7 @@
   MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
   MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf {
    <LibraryClasses>
-      SerialPortLib|InOsEmuPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.inf    
+      SerialPortLib|InOsEmuPkg/Library/DxeEmuStdErrSerialPortLib/DxeEmuStdErrSerialPortLib.inf    
   }
 
   InOsEmuPkg/MetronomeDxe/Metronome.inf
@@ -342,9 +341,20 @@
   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|InOsEmuPkg/Library/DxeEmuSerialPortLib/DxeEmuSerialPortLib.inf    
+  }
+  
   MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
   IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
-  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
+  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf 
+  #{
+  #  <LibraryClasses>  
+  #    NULL|InOsEmuPkg/Library/DevicePathTextLib/DevicePathTextLib.inf
+  #}
+  
   MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
@@ -356,23 +366,14 @@
   InOsEmuPkg/EmuBusDriverDxe/EmuBusDriverDxe.inf
   InOsEmuPkg/EmuGopDxe/EmuGopDxe.inf
   InOsEmuPkg/EmuSimpleFileSystemDxe/EmuSimpleFileSystemDxe.inf
-
-!if $(0)
-  UnixPkg/UnixBlockIoDxe/UnixBlockIo.inf
-  UnixPkg/UnixSerialIoDxe/UnixSerialIo.inf
-  UnixPkg/UnixConsoleDxe/UnixConsole.inf
-  UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.inf
-!endif
+  InOsEmuPkg/EmuBlockIoDxe/EmuBlockIoDxe.inf
+  InOsEmuPkg/EmuSnpDxe/EmuSnpDxe.inf
 
   MdeModulePkg/Application/HelloWorld/HelloWorld.inf
 
   #
   # Network stack drivers
   #
-##!if $(NETWORK_SUPPORT) & $(0)
-!if $(0)
-  UnixPkg/UnixSnpDxe/UnixSnpDxe.inf
-!endif
   MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
   MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
   MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
@@ -413,6 +414,9 @@
       ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
       SortLib|ShellPkg/Library/UefiSortLib/UefiSortLib.inf
       PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
+#      SafeBlockIoLib|ShellPkg/Library/SafeBlockIoLib/SafeBlockIoLib.inf
+#      SafeOpenProtocolLib|ShellPkg/Library/SafeOpenProtocolLib/SafeOpenProtocolLib.inf
+
     <PcdsFixedAtBuild>
       gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF
       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE