X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=OvmfPkg%2FOvmfPkgIa32X64.fdf;h=b6866e137b4974744b4082be1e16f3133f200874;hp=239d214dadf90bf638bd7f1d8fac392982bf68e2;hb=51866b5465c1d316a66d7c697f7e14ee293e1064;hpb=49ba9447c92d6fca214476381107a180d08e59d1 diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index 239d214dad..b6866e137b 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -1,7 +1,7 @@ -#/** @file +## @file # Open Virtual Machine Firmware: FDF # -# Copyright (c) 2006 - 2009, Intel Corporation +# Copyright (c) 2006 - 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 @@ -11,60 +11,68 @@ # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # -#**/ +## ################################################################################ -# -# FD Section -# The [FD] Section is made up of the definition statements and a -# description of what goes into the Flash Device Image. Each FD section -# defines one flash "device" image. A flash device image may be one of -# the following: Removable media bootable image (like a boot floppy -# image,) an Option ROM image (that would be "flashed" into an add-in -# card,) a System "Flash" image (that would be burned into a system's -# flash) or an Update ("Capsule") image that will be used to update and -# existing system flash. -# +[FD.SEC] +BaseAddress = 0xFFFEE000 +Size = 0x00012000 +ErasePolarity = 1 +BlockSize = 0x1000 +NumBlocks = 0x12 + +0x0|0x12000 +FV = SECFV + ################################################################################ -[FD.OVMF] -BaseAddress = 0xFFE00000 # The base address of the FLASH Device. -Size = 0x00200000 # The size in bytes of the FLASH Device + +[FD.MEMFD] +BaseAddress = 0x800000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvBase +Size = 0x400000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize ErasePolarity = 1 BlockSize = 0x10000 -NumBlocks = 0x20 +NumBlocks = 0x40 -################################################################################ -# -# Following are lists of FD Region layout which correspond to the locations of different -# images within the flash device. -# -# Regions must be defined in ascending order and may not overlap. -# -# A Layout Region start with a eight digit hex offset (leading "0x" required) followed by -# the pipe "|" character, followed by the size of the region, also in hex with the leading -# "0x" characters. Like: -# Offset|Size -# PcdOffsetCName|PcdSizeCName -# RegionType -# -################################################################################ -0x0|0x200000 -gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashFvRecoveryBase|gEfiUnixPkgTokenSpaceGuid.PcdUnixFlashFvRecoverySize +0x0|0x400000 FV = MAINFV ################################################################################ + +[FV.SECFV] +BlockSize = 0x1000 +FvAlignment = 16 +ERASE_POLARITY = 1 +MEMORY_MAPPED = TRUE +STICKY_WRITE = TRUE +LOCK_CAP = TRUE +LOCK_STATUS = TRUE +WRITE_DISABLED_CAP = TRUE +WRITE_ENABLED_CAP = TRUE +WRITE_STATUS = TRUE +WRITE_LOCK_CAP = TRUE +WRITE_LOCK_STATUS = TRUE +READ_DISABLED_CAP = TRUE +READ_ENABLED_CAP = TRUE +READ_STATUS = TRUE +READ_LOCK_CAP = TRUE +READ_LOCK_STATUS = TRUE + # -# FV Section +# SEC Phase modules # -# [FV] section is used to define what components or modules are placed within a flash -# device file. This section also defines order the components and modules are positioned -# within the image. The [FV] section consists of define statements, set statements and -# module statements. +# The code in this FV handles the initial firmware startup, and +# decompresses the MAINFV which handles the majority of the boot sequence. # +INF OvmfPkg/Sec/SecMain.inf + +FILE RAW = 1BA0062E-C779-4582-8566-336AE8F78F09 { + SECTION RAW = UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.ia32.raw + } + ################################################################################ -[FV.DXEFV] -BlockSize = 0x1000 -FvAlignment = 16 #FV alignment and FV attributes setting. +[FV.MAINFV] +BlockSize = 0x10000 +FvAlignment = 16 ERASE_POLARITY = 1 MEMORY_MAPPED = TRUE STICKY_WRITE = TRUE @@ -82,7 +90,7 @@ READ_LOCK_CAP = TRUE READ_LOCK_STATUS = TRUE # -# Files to be placed in DXEFV +# Files to be placed in MAIN FV # # This firmware volume will have files placed in it uncompressed, # and then then entire firmware volume will be compressed in a @@ -90,6 +98,46 @@ READ_LOCK_STATUS = TRUE # overall compression. # +APRIORI PEI { + INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf +} + +# +# PEI Phase modules +# +INF MdeModulePkg/Core/Pei/PeiMain.inf +INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf +INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf +INF OvmfPkg/PlatformPei/PlatformPei.inf +INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf + +FILE FV_IMAGE = A4EF5A93-3F1B-4232-A1C4-F0910E6D1D9C { + SECTION COMPRESS PI_NONE { + SECTION FV_IMAGE = DXEFV + } +} + +################################################################################ + +[FV.DXEFV] +BlockSize = 0x10000 +FvAlignment = 16 +ERASE_POLARITY = 1 +MEMORY_MAPPED = TRUE +STICKY_WRITE = TRUE +LOCK_CAP = TRUE +LOCK_STATUS = TRUE +WRITE_DISABLED_CAP = TRUE +WRITE_ENABLED_CAP = TRUE +WRITE_STATUS = TRUE +WRITE_LOCK_CAP = TRUE +WRITE_LOCK_STATUS = TRUE +READ_DISABLED_CAP = TRUE +READ_ENABLED_CAP = TRUE +READ_STATUS = TRUE +READ_LOCK_CAP = TRUE +READ_LOCK_STATUS = TRUE + APRIORI DXE { INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf @@ -107,17 +155,20 @@ INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf INF IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf +INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf INF PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf -INF UefiCpuPkg/CpuIoDxe/CpuIo.inf +INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf INF UefiCpuPkg/CpuDxe/CpuDxe.inf INF PcAtChipsetPkg/8254TimerDxe/8254Timer.inf INF PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf -INF IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf +INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf INF PcAtChipsetPkg/KbcResetDxe/Reset.inf INF MdeModulePkg/Universal/Metronome/Metronome.inf -INF PcAtChipsetPkg/PcRtc/RealTimeClock.inf +INF PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf -INF MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf +INF OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf +INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf +INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf @@ -127,6 +178,7 @@ INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf +INF MdeModulePkg/Universal/PrintDxe/PrintDxe.inf INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf @@ -137,8 +189,6 @@ INF PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeControllerDxe.inf INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf -INF OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf - INF PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf INF IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf INF IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf @@ -153,11 +203,11 @@ FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F { SECTION PE32 = FatBinPkg/EnhancedFatDxe/X64/Fat.efi } -FILE APPLICATION = c57ad6b7-0515-40a8-9d21-551652854e37 { +FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) { SECTION PE32 = EdkShellBinPkg/FullShell/X64/Shell_full.efi } -FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D { +FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE { # LzmaCompress SECTION RAW = MdeModulePkg/Logo/Logo.bmp } @@ -165,7 +215,8 @@ FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D { ################################################################################ -[FV.MAINFV] +[FV.OVMF] +BlockSize = 0x10000 FvAlignment = 16 ERASE_POLARITY = 1 MEMORY_MAPPED = TRUE @@ -184,83 +235,64 @@ READ_LOCK_CAP = TRUE READ_LOCK_STATUS = TRUE # -# Files to be placed in MAINFV -# -# This firmware volume will have all the files placed in it which -# must not be compressed at the initial boot phase. The only -# exception to this is the compressed 'DXEFV'. -# - -APRIORI PEI { - INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf -} - -# -# SEC Phase modules -# -INF OvmfPkg/Sec/SecMain.inf - -# -# PEI Phase modules -# -INF MdeModulePkg/Core/Pei/PeiMain.inf -INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf -INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf -INF OvmfPkg/PlatformPei/PlatformPei.inf -INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf - -# -# This file contains the compressed 'DXEFV', which is compressed +# This file contains the compressed MAINFV, which is compressed # in a single compression operation in order to achieve better # overall compression. # FILE FV_IMAGE = 20bc8ac9-94d1-4208-ab28-5d673fd73486 { SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE { # LzmaCompress - SECTION FV_IMAGE = DXEFV + SECTION FV_IMAGE = MAINFV } } -FILE RAW = 1BA0062E-C779-4582-8566-336AE8F78F09 { - SECTION RAW = OvmfPkg/ResetVector/Bin/ResetVector.ia32.raw - } - - -################################################################################ # -# Rules are use with the [FV] section's module INF type to define -# how an FFS file is created for a given INF file. The following Rule are the default -# rules for the different module type. User can add the customized rules to define the -# content of the FFS file. +# This file contains the uncompressed SECFV, which contains the initial +# boot code. The code in this FV decompresses the MAINFV. +# +# It uses the Volume Top File (VTF) GUID so it will be placed at the +# end of the FV. # +FILE FREEFORM = 1BA0062E-C779-4582-8566-336AE8F78F09 { + SECTION Align=16 FV_IMAGE = SECFV +} + ################################################################################ [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.SEC] FILE SEC = $(NAMED_GUID) { - 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.PEIM.NORELOC] + FILE PEIM = $(NAMED_GUID) RELOCS_STRIPPED { + PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex + TE TE $(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) } @@ -268,43 +300,43 @@ FILE RAW = 1BA0062E-C779-4582-8566-336AE8F78F09 { [Rule.Common.DXE_CORE] FILE DXE_CORE = $(NAMED_GUID) { - 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] FILE DRIVER = $(NAMED_GUID) { - DXE_DEPEX DXE_DEPEX Optional |.depex - PE32 PE32 |.efi + DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex + PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi UI STRING="$(MODULE_NAME)" Optional VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) } [Rule.Common.DXE_DRIVER] FILE DRIVER = $(NAMED_GUID) { - DXE_DEPEX DXE_DEPEX Optional |.depex - PE32 PE32 |.efi + DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex + PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi UI STRING="$(MODULE_NAME)" Optional VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) } [Rule.Common.DXE_RUNTIME_DRIVER] FILE DRIVER = $(NAMED_GUID) { - DXE_DEPEX DXE_DEPEX Optional |.depex - PE32 PE32 |.efi + DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex + PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi UI STRING="$(MODULE_NAME)" Optional VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) } [Rule.Common.UEFI_APPLICATION] FILE APPLICATION = $(NAMED_GUID) { - 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.DXE_DRIVER.ACPITABLE] +[Rule.Common.USER_DEFINED.ACPITABLE] FILE FREEFORM = $(NAMED_GUID) { RAW ACPI |.acpi RAW ASL |.aml @@ -315,3 +347,8 @@ FILE RAW = 1BA0062E-C779-4582-8566-336AE8F78F09 { RAW RAW |.raw } +[OptionRom.CirrusLogic5446] +INF OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf { + PCI_DEVICE_ID = 0x00B8 + } +