From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com []) by mx.groups.io with SMTP id smtpd.web09.7174.1616937112189594211 for ; Sun, 28 Mar 2021 06:12:15 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: dandan.bi@intel.com) IronPort-SDR: KUx7S0c5hAq006zVkhb5pUvECOKEMuwlv/PmEsoAgKwltpWhXsM2cPTl9E84Jx2u+f5Hrk9t7w khYhLZ2btq3g== X-IronPort-AV: E=McAfee;i="6000,8403,9937"; a="171408683" X-IronPort-AV: E=Sophos;i="5.81,285,1610438400"; d="scan'208";a="171408683" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Mar 2021 06:12:15 -0700 IronPort-SDR: n0TEAR6rwoRuFl6QQkzMqkzrIfxelWSMMMJ4P/lr0f//SmBZWKUWTo8qrlFhZOFzBQVW/8ZQB+ rT+dAw3v3w8g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,285,1610438400"; d="scan'208";a="377806110" Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.154.141]) by orsmga006.jf.intel.com with ESMTP; 28 Mar 2021 06:12:13 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Marcin Wojtas , Leif Lindholm Subject: [edk2-platforms] [patch V4 20/37] Platform/Marvell: Consume MdeLibs.dsc.inc for RegisterFilterLib Date: Sun, 28 Mar 2021 21:11:08 +0800 Message-Id: <20210328131125.26788-21-dandan.bi@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 In-Reply-To: <20210328131125.26788-1-dandan.bi@intel.com> References: <20210328131125.26788-1-dandan.bi@intel.com> 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: Marcin Wojtas Cc: Leif Lindholm Signed-off-by: Dandan Bi --- V4: New updated to consume the MdeLibs.dsc.inc for RegisterFilterLibNull in all dsc files. Rather than consuming MdeLibs.dsc.in Armada7k8k.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/Marvell/Armada70x0Db/Armada70x0Db.dsc | 2 ++ Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc | 2 ++ Platform/Marvell/Cn913xDb/Cn913xDbA.dsc | 1 + 3 files changed, 5 insertions(+) diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc index 0c2c7489f1..5df7498f71 100644 --- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc +++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc @@ -27,10 +27,12 @@ [Defines] DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE DEFINE NETWORK_ISCSI_ENABLE = FALSE !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc +!include MdePkg/MdeLibs.dsc.inc + [Components.common] Silicon/Marvell/Armada7k8k/DeviceTree/Armada70x0Db.inf [Components.AARCH64] Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db.inf diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc index 40aeb62cfa..2698bd6573 100644 --- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc +++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc @@ -27,10 +27,12 @@ [Defines] DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE DEFINE NETWORK_ISCSI_ENABLE = FALSE !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc +!include MdePkg/MdeLibs.dsc.inc + [Components.common] Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0Db.inf [Components.AARCH64] Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db.inf diff --git a/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc b/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc index a754c3ea39..67355f3988 100644 --- a/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc +++ b/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc @@ -37,10 +37,11 @@ [Defines] DEFINE NETWORK_TLS_ENABLE = FALSE DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE DEFINE NETWORK_ISCSI_ENABLE = FALSE !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc +!include MdePkg/MdeLibs.dsc.inc !include Platform/Marvell/Cn913xDb/Cn9130DbA.dsc.inc !if $(CN9131) || $(CN9132) !include Platform/Marvell/Cn913xDb/Cn9131DbA.dsc.inc !endif !if $(CN9132) -- 2.18.0.windows.1