X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=UnixPkg%2FUnixPkg.fdf;h=5bdfffbac0e2f878f92264af8658ccdc3812091a;hp=aca7a3ab0e93965091b2d67fa9f97dbbecfbf709;hb=0534bb8fd6228d5472d494d69ab4e0e8ffb2d397;hpb=dfb8993c3c35616d2e986d000cea855b1f6b43ac diff --git a/UnixPkg/UnixPkg.fdf b/UnixPkg/UnixPkg.fdf index aca7a3ab0e..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 @@ -73,9 +78,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 +102,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 +158,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 MdeModulePkg/Universal/PCD/Dxe/Pcd.inf - INF IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.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 +180,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 +193,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 @@ -201,19 +209,21 @@ 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 #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 @@ -233,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 + ################################################################################ @@ -243,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 { @@ -257,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 @@ -296,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) } @@ -304,13 +320,13 @@ 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) } [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