X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=UnixPkg%2FUnixPkg.fdf;h=5bdfffbac0e2f878f92264af8658ccdc3812091a;hp=d8e6fb34537020d2b3bba37ce24a9e3612206e28;hb=0534bb8fd6228d5472d494d69ab4e0e8ffb2d397;hpb=ecd8990a25c801a426ac8ef24b70fb023ef5343d

diff --git a/UnixPkg/UnixPkg.fdf b/UnixPkg/UnixPkg.fdf
index d8e6fb3453..5bdfffbac0 100644
--- a/UnixPkg/UnixPkg.fdf
+++ b/UnixPkg/UnixPkg.fdf
@@ -25,8 +25,13 @@
 #
 ################################################################################
 [FD.Fv_Recovery]
-BaseAddress   = 0x0|gEfiUnixPkgTokenSpaceGuid.PcdUnixFdBaseAddress  #The base address of the FLASH Device.
-Size          = 0x002a0000                                           #The size in bytes of the FLASH Device
+#
+# 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   = 0x41000000|gEfiUnixPkgTokenSpaceGuid.PcdUnixFdBaseAddress   #The base address of the FLASH Device.
+Size          = 0x002a0000|gEfiUnixPkgTokenSpaceGuid.PcdUnixFirmwareFdSize  #The size in bytes of the FLASH Device
 ErasePolarity = 1
 BlockSize     = 0x10000
 NumBlocks     = 0x2a
@@ -153,7 +158,7 @@ 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  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
@@ -162,7 +167,7 @@ APRIORI DXE {
   }
 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  UnixPkg/UnixAutoScanPei/UnixAutoScan.inf
@@ -204,12 +209,13 @@ 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  IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.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  UnixPkg/UnixBusDriverDxe/UnixBusDriver.inf
  
+INF  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
 INF  UnixPkg/UnixBlockIoDxe/UnixBlockIo.inf
 INF  UnixPkg/UnixSerialIoDxe/UnixSerialIo.inf
 INF  UnixPkg/UnixUgaDxe/UnixUga.inf
@@ -237,6 +243,8 @@ INF  MdeModulePkg/Application/HelloWorld/HelloWorld.inf
 #INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
 #INF  UnixPkg/SnpUnixDxe/SnpUnixDxe.inf
 
+#INF FatPkg/EnhancedFatDxe/Fat.inf
+
 
    
 ################################################################################
@@ -247,13 +255,16 @@ INF  MdeModulePkg/Application/HelloWorld/HelloWorld.inf
 # for binary shell, binary fat and logo module.
 #  
 ################################################################################
-FILE APPLICATION = c57ad6b7-0515-40a8-9d21-551652854e37 {
+FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {
     SECTION COMPRESS PI_STD {
       SECTION GUIDED {
-        SECTION PE32 = EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi
+#        SECTION PE32 = EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi
+#        SECTION PE32 =Build/GccShellPkg/DEBUG_XCODE32/IA32/ShellFull.efi
+        SECTION PE32 = Build/Unix/DEBUG_XCODE32/IA32/Ebl.efi
       }
     }
   }
+
 FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {
     SECTION COMPRESS PI_STD {
       SECTION GUIDED {
@@ -261,7 +272,8 @@ FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {
       }
     }
   }
-FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
+
+FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
     SECTION COMPRESS PI_STD {
       SECTION GUIDED {
         SECTION RAW = MdeModulePkg/Logo/Logo.bmp
@@ -300,7 +312,7 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
 
 [Rule.Common.PEI_CORE]
   FILE PEI_CORE = $(NAMED_GUID) {
-    PE32     PE32           |.efi
+    PE32     PE32    Align=32       |.efi
     UI       STRING ="$(MODULE_NAME)" Optional         
     VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)    
   }
@@ -308,7 +320,7 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
 [Rule.Common.PEIM]
   FILE PEIM = $(NAMED_GUID) {
      PEI_DEPEX PEI_DEPEX Optional        |.depex
-     PE32      PE32                      |.efi
+     PE32      PE32   Align=32       |.efi
      UI       STRING="$(MODULE_NAME)" Optional         
      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)   
   }