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: Ard Biesheuvel <ardb+tianoc...@kernel.org> Cc: Thomas Abraham <thomas.abra...@arm.com> Cc: Sami Mujawar <sami.muja...@arm.com> Signed-off-by: Dandan Bi <dandan...@intel.com> --- V4: Consume the MdeLibs.dsc.inc for RegisterFilterLibNull in all dsc files. Rather than consuming MdeLibs.dsc.in ArmVExpress.dsc.inc. V3: Update plaftom dsc to consume the MdeLibs.dsc.inc outside the common [LibraryClasses] section since we can specify different [LibraryClasses] section for libary instances in MdeLibs.dsc.inc. V2: Update Platform dsc to consume the MdeLibs.dsc.inc rather than consuming RegisterFilterLibNull instance directly. --- Platform/ARM/JunoPkg/ArmJuno.dsc | 1 + Platform/ARM/N1Sdp/N1SdpPlatform.dsc | 1 + Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc | 3 +++ Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.dsc | 3 +++ Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.dsc | 3 +++ Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.dsc | 5 ++++- Platform/ARM/SgiPkg/RdN2/RdN2.dsc | 3 +++ Platform/ARM/SgiPkg/RdV1/RdV1.dsc | 3 +++ Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.dsc | 3 +++ Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc | 3 +++ Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 1 + Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 1 + 12 files changed, 29 insertions(+), 1 deletion(-) diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc index a6ea957b38..fdfc8cd9e2 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.dsc +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc @@ -24,10 +24,11 @@ [Defines] SKUID_IDENTIFIER = DEFAULT FLASH_DEFINITION = Platform/ARM/JunoPkg/ArmJuno.fdf # On RTSM, most peripherals are VExpress Motherboard peripherals !include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +!include MdePkg/MdeLibs.dsc.inc !ifdef DYNAMIC_TABLES_FRAMEWORK !include DynamicTablesPkg/DynamicTables.dsc.inc !include Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc !endif diff --git a/Platform/ARM/N1Sdp/N1SdpPlatform.dsc b/Platform/ARM/N1Sdp/N1SdpPlatform.dsc index 92376aab8f..61e7a909f8 100644 --- a/Platform/ARM/N1Sdp/N1SdpPlatform.dsc +++ b/Platform/ARM/N1Sdp/N1SdpPlatform.dsc @@ -20,10 +20,11 @@ [Defines] SKUID_IDENTIFIER = DEFAULT FLASH_DEFINITION = Platform/ARM/N1Sdp/N1SdpPlatform.fdf BUILD_NUMBER = 1 !include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +!include MdePkg/MdeLibs.dsc.inc [LibraryClasses.common] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf ArmPlatformLib|Silicon/ARM/NeoverseN1Soc/Library/PlatformLib/PlatformLib.inf diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc index 38bf6020ba..e281d54909 100644 --- a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc +++ b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc @@ -27,10 +27,13 @@ [Defines] ################################################################################ # # Library Class section - list of all Library Classes needed by this Platform. # ################################################################################ + +!include MdePkg/MdeLibs.dsc.inc + [LibraryClasses] # # Basic # BaseLib|MdePkg/Library/BaseLib/BaseLib.inf diff --git a/Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.dsc b/Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.dsc index 26ab7e6ef6..edd5a49315 100644 --- a/Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.dsc +++ b/Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.dsc @@ -24,10 +24,13 @@ [Defines] # include common definitions from SgiPlatform.dsc !include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc !include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc +# include common/basic libraries from MdePkg. +!include MdePkg/MdeLibs.dsc.inc + ################################################################################ # # Pcd Section - list of all EDK II PCD Entries defined by this Platform # ################################################################################ diff --git a/Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.dsc b/Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.dsc index 7d397438bf..37f0deed6b 100644 --- a/Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.dsc +++ b/Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.dsc @@ -24,10 +24,13 @@ [Defines] # include common definitions from SgiPlatform.dsc !include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc !include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc +# include common/basic libraries from MdePkg. +!include MdePkg/MdeLibs.dsc.inc + ################################################################################ # # Pcd Section - list of all EDK II PCD Entries defined by this Platform # ################################################################################ diff --git a/Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.dsc b/Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.dsc index 5c87a0ca9b..d9dfa7c4ae 100644 --- a/Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.dsc +++ b/Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.dsc @@ -22,11 +22,14 @@ [Defines] BOARD_DXE_FV_COMPONENTS = Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.fdf.inc BUILD_NUMBER = 1 # include common definitions from SgiPlatform.dsc !include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc -!include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc +!include Platform/ARM/SgiPkg/SgiMemoryMap.dsc. + +# include common/basic libraries from MdePkg. +!include MdePkg/MdeLibs.dsc.inc ################################################################################ # # Pcd Section - list of all EDK II PCD Entries defined by this Platform # diff --git a/Platform/ARM/SgiPkg/RdN2/RdN2.dsc b/Platform/ARM/SgiPkg/RdN2/RdN2.dsc index 55614574e3..adce7ee90f 100644 --- a/Platform/ARM/SgiPkg/RdN2/RdN2.dsc +++ b/Platform/ARM/SgiPkg/RdN2/RdN2.dsc @@ -24,10 +24,13 @@ [Defines] # include common definitions from SgiPlatform.dsc !include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc !include Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc +# include common/basic libraries from MdePkg. +!include MdePkg/MdeLibs.dsc.inc + ################################################################################ # # Pcd Section - list of all EDK II PCD Entries defined by this Platform # ################################################################################ diff --git a/Platform/ARM/SgiPkg/RdV1/RdV1.dsc b/Platform/ARM/SgiPkg/RdV1/RdV1.dsc index e8ee0e8769..a878d28df7 100644 --- a/Platform/ARM/SgiPkg/RdV1/RdV1.dsc +++ b/Platform/ARM/SgiPkg/RdV1/RdV1.dsc @@ -24,10 +24,13 @@ [Defines] # include common definitions from SgiPlatform.dsc !include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc !include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc +# include common/basic libraries from MdePkg. +!include MdePkg/MdeLibs.dsc.inc + ################################################################################ # # Pcd Section - list of all EDK II PCD Entries defined by this Platform # ################################################################################ diff --git a/Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.dsc b/Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.dsc index c2fcc0df45..578cb74fa0 100644 --- a/Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.dsc +++ b/Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.dsc @@ -24,10 +24,13 @@ [Defines] # include common definitions from SgiPlatform.dsc !include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc !include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc +# include common/basic libraries from MdePkg. +!include MdePkg/MdeLibs.dsc.inc + ################################################################################ # # Pcd Section - list of all EDK II PCD Entries defined by this Platform # ################################################################################ diff --git a/Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc b/Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc index a867536841..50790135a6 100644 --- a/Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc +++ b/Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc @@ -24,10 +24,13 @@ [Defines] # include common definitions from SgiPlatform.dsc !include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc !include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc +# include common/basic libraries from MdePkg. +!include MdePkg/MdeLibs.dsc.inc + ################################################################################ # # Pcd Section - list of all EDK II PCD Entries defined by this Platform # ################################################################################ diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc index 144dd4f8b8..e06a2a47f0 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc @@ -28,10 +28,11 @@ [Defines] DEFINE EDK2_SKIP_PEICORE = 1 DEFINE ARM_BIGLITTLE_TC2 = 1 # We build for the TC2 hardware by default !include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +!include MdePkg/MdeLibs.dsc.inc [LibraryClasses.common] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf ArmPlatformLib|Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc index ccef083957..cf7350649e 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc @@ -30,10 +30,11 @@ [Defines] !endif DT_SUPPORT = FALSE !include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +!include MdePkg/MdeLibs.dsc.inc !include DynamicTablesPkg/DynamicTables.dsc.inc [LibraryClasses.common] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf ArmPlatformLib|Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#73464): https://edk2.groups.io/g/devel/message/73464 Mute This Topic: https://groups.io/mt/81671673/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
