Skip to content

Commit eccdab6

Browse files
Laszlo Ersekmergify[bot]
authored andcommitted
OvmfPkg: remove CSM_ENABLE build macro
At this point, the CSM_ENABLE conditionals only bracket the !error directives that we added at the front of this series; it's time to remove CSM_ENABLE. Cc: Anthony Perard <[email protected]> Cc: Ard Biesheuvel <[email protected]> Cc: Corvin Köhne <[email protected]> Cc: Gerd Hoffmann <[email protected]> Cc: Jiewen Yao <[email protected]> Cc: Rebecca Cran <[email protected]> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=4588 Signed-off-by: Laszlo Ersek <[email protected]> Message-Id: <[email protected]> Reviewed-by: Jiewen Yao <[email protected]> Reviewed-by: Ard Biesheuvel <[email protected]> Acked-by: Corvin Köhne <[email protected]> Acked-by: Gerd Hoffmann <[email protected]>
1 parent 605248f commit eccdab6

File tree

6 files changed

+1
-21
lines changed

6 files changed

+1
-21
lines changed

OvmfPkg/Bhyve/BhyveX64.dsc

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -663,12 +663,7 @@
663663
MdeModulePkg/Universal/Metronome/Metronome.inf
664664
PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
665665
MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf
666-
MdeModulePkg/Universal/BdsDxe/BdsDxe.inf {
667-
<LibraryClasses>
668-
!ifdef $(CSM_ENABLE)
669-
!error "CSM is being torn down"
670-
!endif
671-
}
666+
MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
672667
MdeModulePkg/Logo/LogoDxe.inf
673668
MdeModulePkg/Application/UiApp/UiApp.inf {
674669
<LibraryClasses>

OvmfPkg/IntelTdx/IntelTdxX64.dsc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -376,9 +376,6 @@
376376
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE
377377
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE
378378
gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE
379-
!ifdef $(CSM_ENABLE)
380-
!error "CSM is being torn down"
381-
!endif
382379
!if $(SECURE_BOOT_ENABLE) == TRUE
383380
gUefiOvmfPkgTokenSpaceGuid.PcdSecureBootSupported|TRUE
384381
gEfiMdeModulePkgTokenSpaceGuid.PcdRequireSelfSignedPk|TRUE

OvmfPkg/OvmfPkgIa32.dsc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -471,9 +471,6 @@
471471
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE
472472
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE
473473
gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE
474-
!ifdef $(CSM_ENABLE)
475-
!error "CSM is being torn down"
476-
!endif
477474
!if $(SMM_REQUIRE) == TRUE
478475
gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire|TRUE
479476
gUefiCpuPkgTokenSpaceGuid.PcdCpuHotPlugSupport|TRUE

OvmfPkg/OvmfPkgIa32X64.dsc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -478,9 +478,6 @@
478478
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE
479479
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE
480480
gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE
481-
!ifdef $(CSM_ENABLE)
482-
!error "CSM is being torn down"
483-
!endif
484481
!if $(SMM_REQUIRE) == TRUE
485482
gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire|TRUE
486483
gUefiCpuPkgTokenSpaceGuid.PcdCpuHotPlugSupport|TRUE

OvmfPkg/OvmfPkgX64.dsc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -497,9 +497,6 @@
497497
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE
498498
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE
499499
gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE
500-
!ifdef $(CSM_ENABLE)
501-
!error "CSM is being torn down"
502-
!endif
503500
!if $(SMM_REQUIRE) == TRUE
504501
gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire|TRUE
505502
gUefiCpuPkgTokenSpaceGuid.PcdCpuHotPlugSupport|TRUE

OvmfPkg/OvmfXen.dsc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -363,9 +363,6 @@
363363
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE
364364
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE
365365
gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE
366-
!ifdef $(CSM_ENABLE)
367-
!error "CSM is being torn down"
368-
!endif
369366

370367
[PcdsFixedAtBuild]
371368
gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration|TRUE

0 commit comments

Comments
 (0)