X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=UnixPkg%2FUnixPkg.fdf;h=cff698479fc97ae5b7f5f34d326b6ad708a9be3a;hb=ec87b52aaf3f9b87dba2e27d2657ad808e9c177f;hp=945c7ef210fedd9fa75b0e5124da6d3cb4a6ec01;hpb=804405e7d10525e41720216137b2551f62a0663f;p=mirror_edk2.git

diff --git a/UnixPkg/UnixPkg.fdf b/UnixPkg/UnixPkg.fdf
index 945c7ef210..cff698479f 100644
--- a/UnixPkg/UnixPkg.fdf
+++ b/UnixPkg/UnixPkg.fdf
@@ -73,9 +73,13 @@ DATA = {
   # Blockmap[1]: End
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   ## This is the VARIABLE_STORE_HEADER
-  #Signature: "$VSS"      #Size: 0xc000 (gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize) - 0x48 (HeaderLength) = 0xBFB8
-                          # This can speed up the Variable Dispatch a bit.
-  0x24, 0x56, 0x53, 0x53, 0xB8, 0xBF, 0x00, 0x00,
+  #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
 }
@@ -93,9 +97,9 @@ DATA = {
   0x8D, 0x2B, 0xF1, 0xFF, 0x96, 0x76, 0x8B, 0x4C,
   0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50,
   # Crc:UINT32            #WorkingBlockValid:1, WorkingBlockInvalid:1, Reserved
-  0x85, 0xae, 0x2d, 0xbf, 0xFE, 0xFF, 0xFF, 0xFF,
-  # WriteQueueSize: UINT32
-  0xE4, 0x1F, 0x00, 0x00
+  0x77, 0x13, 0x9B, 0xD7, 0xFE, 0xFF, 0xFF, 0xFF,
+  # WriteQueueSize: UINT64
+  0xE0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 }
 
 0x00290000|0x00010000
@@ -149,19 +153,18 @@ READ_LOCK_STATUS   = TRUE
 ##
 APRIORI PEI {
   INF  MdeModulePkg/Universal/PCD/Pei/Pcd.inf
-  INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
+  INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
   }
 APRIORI DXE {
-  INF  IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
   INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
+  INF  IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
   INF  UnixPkg/MetronomeDxe/Metronome.inf
   }
 INF  MdeModulePkg/Core/Pei/PeiMain.inf
 INF  MdeModulePkg/Universal/PCD/Pei/Pcd.inf
-INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
+INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
 INF  UnixPkg/BootModePei/BootModePei.inf
 INF  UnixPkg/UnixFlashMapPei/FlashMap.inf
-INF  MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf
 INF  UnixPkg/UnixAutoScanPei/UnixAutoScan.inf
 INF  UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf
 INF  MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
@@ -172,7 +175,7 @@ INF  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
 #  DXE Phase modules
 ##
 INF  MdeModulePkg/Core/Dxe/DxeMain.inf
-INF  IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
+INF  IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
 INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
 INF  UnixPkg/MetronomeDxe/Metronome.inf
 INF  UnixPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf
@@ -185,7 +188,7 @@ INF  MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
 INF  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
 INF  UnixPkg/UnixThunkDxe/UnixThunk.inf
 INF  UnixPkg/CpuRuntimeDxe/Cpu.inf
-INF  MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.inf
+INF  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
 INF  IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf
 INF  UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf
 INF  UnixPkg/TimerDxe/Timer.inf
@@ -210,10 +213,11 @@ INF  UnixPkg/UnixBusDriverDxe/UnixBusDriver.inf
 INF  UnixPkg/UnixBlockIoDxe/UnixBlockIo.inf
 INF  UnixPkg/UnixSerialIoDxe/UnixSerialIo.inf
 INF  UnixPkg/UnixUgaDxe/UnixUga.inf
-INF  UnixPkg/UnixConsoleDxe/UnixConsole.inf
+#INF  UnixPkg/UnixConsoleDxe/UnixConsole.inf
 INF  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
-INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf  
-INF  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf 
+INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
+INF  MdeModulePkg/Universal/PrintDxe/PrintDxe.inf
+INF  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf 
 INF  UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.inf
 INF  MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
 INF  MdeModulePkg/Application/HelloWorld/HelloWorld.inf
@@ -246,7 +250,7 @@ INF  MdeModulePkg/Application/HelloWorld/HelloWorld.inf
 FILE APPLICATION = c57ad6b7-0515-40a8-9d21-551652854e37 {
     SECTION COMPRESS PI_STD {
       SECTION GUIDED {
-        SECTION PE32 = EdkShellBinPkg/FullShell/ia32/Shell_Full.efi
+        SECTION PE32 = EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi
       }
     }
   }
@@ -310,7 +314,7 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
   }
 
 [Rule.Common.PEIM.TIANOCOMPRESSED]
-  FILE PEIM = $(NAMED_GUID) DEBUG_MYTOOLS_IA32 {
+  FILE PEIM = $(NAMED_GUID) {
     PEI_DEPEX PEI_DEPEX Optional         |.depex
     GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {
       PE32      PE32                     |.efi