From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com (mga03.intel.com []) by mx.groups.io with SMTP id smtpd.web09.9153.1616743451720207122 for ; Fri, 26 Mar 2021 00:24:15 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: dandan.bi@intel.com) IronPort-SDR: N1MTo70RgIvphFlWhfb201KAagAXLJt3mkKi/PETwHyeHXT+ZUlAx4RsCIUChAX0QbmKf90i7z CaneVtN5SxLw== X-IronPort-AV: E=McAfee;i="6000,8403,9934"; a="191125763" X-IronPort-AV: E=Sophos;i="5.81,279,1610438400"; d="scan'208";a="191125763" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Mar 2021 00:24:15 -0700 IronPort-SDR: oaHIpXSF+zCWw27AghJS6n/tdEd7bf0UNucVBE9CaLmYFukgcyd5ihmkmZzQxjplF6qITglgdr yqtdSen1wYrg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,279,1610438400"; d="scan'208";a="377154355" Received: from unknown (HELO shwdeOpenPSI114.ccr.corp.intel.com) ([10.239.154.141]) by orsmga006.jf.intel.com with ESMTP; 26 Mar 2021 00:24:14 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Laszlo Ersek , Ard Biesheuvel , Leif Lindholm Subject: [patch V3 05/29] ArmVirtPkg: Consume MdeLibs.dsc.inc for RegisterFilterLib Date: Fri, 26 Mar 2021 15:23:22 +0800 Message-Id: <20210326072346.4212-6-dandan.bi@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 In-Reply-To: <20210326072346.4212-1-dandan.bi@intel.com> References: <20210326072346.4212-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: Laszlo Ersek Cc: Ard Biesheuvel Cc: Leif Lindholm Signed-off-by: Dandan Bi --- ArmVirtPkg/ArmVirt.dsc.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index d9abadbe70..52582c7890 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -1,9 +1,9 @@ # # Copyright (c) 2011-2015, ARM Limited. All rights reserved. # Copyright (c) 2014, Linaro Limited. All rights reserved. -# Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved. +# Copyright (c) 2015 - 2021, Intel Corporation. All rights reserved. # Copyright (c) Microsoft Corporation. # # SPDX-License-Identifier: BSD-2-Clause-Patent # # @@ -32,10 +32,12 @@ [BuildOptions.common.EDKII.DXE_CORE,BuildOptions.common.EDKII.DXE_DRIVER,BuildOp [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] GCC:*_*_ARM_DLINK_FLAGS = -z common-page-size=0x1000 GCC:*_*_AARCH64_DLINK_FLAGS = -z common-page-size=0x10000 RVCT:*_*_ARM_DLINK_FLAGS = --scatter $(EDK_TOOLS_PATH)/Scripts/Rvct-Align4K.sct +!include MdePkg/MdeLibs.dsc.inc + [LibraryClasses.common] !if $(TARGET) == RELEASE DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf !else DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf -- 2.18.0.windows.1