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:19 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: dandan.bi@intel.com) IronPort-SDR: LrbMpJDt0hwhNkx2QgZfel23v+nw70I6zMBShlAWxBBSyR2chBz7xC+tX15Q5Ntp9rVtwZqReV mJF7SXovPCHw== X-IronPort-AV: E=McAfee;i="6000,8403,9937"; a="171408725" X-IronPort-AV: E=Sophos;i="5.81,285,1610438400"; d="scan'208";a="171408725" 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:19 -0700 IronPort-SDR: 5SuCOuv1aWsr3n9jKkHX/52qQN7xTD5ZGp5URJ+rhbj9D4othRUWFyzhqE88totVQ3oIxwUimb KEDxwbaB7Z9g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,285,1610438400"; d="scan'208";a="377806129" Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.154.141]) by orsmga006.jf.intel.com with ESMTP; 28 Mar 2021 06:12:18 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm , Pete Batard Subject: [edk2-platforms] [patch V4 23/37] Platform/RaspberryPi: Consume MdeLibs.dsc.inc for RegisterFilterLib Date: Sun, 28 Mar 2021 21:11:11 +0800 Message-Id: <20210328131125.26788-24-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: Ard Biesheuvel Cc: Leif Lindholm Cc: Pete Batard Signed-off-by: Dandan Bi --- V4: NA 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/RaspberryPi/RPi3/RPi3.dsc | 5 ++++- Platform/RaspberryPi/RPi4/RPi4.dsc | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc index 107cbda297..0961133ae9 100644 --- a/Platform/RaspberryPi/RPi3/RPi3.dsc +++ b/Platform/RaspberryPi/RPi3/RPi3.dsc @@ -1,10 +1,10 @@ # @file # # Copyright (c) 2011 - 2020, ARM Limited. All rights reserved. # Copyright (c) 2014, Linaro Limited. All rights reserved. -# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved. +# Copyright (c) 2015 - 2021, Intel Corporation. All rights reserved. # Copyright (c) 2017 - 2018, Andrei Warkentin # # SPDX-License-Identifier: BSD-2-Clause-Patent # ## @@ -52,10 +52,13 @@ [Defines] ################################################################################ # # Library Class section - list of all Library Classes needed by this Platform. # ################################################################################ + +!include MdePkg/MdeLibs.dsc.inc + [LibraryClasses.common] !if $(TARGET) == RELEASE DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf !else DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf diff --git a/Platform/RaspberryPi/RPi4/RPi4.dsc b/Platform/RaspberryPi/RPi4/RPi4.dsc index e0fad6f744..2c05c31118 100644 --- a/Platform/RaspberryPi/RPi4/RPi4.dsc +++ b/Platform/RaspberryPi/RPi4/RPi4.dsc @@ -1,10 +1,10 @@ # @file # # Copyright (c) 2011 - 2020, ARM Limited. All rights reserved. # Copyright (c) 2017 - 2018, Andrei Warkentin -# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved. +# Copyright (c) 2015 - 2021, Intel Corporation. All rights reserved. # Copyright (c) 2014, Linaro Limited. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # ## @@ -50,10 +50,13 @@ [Defines] ################################################################################ # # Library Class section - list of all Library Classes needed by this Platform. # ################################################################################ + +!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