Add in commented out hooks for Shell and FatPkg.

[mirror_edk2.git] / UnixPkg / UnixPkg.fdf

diff --git a/UnixPkg/UnixPkg.fdf b/UnixPkg/UnixPkg.fdf
index fe3bdb2004c24cbad7b0f34e62f969728b76091d..a967ba334b60b0d8b36a8cadf881d5e5905b54e0 100644 (file)
--- a/UnixPkg/UnixPkg.fdf
+++ b/UnixPkg/UnixPkg.fdf
@@ -25,8 +25,13 @@
 #\r
 ################################################################################\r
 [FD.Fv_Recovery]\r
-BaseAddress   = 0x0|gEfiUnixPkgTokenSpaceGuid.PcdUnixFdBaseAddress  #The base address of the FLASH Device.\r
-Size          = 0x002a0000                                           #The size in bytes of the FLASH Device\r
+#\r
+# In OS X PEIMs are really XIP, so we need to make this address match the malloced \r
+# buffer for the FD (0x41000000). If this address does not match the FV will get\r
+# relocated in place (works, but not a great idea).\r
+#\r
+BaseAddress   = 0x41000000|gEfiUnixPkgTokenSpaceGuid.PcdUnixFdBaseAddress   #The base address of the FLASH Device.\r
+Size          = 0x002a0000|gEfiUnixPkgTokenSpaceGuid.PcdUnixFirmwareFdSize  #The size in bytes of the FLASH Device\r
 ErasePolarity = 1\r
 BlockSize     = 0x10000\r
 NumBlocks     = 0x2a\r
@@ -73,9 +78,13 @@ DATA = {
   # Blockmap[1]: End\r
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
   ## This is the VARIABLE_STORE_HEADER\r
-  #Signature: "$VSS"      #Size: 0xc000 (gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize) - 0x48 (HeaderLength) = 0xBFB8\r
-                          # This can speed up the Variable Dispatch a bit.\r
-  0x24, 0x56, 0x53, 0x53, 0xB8, 0xBF, 0x00, 0x00,\r
+  #Signature: gEfiVariableGuid =\r
+  #  { 0xddcf3616, 0x3275, 0x4164, { 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d }}\r
+  0x16, 0x36, 0xcf, 0xdd, 0x75, 0x32, 0x64, 0x41,\r
+  0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d,\r
+  #Size: 0xc000 (gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize) - 0x48 (size of EFI_FIRMWARE_VOLUME_HEADER) = 0xBFB8\r
+  # This can speed up the Variable Dispatch a bit.\r
+  0xB8, 0xBF, 0x00, 0x00,\r
   #FORMATTED: 0x5A #HEALTHY: 0xFE #Reserved: UINT16 #Reserved1: UINT32\r
   0x5A, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r
 }\r
@@ -93,9 +102,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
@@ -149,19 +158,18 @@ 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  MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf\r
 INF  UnixPkg/UnixAutoScanPei/UnixAutoScan.inf\r
 INF  UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf\r
 INF  MdeModulePkg/Universal/Variable/Pei/VariablePei.inf\r
@@ -172,7 +180,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
@@ -185,7 +193,7 @@ INF  MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
 INF  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf\r
 INF  UnixPkg/UnixThunkDxe/UnixThunk.inf\r
 INF  UnixPkg/CpuRuntimeDxe/Cpu.inf\r
-INF  MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.inf\r
+INF  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf\r
 INF  IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf\r
 INF  UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf\r
 INF  UnixPkg/TimerDxe/Timer.inf\r
@@ -201,18 +209,20 @@ INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
 INF  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
 INF  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
 INF  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
-INF  IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
+INF  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
 INF  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf\r
 INF  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf\r
 INF  IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf\r
 INF  UnixPkg/UnixBusDriverDxe/UnixBusDriver.inf\r
  \r
+INF  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf\r
 INF  UnixPkg/UnixBlockIoDxe/UnixBlockIo.inf\r
 INF  UnixPkg/UnixSerialIoDxe/UnixSerialIo.inf\r
 INF  UnixPkg/UnixUgaDxe/UnixUga.inf\r
 #INF  UnixPkg/UnixConsoleDxe/UnixConsole.inf\r
 INF  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
-INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf  \r
+INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
+INF  MdeModulePkg/Universal/PrintDxe/PrintDxe.inf\r
 INF  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf \r
 INF  UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.inf\r
 INF  MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf\r
@@ -233,6 +243,8 @@ INF  MdeModulePkg/Application/HelloWorld/HelloWorld.inf
 #INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
 #INF  UnixPkg/SnpUnixDxe/SnpUnixDxe.inf\r
 \r
+#INF FatPkg/EnhancedFatDxe/Fat.inf\r
+\r
 \r
    \r
 ################################################################################\r
@@ -243,13 +255,15 @@ 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
+#        SECTION PE32 =Build/GccShellPkg/DEBUG_XCODE32/IA32/ShellFull.efi\r
       }\r
     }\r
   }\r
+\r
 FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {\r
     SECTION COMPRESS PI_STD {\r
       SECTION GUIDED {\r
@@ -257,7 +271,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
@@ -296,7 +311,7 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
 \r
 [Rule.Common.PEI_CORE]\r
   FILE PEI_CORE = $(NAMED_GUID) {\r
-    PE32     PE32           |.efi\r
+    PE32     PE32    Align=32       |.efi\r
     UI       STRING ="$(MODULE_NAME)" Optional         \r
     VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)    \r
   }\r
@@ -304,7 +319,7 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
 [Rule.Common.PEIM]\r
   FILE PEIM = $(NAMED_GUID) {\r
      PEI_DEPEX PEI_DEPEX Optional        |.depex\r
-     PE32      PE32                      |.efi\r
+     PE32      PE32   Align=32       |.efi\r
      UI       STRING="$(MODULE_NAME)" Optional         \r
      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)   \r
   }\r