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:16 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: dandan.bi@intel.com) IronPort-SDR: Bu8douvwsV18R2RTMC8LFR3aegt0xSzaBVw7lZEI5XSkjWNDgARYi516Jq0SmUxq3g9az+R5DT VWcTktdn9Aaw== X-IronPort-AV: E=McAfee;i="6000,8403,9937"; a="171408691" X-IronPort-AV: E=Sophos;i="5.81,285,1610438400"; d="scan'208";a="171408691" 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:16 -0700 IronPort-SDR: Uvfj9ctTbHU0Co3xFUjs5eFXvNeB+4nceG8SP0pNtCSSv2XPLNhsaYAtJnT2lWWguIqdNOSQ7N N4W9/yubhcJw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,285,1610438400"; d="scan'208";a="377806113" Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.154.141]) by orsmga006.jf.intel.com with ESMTP; 28 Mar 2021 06:12:15 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Leif Lindholm , Meenakshi Aggarwal Subject: [edk2-platforms] [patch V4 21/37] Platform/NXP: Consume MdeLibs.dsc.inc for RegisterFilterLib Date: Sun, 28 Mar 2021 21:11:09 +0800 Message-Id: <20210328131125.26788-22-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: Leif Lindholm Cc: Meenakshi Aggarwal 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 NxpQoriqLs.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/NXP/LS1043aRdbPkg/LS1043aRdbPkg.dsc | 1 + Platform/NXP/LS1046aFrwyPkg/LS1046aFrwyPkg.dsc | 1 + Platform/NXP/LX2160aRdbPkg/LX2160aRdbPkg.dsc | 1 + 3 files changed, 3 insertions(+) diff --git a/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.dsc b/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.dsc index 6d07d51640..cf0e622837 100644 --- a/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.dsc +++ b/Platform/NXP/LS1043aRdbPkg/LS1043aRdbPkg.dsc @@ -28,10 +28,11 @@ [Defines] DEFINE NETWORK_TLS_ENABLE = FALSE DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE DEFINE NETWORK_ISCSI_ENABLE = FALSE !include Silicon/NXP/NxpQoriqLs.dsc.inc +!include MdePkg/MdeLibs.dsc.inc !include Silicon/NXP/LS1043A/LS1043A.dsc.inc [LibraryClasses.common] ArmPlatformLib|Platform/NXP/LS1043aRdbPkg/Library/ArmPlatformLib/ArmPlatformLib.inf RealTimeClockLib|Silicon/Maxim/Library/Ds1307RtcLib/Ds1307RtcLib.inf diff --git a/Platform/NXP/LS1046aFrwyPkg/LS1046aFrwyPkg.dsc b/Platform/NXP/LS1046aFrwyPkg/LS1046aFrwyPkg.dsc index 266fdbd2b4..67cf15cbe4 100755 --- a/Platform/NXP/LS1046aFrwyPkg/LS1046aFrwyPkg.dsc +++ b/Platform/NXP/LS1046aFrwyPkg/LS1046aFrwyPkg.dsc @@ -21,10 +21,11 @@ [Defines] PLATFORM_GUID = 79adaa48-5f50-49f0-aa9a-544ac9260ef8 OUTPUT_DIRECTORY = Build/LS1046aFrwyPkg FLASH_DEFINITION = Platform/NXP/LS1046aFrwyPkg/LS1046aFrwyPkg.fdf !include Silicon/NXP/NxpQoriqLs.dsc.inc +!include MdePkg/MdeLibs.dsc.inc !include Silicon/NXP/LS1046A/LS1046A.dsc.inc [LibraryClasses.common] ArmPlatformLib|Platform/NXP/LS1046aFrwyPkg/Library/ArmPlatformLib/ArmPlatformLib.inf RealTimeClockLib|EmbeddedPkg/Library/VirtualRealTimeClockLib/VirtualRealTimeClockLib.inf diff --git a/Platform/NXP/LX2160aRdbPkg/LX2160aRdbPkg.dsc b/Platform/NXP/LX2160aRdbPkg/LX2160aRdbPkg.dsc index 9d898f27f3..112f6cc1a4 100644 --- a/Platform/NXP/LX2160aRdbPkg/LX2160aRdbPkg.dsc +++ b/Platform/NXP/LX2160aRdbPkg/LX2160aRdbPkg.dsc @@ -33,10 +33,11 @@ [Defines] # This flag controls the dynamic acpi generation # DEFINE DYNAMIC_ACPI_ENABLE = TRUE !include Silicon/NXP/NxpQoriqLs.dsc.inc +!include MdePkg/MdeLibs.dsc.inc !include Silicon/NXP/LX2160A/LX2160A.dsc.inc !if $(DYNAMIC_ACPI_ENABLE) == TRUE !include DynamicTablesPkg/DynamicTables.dsc.inc !endif -- 2.18.0.windows.1