Use Uefi.h instead of PiDxe.h, because B0 defined in Protocol/DebugSupport.h conflict...

[mirror_edk2.git] / UnixPkg / UnixPkg.fdf

diff --git a/UnixPkg/UnixPkg.fdf b/UnixPkg/UnixPkg.fdf
index ce776c53b6f14ea919a3145e8eb231669e463d1f..bae66cdd4ab1a8cbe1e67fb0a9daf70aa5b93ceb 100644 (file)
--- a/UnixPkg/UnixPkg.fdf
+++ b/UnixPkg/UnixPkg.fdf
@@ -97,9 +97,9 @@ DATA = {
   0x8D, 0x2B, 0xF1, 0xFF, 0x96, 0x76, 0x8B, 0x4C,\r
   0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50,\r
   # Crc:UINT32            #WorkingBlockValid:1, WorkingBlockInvalid:1, Reserved\r
-  0x85, 0xae, 0x2d, 0xbf, 0xFE, 0xFF, 0xFF, 0xFF,\r
-  # WriteQueueSize: UINT32\r
-  0xE4, 0x1F, 0x00, 0x00\r
+  0x77, 0x13, 0x9B, 0xD7, 0xFE, 0xFF, 0xFF, 0xFF,\r
+  # WriteQueueSize: UINT64\r
+  0xE0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r
 }\r
 \r
 0x00290000|0x00010000\r
@@ -153,16 +153,16 @@ READ_LOCK_STATUS   = TRUE
 ##\r
 APRIORI PEI {\r
   INF  MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
-  INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf\r
+  INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf\r
   }\r
 APRIORI DXE {\r
   INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
-  INF  IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf\r
+  INF  IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf\r
   INF  UnixPkg/MetronomeDxe/Metronome.inf\r
   }\r
 INF  MdeModulePkg/Core/Pei/PeiMain.inf\r
 INF  MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
-INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf\r
+INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf\r
 INF  UnixPkg/BootModePei/BootModePei.inf\r
 INF  UnixPkg/UnixFlashMapPei/FlashMap.inf\r
 INF  UnixPkg/UnixAutoScanPei/UnixAutoScan.inf\r
@@ -175,7 +175,7 @@ INF  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
 #  DXE Phase modules\r
 ##\r
 INF  MdeModulePkg/Core/Dxe/DxeMain.inf\r
-INF  IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf\r
+INF  IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf\r
 INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
 INF  UnixPkg/MetronomeDxe/Metronome.inf\r
 INF  UnixPkg/RealTimeClockRuntimeDxe/RealTimeClock.inf\r
@@ -247,13 +247,14 @@ INF  MdeModulePkg/Application/HelloWorld/HelloWorld.inf
 # for binary shell, binary fat and logo module.\r
 #  \r
 ################################################################################\r
-FILE APPLICATION = c57ad6b7-0515-40a8-9d21-551652854e37 {\r
+FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {\r
     SECTION COMPRESS PI_STD {\r
       SECTION GUIDED {\r
         SECTION PE32 = EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi\r
       }\r
     }\r
   }\r
+\r
 FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {\r
     SECTION COMPRESS PI_STD {\r
       SECTION GUIDED {\r
@@ -261,7 +262,8 @@ FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {
       }\r
     }\r
   }\r
-FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {\r
+\r
+FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
     SECTION COMPRESS PI_STD {\r
       SECTION GUIDED {\r
         SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r