On 05/27/19 05:03, Wu, Hao A wrote: > 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: David Woodhouse <dw...@infradead.org> > Cc: Ray Ni <ray...@intel.com> > Cc: Jordan Justen <jordan.l.jus...@intel.com> > Cc: Laszlo Ersek <ler...@redhat.com> > Cc: Ard Biesheuvel <ard.biesheu...@linaro.org> > Signed-off-by: Hao A Wu <hao.a...@intel.com> > --- > OvmfPkg/OvmfPkgIa32.dsc | 10 +++++----- > OvmfPkg/OvmfPkgIa32X64.dsc | 10 +++++----- > OvmfPkg/OvmfPkgX64.dsc | 10 +++++----- > OvmfPkg/OvmfPkgIa32.fdf | 4 ++-- > OvmfPkg/OvmfPkgIa32X64.fdf | 4 ++-- > OvmfPkg/OvmfPkgX64.fdf | 4 ++-- > 6 files changed, 21 insertions(+), 21 deletions(-) > > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index b3446ece31..94d8af6b8a 100644 > --- a/OvmfPkg/OvmfPkgIa32.dsc > +++ b/OvmfPkg/OvmfPkgIa32.dsc > @@ -683,7 +683,7 @@ [Components] > <LibraryClasses> > !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 > @@ -693,8 +693,8 @@ [Components] > 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 > @@ -799,11 +799,11 @@ [Components] > MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf > > !ifdef $(CSM_ENABLE) > - IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf { > + OvmfPkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf { > <LibraryClasses> > PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf > } > - IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf > + OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf > OvmfPkg/Csm/Csm16/Csm16.inf > !endif > > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > index 679d4eb8dd..5d9c688e8b 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > @@ -692,7 +692,7 @@ [Components.X64] > <LibraryClasses> > !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 > @@ -702,8 +702,8 @@ [Components.X64] > 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 > @@ -808,11 +808,11 @@ [Components.X64] > MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf > > !ifdef $(CSM_ENABLE) > - IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf { > + OvmfPkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf { > <LibraryClasses> > PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf > } > - IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf > + OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf > OvmfPkg/Csm/Csm16/Csm16.inf > !endif > > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index 56a9560262..3a9d25ba4a 100644 > --- a/OvmfPkg/OvmfPkgX64.dsc > +++ b/OvmfPkg/OvmfPkgX64.dsc > @@ -690,7 +690,7 @@ [Components] > <LibraryClasses> > !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 > @@ -700,8 +700,8 @@ [Components] > 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 > @@ -806,11 +806,11 @@ [Components] > MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf > > !ifdef $(CSM_ENABLE) > - IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf { > + OvmfPkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf { > <LibraryClasses> > PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf > } > - IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf > + OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf > OvmfPkg/Csm/Csm16/Csm16.inf > !endif > > diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf > index e428334702..c334a5bcd1 100644 > --- a/OvmfPkg/OvmfPkgIa32.fdf > +++ b/OvmfPkg/OvmfPkgIa32.fdf > @@ -311,8 +311,8 @@ [FV.DXEFV] > INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf > > !ifdef $(CSM_ENABLE) > -INF IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf > -INF IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf > +INF OvmfPkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf > +INF OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf > INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf > !endif > > diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf > index 6ddffe7547..89c2b44b48 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.fdf > +++ b/OvmfPkg/OvmfPkgIa32X64.fdf > @@ -317,8 +317,8 @@ [FV.DXEFV] > INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf > > !ifdef $(CSM_ENABLE) > -INF IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf > -INF IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf > +INF OvmfPkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf > +INF OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf > INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf > !endif > > diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf > index 6ddffe7547..89c2b44b48 100644 > --- a/OvmfPkg/OvmfPkgX64.fdf > +++ b/OvmfPkg/OvmfPkgX64.fdf > @@ -317,8 +317,8 @@ [FV.DXEFV] > INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf > > !ifdef $(CSM_ENABLE) > -INF IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf > -INF IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf > +INF OvmfPkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf > +INF OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf > INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf > !endif > >
Reviewed-by: Laszlo Ersek <ler...@redhat.com> -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#42374): https://edk2.groups.io/g/devel/message/42374 Mute This Topic: https://groups.io/mt/31805489/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
