VirtualBox

Ignore:
Timestamp:
Mar 12, 2019 12:40:12 PM (6 years ago)
Author:
vboxsync
Message:

EFI: First step in UDK2018 merge. Does not build yet.

Location:
trunk/src/VBox/Devices/EFI/FirmwareNew
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/EFI/FirmwareNew

  • trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/OvmfPkgIa32.fdf

    r58839 r77662  
    22#  Open Virtual Machine Firmware: FDF
    33#
    4 #  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
     4#  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
     5#  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
    56#
    67#  This program and the accompanying materials
    … …  
    1617################################################################################
    1718
    18 #
    19 # Default flash size for DEBUG build is 2MB. For RELEASE it is 1MB.
    20 #
    21 # Defining FD_SIZE_1MB or FD_SIZE_2MB on the build command line can
    22 # override this.
    23 #
    2419[Defines]
    25 !if $(TARGET) == RELEASE
    26 !ifndef $(FD_SIZE_2MB)
    27 DEFINE FD_SIZE_1MB=
    28 !endif
    29 !endif
    30 
    3120!include OvmfPkg.fdf.inc
    3221
    … …  
    8069[FD.MEMFD]
    8170!ifndef $(VBOX)
    82   BaseAddress   = 0x800000
     71BaseAddress   = $(MEMFD_BASE_ADDRESS)
    8372!else
    84   # Need to relocate this or it interferes with certain OS X bootloaders breaking OS X guests
    85   BaseAddress   = 0x2000000
    86 !endif
    87 Size          = 0x900000
     73# Need to relocate this or it interferes with certain OS X bootloaders breaking OS X guests
     74BaseAddress   = 0x2000000
     75!endif
     76Size          = 0xB00000
    8877ErasePolarity = 1
    8978BlockSize     = 0x10000
    90 NumBlocks     = 0x90
     79NumBlocks     = 0xB0
    9180
    92810x000000|0x006000
    … …  
    9988gEfiMdePkgTokenSpaceGuid.PcdGuidedExtractHandlerTableAddress|gUefiOvmfPkgTokenSpaceGuid.PcdGuidedExtractHandlerTableSize
    10089
    101 0x010000|0x008000
     900x010000|0x010000
    10291gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamSize
    103 
    104 0x018000|0x008000
    105 gUefiOvmfPkgTokenSpaceGuid.PcdS3AcpiReservedMemoryBase|gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3AcpiReservedMemorySize
    10692
    107930x020000|0x0E0000
    … …  
    10995FV = PEIFV
    11096
    111 0x100000|0x800000
     970x100000|0xA00000
    11298gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvSize
    11399FV = DXEFV
    … …  
    116102
    117103[FV.SECFV]
     104FvNameGuid         = 763BED0D-DE9F-48F5-81F1-3E90E1B1A015
    118105BlockSize          = 0x1000
    119106FvAlignment        = 16
    … …  
    146133################################################################################
    147134[FV.PEIFV]
     135FvNameGuid         = 6938079B-B503-4E3D-9D24-B28337A25806
    148136BlockSize          = 0x10000
    149137FvAlignment        = 16
    … …  
    173161INF  MdeModulePkg/Core/Pei/PeiMain.inf
    174162INF  MdeModulePkg/Universal/PCD/Pei/Pcd.inf
    175 INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf
     163INF  MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
     164INF  MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
    176165INF  OvmfPkg/PlatformPei/PlatformPei.inf
    177166INF  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
    178167INF  UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
     168!if $(SMM_REQUIRE) == TRUE
     169INF  OvmfPkg/SmmAccess/SmmAccessPei.inf
     170!endif
     171INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf
    179172
    180173################################################################################
    181174
    182175[FV.DXEFV]
     176FvForceRebase      = FALSE
     177FvNameGuid         = 7CB8BDC9-F8EB-4F34-AAEA-3EE4AF6516A1
    183178BlockSize          = 0x10000
    184179FvAlignment        = 16
    … …  
    202197  INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
    203198  INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
    204 !ifndef $(VBOX)
     199!if $(SMM_REQUIRE) == FALSE
    205200  INF  OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
    206201!endif
    … …  
    212207INF  MdeModulePkg/Core/Dxe/DxeMain.inf
    213208
    214 INF  IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
     209INF  MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
     210INF  MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
    215211INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
    216212
    … …  
    222218INF  UefiCpuPkg/CpuDxe/CpuDxe.inf
    223219INF  PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
    224 INF  PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
     220INF  OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf
     221INF  OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf
     222INF  MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
    225223INF  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
    226 INF  PcAtChipsetPkg/KbcResetDxe/Reset.inf
     224INF  MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
    227225INF  MdeModulePkg/Universal/Metronome/Metronome.inf
    228226INF  PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
    … …  
    231229INF  OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf
    232230!ifndef $(VBOX)
     231INF  OvmfPkg/Virtio10Dxe/Virtio10.inf
    233232INF  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
    234233INF  OvmfPkg/VirtioScsiDxe/VirtioScsi.inf
    235 INF  OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
    236 !endif
    237 INF  OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf
    238 !ifndef $(VBOX)
    239 INF  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
     234INF  OvmfPkg/VirtioRngDxe/VirtioRng.inf
     235INF  OvmfPkg/XenIoPciDxe/XenIoPciDxe.inf
     236INF  OvmfPkg/XenBusDxe/XenBusDxe.inf
     237INF  OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.inf
     238!endif
     239
    240240!if $(SECURE_BOOT_ENABLE) == TRUE
    241   INF  SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf
    242   INF  OvmfPkg/SecureBootConfigDxe/SecureBootConfigDxe.inf
    243 !else
    244   INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
    245 !endif
    246 !else
    247 INF  MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
    248 !endif
     241  INF  SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
     242!endif
     243
    249244INF  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
    250245INF  MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
    … …  
    254249INF  MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
    255250INF  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
    256 INF  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
     251INF  MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf
     252INF  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
     253INF  MdeModulePkg/Application/UiApp/UiApp.inf
    257254INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
    258255INF  MdeModulePkg/Universal/PrintDxe/PrintDxe.inf
    259256INF  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
    260257INF  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
     258INF  MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
    261259INF  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
    262260INF  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
    263261INF  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
    264 !ifndef $(VBOX)
    265 INF  IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
    266 !endif
    267 INF  PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeControllerDxe.inf
     262INF  OvmfPkg/SataControllerDxe/SataControllerDxe.inf
     263INF  MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
     264INF  MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
     265INF  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
    268266INF  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
    269267INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
    … …  
    272270
    273271!ifdef $(VBOX)
    274 INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
    275 INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
    276 INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
     272INF IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
     273INF PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeControllerDxe.inf
    277274INF VBoxPkg/VBoxVgaMiniPortDxe/VBoxVgaMiniPortDxe.inf
    278275INF VBoxPkg/VBoxVgaDxe/VBoxVgaDxe.inf
    … …  
    305302INF  OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf
    306303INF  RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf
    307 INF  OvmfPkg/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
    308304INF  MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
    309305INF  MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
    … …  
    312308INF  MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
    313309!endif
    314 
    315 INF  RuleOverride = BINARY FatBinPkg/EnhancedFatDxe/Fat.inf
     310INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
     311
     312INF  FatPkg/EnhancedFatDxe/Fat.inf
    316313
    317314!ifndef $(USE_OLD_SHELL)
     315INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
    318316INF  ShellPkg/Application/Shell/Shell.inf
    319317!else
    … …  
    328326!endif
    329327}
     328INF MdeModulePkg/Logo/LogoDxe.inf
    330329
    331330#
    332331# Network modules
    333332#
    334 !if $(E1000_ENABLE)
    335   FILE DRIVER = 5D695E11-9B3F-4b83-B25F-4A8D5D69BE07 {
    336     SECTION PE32 = Intel3.5/EFI32/E3507E2.EFI
    337   }
    338 !endif
    339333  INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
    340334  INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
    … …  
    343337  INF  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
    344338  INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
    345   INF  MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
    346339  INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
    347340  INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
     341  INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
     342!if $(NETWORK_IP6_ENABLE) == TRUE
     343  INF  NetworkPkg/Ip6Dxe/Ip6Dxe.inf
     344  INF  NetworkPkg/TcpDxe/TcpDxe.inf
     345  INF  NetworkPkg/Udp6Dxe/Udp6Dxe.inf
     346  INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
     347  INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
     348  INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
     349  INF  NetworkPkg/IScsiDxe/IScsiDxe.inf
     350!else
    348351  INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
    349   INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
    350352  INF  MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
    351353  INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
     354!endif
     355!if $(HTTP_BOOT_ENABLE) == TRUE
     356  INF  NetworkPkg/DnsDxe/DnsDxe.inf
     357  INF  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
     358  INF  NetworkPkg/HttpDxe/HttpDxe.inf
     359  INF  NetworkPkg/HttpBootDxe/HttpBootDxe.inf
     360!endif
     361!if $(TLS_ENABLE) == TRUE
     362  INF  NetworkPkg/TlsDxe/TlsDxe.inf
     363  INF  NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf
     364!endif
    352365  INF  OvmfPkg/VirtioNetDxe/VirtioNet.inf
    353366
    … …  
    357370!ifndef $(VBOX)
    358371INF  MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
    359 !else
     372!endif
    360373INF  MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
    361374INF  MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
    362 !endif
    363375INF  MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
    364376INF  MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
    … …  
    373385!ifndef $(VBOX)
    374386INF  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
     387INF  OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
    375388!endif
    376389INF  OvmfPkg/PlatformDxe/Platform.inf
     390INF  OvmfPkg/IoMmuDxe/IoMmuDxe.inf
     391
     392!if $(SMM_REQUIRE) == TRUE
     393INF  OvmfPkg/SmmAccess/SmmAccess2Dxe.inf
     394INF  OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf
     395INF  UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf
     396INF  MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
     397INF  MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
     398INF  UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
     399INF  MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf
     400INF  UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
     401
     402#
     403# Variable driver stack (SMM)
     404#
     405INF  OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf
     406INF  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf
     407INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf
     408INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
     409
     410!else
     411
     412#
     413# Variable driver stack (non-SMM)
     414#
     415INF  OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
     416INF  OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf
     417INF  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
     418INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
     419!endif
    377420
    378421################################################################################
    379422
    380423[FV.FVMAIN_COMPACT]
     424FvNameGuid         = 48DB5E17-707C-472D-91CD-1613E7EF51B0
    381425FvAlignment        = 16
    382426ERASE_POLARITY     = 1
    … …  
    408452 }
    409453
     454!include DecomprScratchEnd.fdf.inc
     455
    410456################################################################################
    411457
    … …  
    419465[Rule.Common.PEI_CORE]
    420466  FILE PEI_CORE = $(NAMED_GUID) {
    421     PE32     PE32   Align=32    $(INF_OUTPUT)/$(MODULE_NAME).efi
     467    PE32     PE32   Align=Auto    $(INF_OUTPUT)/$(MODULE_NAME).efi
    422468    UI       STRING ="$(MODULE_NAME)" Optional
    423469    VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
    … …  
    427473  FILE PEIM = $(NAMED_GUID) {
    428474     PEI_DEPEX PEI_DEPEX Optional        $(INF_OUTPUT)/$(MODULE_NAME).depex
    429      PE32      PE32   Align=32           $(INF_OUTPUT)/$(MODULE_NAME).efi
     475     PE32      PE32   Align=Auto         $(INF_OUTPUT)/$(MODULE_NAME).efi
    430476     UI       STRING="$(MODULE_NAME)" Optional
    431477     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
    … …  
    445491    UI       STRING="$(MODULE_NAME)" Optional
    446492    VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
     493    RAW ACPI  Optional               |.acpi
     494    RAW ASL   Optional               |.aml
    447495  }
    448496
    … …  
    500548    RAW BIN   Align = 16   |.bin
    501549  }
     550
     551[Rule.Common.SMM_CORE]
     552  FILE SMM_CORE = $(NAMED_GUID) {
     553    PE32     PE32           $(INF_OUTPUT)/$(MODULE_NAME).efi
     554    UI       STRING="$(MODULE_NAME)" Optional
     555    VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
     556  }
     557
     558[Rule.Common.DXE_SMM_DRIVER]
     559  FILE SMM = $(NAMED_GUID) {
     560    SMM_DEPEX    SMM_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex
     561    PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi
     562    UI       STRING="$(MODULE_NAME)" Optional
     563    VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
     564  }
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette