From 3207a872a405ea60417853cfcdb73b4fa06b795f Mon Sep 17 00:00:00 2001 From: Hao A Wu Date: Wed, 15 May 2019 15:15:53 +0800 Subject: OvmfPkg: Update DSC/FDF files to consume CSM components in OvmfPkg REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1811 This commit updates the OVMF DSC/FDF files to consume the copied CSM components within OvmfPkg. Cc: Ray Ni Cc: Jordan Justen Cc: Ard Biesheuvel Signed-off-by: Hao A Wu Reviewed-by: David Woodhouse Reviewed-by: Laszlo Ersek --- OvmfPkg/OvmfPkgIa32.dsc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'OvmfPkg/OvmfPkgIa32.dsc') diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 8281f409f2..6830e361bf 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -685,7 +685,7 @@ !ifdef $(CSM_ENABLE) NULL|OvmfPkg/Csm/CsmSupportLib/CsmSupportLib.inf - NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf + NULL|OvmfPkg/Csm/LegacyBootManagerLib/LegacyBootManagerLib.inf !endif } MdeModulePkg/Logo/LogoDxe.inf @@ -695,8 +695,8 @@ NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf !ifdef $(CSM_ENABLE) - NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf - NULL|IntelFrameworkModulePkg/Library/LegacyBootMaintUiLib/LegacyBootMaintUiLib.inf + NULL|OvmfPkg/Csm/LegacyBootManagerLib/LegacyBootManagerLib.inf + NULL|OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUiLib.inf !endif } OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf @@ -794,11 +794,11 @@ MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf !ifdef $(CSM_ENABLE) - IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf { + OvmfPkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf { PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf } - IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf + OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf OvmfPkg/Csm/Csm16/Csm16.inf !endif -- cgit v1.2.3