X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=UnixPkg%2FUnixPkg.fdf;h=1a2173d13c76ce018aac62f6d8d570e0f05235ee;hb=7e3538510fd79177efd1fc9b7937d02d94d2eaae;hp=cff698479fc97ae5b7f5f34d326b6ad708a9be3a;hpb=029940387f2307c62109196763cef1896e615c9a;p=mirror_edk2.git

diff --git a/UnixPkg/UnixPkg.fdf b/UnixPkg/UnixPkg.fdf
index cff698479f..1a2173d13c 100644
--- a/UnixPkg/UnixPkg.fdf
+++ b/UnixPkg/UnixPkg.fdf
@@ -1,6 +1,7 @@
+## @file
 # This is Unix FDF file with UEFI HII features enabled
 #
-# Copyright (c) 2008, Intel Corporation
+# Copyright (c) 2008 - 2010, Intel Corporation
 #
 #  All rights reserved. This program and the accompanying materials
 #    are licensed and made available under the terms and conditions of the BSD License
@@ -25,8 +26,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
@@ -204,12 +210,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
@@ -232,11 +239,14 @@ INF  MdeModulePkg/Application/HelloWorld/HelloWorld.inf
 #INF  MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
 #INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
 #INF  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
+#INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
 #INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
 #INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
 #INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
 #INF  UnixPkg/SnpUnixDxe/SnpUnixDxe.inf
 
+#INF FatPkg/EnhancedFatDxe/Fat.inf
+
 
    
 ################################################################################
@@ -247,13 +257,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 =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 +274,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
@@ -286,10 +300,10 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
 #  
 #[Rule.Common.DXE_DRIVER]
 #  FILE DRIVER = $(NAMED_GUID) {
-#    DXE_DEPEX    DXE_DEPEX Optional      |.depex
+#    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex
 #    COMPRESS PI_STD {
 #      GUIDED {
-#        PE32     PE32                    |.efi
+#        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi
 #        UI       STRING="$(MODULE_NAME)" Optional
 #        VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
 #      }
@@ -300,24 +314,24 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
 
 [Rule.Common.PEI_CORE]
   FILE PEI_CORE = $(NAMED_GUID) {
-    PE32     PE32           |.efi
+    PE32     PE32    Align=32       $(INF_OUTPUT)/$(MODULE_NAME).efi
     UI       STRING ="$(MODULE_NAME)" Optional         
     VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)    
   }
 
 [Rule.Common.PEIM]
   FILE PEIM = $(NAMED_GUID) {
-     PEI_DEPEX PEI_DEPEX Optional        |.depex
-     PE32      PE32                      |.efi
+     PEI_DEPEX PEI_DEPEX Optional        $(INF_OUTPUT)/$(MODULE_NAME).depex
+     PE32      PE32   Align=32       $(INF_OUTPUT)/$(MODULE_NAME).efi
      UI       STRING="$(MODULE_NAME)" Optional         
      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)   
   }
 
 [Rule.Common.PEIM.TIANOCOMPRESSED]
   FILE PEIM = $(NAMED_GUID) {
-    PEI_DEPEX PEI_DEPEX Optional         |.depex
+    PEI_DEPEX PEI_DEPEX Optional         $(INF_OUTPUT)/$(MODULE_NAME).depex
     GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE {
-      PE32      PE32                     |.efi
+      PE32      PE32                     $(INF_OUTPUT)/$(MODULE_NAME).efi
       UI        STRING="$(MODULE_NAME)" Optional
       VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
     }
@@ -326,7 +340,7 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
 [Rule.Common.DXE_CORE]
   FILE DXE_CORE = $(NAMED_GUID) {
     COMPRESS PI_STD {
-      PE32     PE32           |.efi
+      PE32     PE32           $(INF_OUTPUT)/$(MODULE_NAME).efi
       UI       STRING="$(MODULE_NAME)" Optional
       VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
     }
@@ -334,10 +348,10 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
 
 [Rule.Common.UEFI_DRIVER]
   FILE DRIVER = $(NAMED_GUID) {
-    DXE_DEPEX    DXE_DEPEX Optional      |.depex
+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex
     COMPRESS PI_STD {
       GUIDED {
-        PE32     PE32                    |.efi
+        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi
         UI       STRING="$(MODULE_NAME)" Optional
         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
       }
@@ -346,10 +360,10 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
 
 [Rule.Common.DXE_DRIVER]
   FILE DRIVER = $(NAMED_GUID) {
-    DXE_DEPEX    DXE_DEPEX Optional      |.depex
+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex
     COMPRESS PI_STD {
       GUIDED {
-        PE32     PE32                    |.efi
+        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi
         UI       STRING="$(MODULE_NAME)" Optional
         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
       }
@@ -358,10 +372,10 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
 
 [Rule.Common.DXE_RUNTIME_DRIVER]
   FILE DRIVER = $(NAMED_GUID) {
-    DXE_DEPEX    DXE_DEPEX Optional      |.depex
+    DXE_DEPEX    DXE_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex
     COMPRESS PI_STD {
       GUIDED {
-        PE32     PE32                    |.efi
+        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi
         UI       STRING="$(MODULE_NAME)" Optional
         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
       }
@@ -372,7 +386,7 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
   FILE APPLICATION = $(NAMED_GUID) {
     COMPRESS PI_STD {
       GUIDED {
-        PE32     PE32                    |.efi
+        PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi
         UI       STRING="$(MODULE_NAME)" Optional
         VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
       }