On 03/22/21 09:09, Dandan Bi wrote: > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3246 > > MdeLibs.dsc.inc was added for some basic/default library > instances provided by MdePkg and RegisterFilterLibNull Library > was also added into it as the first version of MdeLibs.dsc.inc. > > So update platform dsc to consume MdeLibs.dsc.inc for > RegisterFilterLibNull which will be consumed by IoLib and BaseLib. > > Cc: Laszlo Ersek <ler...@redhat.com> > Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org> > Cc: Jordan Justen <jordan.l.jus...@intel.com> > Signed-off-by: Dandan Bi <dandan...@intel.com> > --- > OvmfPkg/AmdSev/AmdSevX64.dsc | 4 +++- > OvmfPkg/Bhyve/BhyveX64.dsc | 4 +++- > OvmfPkg/OvmfPkgIa32.dsc | 4 +++- > OvmfPkg/OvmfPkgIa32X64.dsc | 4 +++- > OvmfPkg/OvmfPkgX64.dsc | 4 +++- > OvmfPkg/OvmfXen.dsc | 4 +++- > 6 files changed, 18 insertions(+), 6 deletions(-)
Same comment (for all 6 DSC files) as under the ArmVirtPkg patch -- please un-indent the !include directives. With that: Reviewed-by: Laszlo Ersek <ler...@redhat.com> Thanks Laszlo > > diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc > index 65c42284d9..7bb94b8e11 100644 > --- a/OvmfPkg/AmdSev/AmdSevX64.dsc > +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc > @@ -1,11 +1,11 @@ > ## @file > # EFI/Framework Open Virtual Machine Firmware (OVMF) platform for SEV secure > # virtual machine remote attestation and secret injection > # > # Copyright (c) 2020 James Bottomley, IBM Corporation. > -# Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR> > +# Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.<BR> > # (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR> > # > # SPDX-License-Identifier: BSD-2-Clause-Patent > # > ## > @@ -112,10 +112,12 @@ [SkuIds] > # > # Library Class section - list of all Library Classes needed by this > Platform. > # > > ################################################################################ > [LibraryClasses] > + !include MdePkg/MdeLibs.dsc.inc > + > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf > ResetSystemLib|OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf > PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf > BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf > diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc > index 4a1cdf5aca..3a1a76a3ad 100644 > --- a/OvmfPkg/Bhyve/BhyveX64.dsc > +++ b/OvmfPkg/Bhyve/BhyveX64.dsc > @@ -1,8 +1,8 @@ > # > # Copyright (c) 2020, Rebecca Cran <rebe...@bsdio.com> > -# Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR> > +# Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.<BR> > # (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR> > # Copyright (c) 2014, Pluribus Networks, Inc. > # > # SPDX-License-Identifier: BSD-2-Clause-Patent > # > @@ -112,10 +112,12 @@ [SkuIds] > # > # Library Class section - list of all Library Classes needed by this > Platform. > # > > ################################################################################ > [LibraryClasses] > + !include MdePkg/MdeLibs.dsc.inc > + > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLibBhyve.inf > PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf > BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf > BaseLib|MdePkg/Library/BaseLib/BaseLib.inf > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index 1eaf3e99c6..7b49e2a648 100644 > --- a/OvmfPkg/OvmfPkgIa32.dsc > +++ b/OvmfPkg/OvmfPkgIa32.dsc > @@ -1,9 +1,9 @@ > ## @file > # EFI/Framework Open Virtual Machine Firmware (OVMF) platform > # > -# Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR> > +# Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.<BR> > # (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR> > # Copyright (c) Microsoft Corporation. > # > # SPDX-License-Identifier: BSD-2-Clause-Patent > # > @@ -116,10 +116,12 @@ [SkuIds] > # > # Library Class section - list of all Library Classes needed by this > Platform. > # > > ################################################################################ > [LibraryClasses] > + !include MdePkg/MdeLibs.dsc.inc > + > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf > ResetSystemLib|OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf > PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf > BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > index 4a5a430147..b60212843b 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > @@ -1,9 +1,9 @@ > ## @file > # EFI/Framework Open Virtual Machine Firmware (OVMF) platform > # > -# Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR> > +# Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.<BR> > # (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR> > # Copyright (c) Microsoft Corporation. > # > # SPDX-License-Identifier: BSD-2-Clause-Patent > # > @@ -120,10 +120,12 @@ [SkuIds] > # > # Library Class section - list of all Library Classes needed by this > Platform. > # > > ################################################################################ > [LibraryClasses] > + !include MdePkg/MdeLibs.dsc.inc > + > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf > ResetSystemLib|OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf > PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf > BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index d4d601b444..0c06f33782 100644 > --- a/OvmfPkg/OvmfPkgX64.dsc > +++ b/OvmfPkg/OvmfPkgX64.dsc > @@ -1,9 +1,9 @@ > ## @file > # EFI/Framework Open Virtual Machine Firmware (OVMF) platform > # > -# Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR> > +# Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.<BR> > # (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR> > # Copyright (c) Microsoft Corporation. > # > # SPDX-License-Identifier: BSD-2-Clause-Patent > # > @@ -120,10 +120,12 @@ [SkuIds] > # > # Library Class section - list of all Library Classes needed by this > Platform. > # > > ################################################################################ > [LibraryClasses] > + !include MdePkg/MdeLibs.dsc.inc > + > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf > ResetSystemLib|OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf > PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf > BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf > diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc > index 507029404f..92e8d1967c 100644 > --- a/OvmfPkg/OvmfXen.dsc > +++ b/OvmfPkg/OvmfXen.dsc > @@ -1,9 +1,9 @@ > ## @file > # EFI/Framework Open Virtual Machine Firmware (OVMF) platform > # > -# Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR> > +# Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.<BR> > # (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR> > # Copyright (c) 2019, Citrix Systems, Inc. > # Copyright (c) Microsoft Corporation. > # > # SPDX-License-Identifier: BSD-2-Clause-Patent > @@ -110,10 +110,12 @@ [SkuIds] > # > # Library Class section - list of all Library Classes needed by this > Platform. > # > > ################################################################################ > [LibraryClasses] > + !include MdePkg/MdeLibs.dsc.inc > + > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > TimerLib|MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf > ResetSystemLib|OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf > PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf > BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#73147): https://edk2.groups.io/g/devel/message/73147 Mute This Topic: https://groups.io/mt/81519268/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
