From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: redhat.com, ip: 209.132.183.28, mailfrom: lersek@redhat.com) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Thu, 13 Jun 2019 07:22:25 -0700 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DC815981D3; Thu, 13 Jun 2019 14:22:11 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-117-127.ams2.redhat.com [10.36.117.127]) by smtp.corp.redhat.com (Postfix) with ESMTP id 643256A492; Thu, 13 Jun 2019 14:22:10 +0000 (UTC) Subject: Re: [edk2-devel] [PATCH v2 10/10] OvmfPkg: Update DSC/FDF files to consume CSM components in OvmfPkg To: devel@edk2.groups.io, hao.a.wu@intel.com Cc: David Woodhouse , Ray Ni , Jordan Justen , Ard Biesheuvel References: <20190527030350.11996-1-hao.a.wu@intel.com> <20190527030350.11996-11-hao.a.wu@intel.com> From: "Laszlo Ersek" Message-ID: Date: Thu, 13 Jun 2019 16:22:09 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20190527030350.11996-11-hao.a.wu@intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 13 Jun 2019 14:22:11 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit 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 > Cc: Ray Ni > Cc: Jordan Justen > Cc: Laszlo Ersek > Cc: Ard Biesheuvel > Signed-off-by: Hao A Wu > --- > 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] > > !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 { > > 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] > > !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 { > > 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] > > !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 { > > 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