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.web10.7114.1616937142589339060 for ; Sun, 28 Mar 2021 06:12:23 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: dandan.bi@intel.com) IronPort-SDR: CteoJfspclWgsbvPRmCtQElzPeRUsoaEb+AEfvSDw1dZPoj4YWcEGyUkVtq1sl+owRgJhAJ5kw 0r/tuKlQ+wyg== X-IronPort-AV: E=McAfee;i="6000,8403,9937"; a="171408795" X-IronPort-AV: E=Sophos;i="5.81,285,1610438400"; d="scan'208";a="171408795" 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:23 -0700 IronPort-SDR: r2Hb6eJLDQr72vejEwG1uQ0+7zvD08w9j4HZxLlx4XRZ4sXy6lEx5v7eMfrYa9znyxaMzLowDw okr9dLw5lOfA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,285,1610438400"; d="scan'208";a="377806163" Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.154.141]) by orsmga006.jf.intel.com with ESMTP; 28 Mar 2021 06:12:22 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm Subject: [edk2-platforms] [patch V4 26/37] Platform/Socionext: Consume MdeLibs.dsc.inc for RegisterFilterLib Date: Sun, 28 Mar 2021 21:11:14 +0800 Message-Id: <20210328131125.26788-27-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 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/Socionext/DeveloperBox/DeveloperBox.dsc | 1 + Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc | 1 + Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 2 ++ 3 files changed, 4 insertions(+) diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc index acaa4cd90f..88454c1f90 100644 --- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc +++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc @@ -26,10 +26,11 @@ [Defines] DEFINE SECURE_BOOT_ENABLE = FALSE DEFINE TPM2_ENABLE = FALSE DEFINE X64EMU_ENABLE = FALSE !include Platform/Socionext/DeveloperBox/DeveloperBox.dsc.inc +!include MdePkg/MdeLibs.dsc.inc [LibraryClasses] !if $(DEBUG_ON_UART1) == FALSE SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.inf !else diff --git a/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc b/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc index 92625df1ff..e078de4bbb 100644 --- a/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc +++ b/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc @@ -21,10 +21,11 @@ [Defines] SKUID_IDENTIFIER = DEFAULT FLASH_DEFINITION = Platform/Socionext/DeveloperBox/$(PLATFORM_NAME).fdf BUILD_NUMBER = 1 !include Platform/Socionext/DeveloperBox/DeveloperBox.dsc.inc +!include MdePkg/MdeLibs.dsc.inc [LibraryClasses] ArmSvcLib|ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf FvLib|StandaloneMmPkg/Library/FvLib/FvLib.inf diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc index 18accbfd5d..e531589762 100644 --- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc +++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc @@ -37,10 +37,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 +!include MdePkg/MdeLibs.dsc.inc + [LibraryClasses.common] ArmPlatformLib|Silicon/Socionext/SynQuacer/Library/SynQuacerLib/SynQuacerLib.inf ArmHvcLib|ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf -- 2.18.0.windows.1