X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=UnixPkg%2FUnixPkg.fdf;h=81929cfc59e66df88546d9619e6d887d7a8fb5ae;hp=956895697a9bf3bf3c7c54c3602a598b04b1c8fb;hb=b9c8e50e2054fc21c2029db309f813d03ccd6082;hpb=c71b65973b59d4eb4bf9b79c5fa59bb511c464ce diff --git a/UnixPkg/UnixPkg.fdf b/UnixPkg/UnixPkg.fdf index 956895697a..81929cfc59 100644 --- a/UnixPkg/UnixPkg.fdf +++ b/UnixPkg/UnixPkg.fdf @@ -1,8 +1,9 @@ +## @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.
# -# All rights reserved. This program and the accompanying materials +# This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License # which accompanies this distribution. The full text of the license may be found at # http://opensource.org/licenses/bsd-license.php @@ -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 @@ -73,9 +79,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 +103,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,16 +159,16 @@ 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 UnixPkg/UnixAutoScanPei/UnixAutoScan.inf @@ -171,7 +181,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 @@ -179,13 +189,11 @@ INF UnixPkg/ResetRuntimeDxe/Reset.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF UnixPkg/FvbServicesRuntimeDxe/UnixFwh.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf -INF IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf 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 IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf +INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf INF UnixPkg/MiscSubClassPlatformDxe/MiscSubClassDriver.inf INF UnixPkg/TimerDxe/Timer.inf INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf @@ -200,12 +208,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 @@ -228,42 +237,28 @@ 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 +# +# Build from source or use checked in binary +# +#INF FatPkg/EnhancedFatDxe/Fat.inf +INF RuleOverride = BINARY USE = IA32 FatBinPkg/EnhancedFatDxe/Fat.inf - -################################################################################ -# -# FILE statements are provided so that a platform integrator can include -# complete EFI FFS files, as well as a method for constructing FFS files -# using curly "{}" brace scoping. The following three FILEs are -# for binary shell, binary fat and logo module. -# -################################################################################ -FILE APPLICATION = c57ad6b7-0515-40a8-9d21-551652854e37 { - SECTION COMPRESS PI_STD { - SECTION GUIDED { - SECTION PE32 = EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi - } - } - } -FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F { - SECTION COMPRESS PI_STD { - SECTION GUIDED { - SECTION PE32 = FatBinPkg/EnhancedFatDxe/Ia32/Fat.efi - } - } - } -FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D { - SECTION COMPRESS PI_STD { - SECTION GUIDED { - SECTION RAW = MdeModulePkg/Logo/Logo.bmp - } - } - } +# If you build GccShellPkg you can source level debug shell +#FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) { +# SECTION PE32 =Build/GccShellPkg/DEBUG_XCODE32/IA32/ShellFull.efi +#} +INF RuleOverride = BINARY USE = IA32 EdkShellBinPkg/FullShell/FullShell.inf + + +FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { + SECTION RAW = MdeModulePkg/Logo/Logo.bmp +} ################################################################################ @@ -282,10 +277,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) # } @@ -296,33 +291,23 @@ 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 - GUIDED A31280AD-481E-41B6-95E8-127F4C984779 PROCESSING_REQUIRED = TRUE { - PE32 PE32 |.efi - UI STRING="$(MODULE_NAME)" Optional - VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) - } - } - [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) } @@ -330,10 +315,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) } @@ -342,10 +327,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) } @@ -354,10 +339,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) } @@ -368,9 +353,26 @@ 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) } } } + + +[Rule.Common.UEFI_DRIVER.BINARY] + FILE DRIVER = $(NAMED_GUID) { + DXE_DEPEX DXE_DEPEX Optional |.depex + PE32 PE32 |.efi + UI STRING="$(MODULE_NAME)" Optional + VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) + } + +[Rule.Common.UEFI_APPLICATION.BINARY] + FILE APPLICATION = $(NAMED_GUID) { + PE32 PE32 |.efi + UI STRING="$(MODULE_NAME)" Optional + VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) + } +