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: Leif Lindholm <l...@nuviainc.com> Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org> Cc: Wenyi Xie <xiewen...@huawei.com> Signed-off-by: Dandan Bi <dandan...@intel.com> --- V4: New updated to consume the MdeLibs.dsc.inc for RegisterFilterLibNull in all dsc files. Rather than consuming MdeLibs.dsc.in Hisilicon.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/Hisilicon/D03/D03.dsc | 1 + Platform/Hisilicon/D05/D05.dsc | 1 + Platform/Hisilicon/D06/D06.dsc | 1 + Platform/Hisilicon/HiKey/HiKey.dsc | 1 + Platform/Hisilicon/HiKey960/HiKey960.dsc | 1 + 5 files changed, 5 insertions(+) diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc index 5a2441dcd3..c3858aa0b1 100644 --- a/Platform/Hisilicon/D03/D03.dsc +++ b/Platform/Hisilicon/D03/D03.dsc @@ -32,10 +32,11 @@ [Defines] DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE DEFINE NETWORK_ISCSI_ENABLE = FALSE DEFINE NETWORK_VLAN_ENABLE = FALSE !include Silicon/Hisilicon/Hisilicon.dsc.inc +!include MdePkg/MdeLibs.dsc.inc [LibraryClasses.common] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf ArmPlatformLib|Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc index 31c9fabb52..0d27bbffce 100644 --- a/Platform/Hisilicon/D05/D05.dsc +++ b/Platform/Hisilicon/D05/D05.dsc @@ -32,10 +32,11 @@ [Defines] DEFINE NETWORK_VLAN_ENABLE = FALSE DEFINE NETWORK_IP6_ENABLE = FALSE DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE !include Silicon/Hisilicon/Hisilicon.dsc.inc +!include MdePkg/MdeLibs.dsc.inc [LibraryClasses.common] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf ArmPlatformLib|Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc index eb20224baf..fecc3cfb1b 100644 --- a/Platform/Hisilicon/D06/D06.dsc +++ b/Platform/Hisilicon/D06/D06.dsc @@ -30,10 +30,11 @@ [Defines] DEFINE NETWORK_VLAN_ENABLE = FALSE DEFINE NETWORK_IP6_ENABLE = FALSE DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE !include Silicon/Hisilicon/Hisilicon.dsc.inc +!include MdePkg/MdeLibs.dsc.inc [LibraryClasses.common] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf ArmPlatformLib|Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/HiKey.dsc index d844625140..375b29375d 100644 --- a/Platform/Hisilicon/HiKey/HiKey.dsc +++ b/Platform/Hisilicon/HiKey/HiKey.dsc @@ -30,10 +30,11 @@ [Defines] DEFINE NETWORK_TLS_ENABLE = FALSE DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE DEFINE NETWORK_ISCSI_ENABLE = FALSE DEFINE NETWORK_VLAN_ENABLE = FALSE !include Silicon/Hisilicon/Hisilicon.dsc.inc +!include MdePkg/MdeLibs.dsc.inc [LibraryClasses.common] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf ArmPlatformLib|Platform/Hisilicon/HiKey/Library/HiKeyLib/HiKeyLib.inf diff --git a/Platform/Hisilicon/HiKey960/HiKey960.dsc b/Platform/Hisilicon/HiKey960/HiKey960.dsc index bf9d51e0b7..1d09e3f5da 100644 --- a/Platform/Hisilicon/HiKey960/HiKey960.dsc +++ b/Platform/Hisilicon/HiKey960/HiKey960.dsc @@ -30,10 +30,11 @@ [Defines] DEFINE NETWORK_TLS_ENABLE = FALSE DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE DEFINE NETWORK_ISCSI_ENABLE = FALSE DEFINE NETWORK_VLAN_ENABLE = FALSE !include Silicon/Hisilicon/Hisilicon.dsc.inc +!include MdePkg/MdeLibs.dsc.inc [LibraryClasses.common] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf ArmPlatformLib|Platform/Hisilicon/HiKey960/Library/HiKey960Lib/HiKey960Lib.inf -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#73467): https://edk2.groups.io/g/devel/message/73467 Mute This Topic: https://groups.io/mt/81671676/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
