UefiCpuPkg/PiSmmCpuDxeSmm: Replace mIsBsp by mBspApicId check

[mirror_edk2.git] / UefiPayloadPkg / UefiPayloadPkg.fdf

diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf
index 27534f445dbb834be5337972235be9bc3751adc3..ee7d718b3f6e6a1d557175f8ab1a1f486b298ba4 100644 (file)
--- a/UefiPayloadPkg/UefiPayloadPkg.fdf
+++ b/UefiPayloadPkg/UefiPayloadPkg.fdf
@@ -61,6 +61,28 @@ FILE FV_IMAGE = 4E35FD93-9C72-4c15-8C4B-E77F1DB2D793 {
 }\r
 \r
 ################################################################################\r
+[FV.BDSFV]\r
+FvNameGuid         = CA5590AF-9558-4822-B5EA-BE2E876CD3EC\r
+BlockSize          = $(FD_BLOCK_SIZE)\r
+FvForceRebase      = FALSE\r
+FvAlignment        = 16\r
+ERASE_POLARITY     = 1\r
+MEMORY_MAPPED      = TRUE\r
+STICKY_WRITE       = TRUE\r
+LOCK_CAP           = TRUE\r
+LOCK_STATUS        = TRUE\r
+WRITE_DISABLED_CAP = TRUE\r
+WRITE_ENABLED_CAP  = TRUE\r
+WRITE_STATUS       = TRUE\r
+WRITE_LOCK_CAP     = TRUE\r
+WRITE_LOCK_STATUS  = TRUE\r
+READ_DISABLED_CAP  = TRUE\r
+READ_ENABLED_CAP   = TRUE\r
+READ_STATUS        = TRUE\r
+READ_LOCK_CAP      = TRUE\r
+READ_LOCK_STATUS   = TRUE\r
+\r
+INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
 \r
 [FV.DXEFV]\r
 FvNameGuid         = 8063C21A-8E58-4576-95CE-089E87975D23\r
@@ -106,7 +128,7 @@ INF CryptoPkg/Driver/CryptoDxe.inf
 INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
 !endif\r
 INF UefiCpuPkg/CpuDxe/CpuDxe.inf\r
-INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
+\r
 INF RuleOverride = UI MdeModulePkg/Application/UiApp/UiApp.inf\r
 INF MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf\r
 INF PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf\r
@@ -215,7 +237,9 @@ INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
 INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf\r
 INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf\r
 INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf\r
+!if $(NVME_ENABLE) == TRUE\r
 INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf\r
+!endif\r
 !if $(RAM_DISK_ENABLE) == TRUE\r
 INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf\r
 !endif\r
@@ -250,6 +274,10 @@ INF  MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
 INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf\r
 !endif\r
 \r
+!if $(UNIVERSAL_PAYLOAD) == FALSE\r
+INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
+!endif\r
+\r
 #\r
 # UEFI network modules\r
 #\r