From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.43; helo=mga05.intel.com; envelope-from=michael.d.kinney@intel.com; receiver=edk2-devel@lists.01.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 8DD0B21BADAB2 for ; Tue, 31 Jul 2018 23:57:51 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Jul 2018 23:57:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,431,1526367600"; d="scan'208";a="61121295" Received: from mdkinney-mobl2.amr.corp.intel.com ([10.254.71.234]) by orsmga007.jf.intel.com with ESMTP; 31 Jul 2018 23:57:44 -0700 From: "Kinney, Michael D" To: edk2-devel@lists.01.org Cc: Star Zeng , Michael D Kinney Date: Tue, 31 Jul 2018 23:55:12 -0700 Message-Id: <20180801065722.9500-13-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.14.2.windows.3 In-Reply-To: <20180801065722.9500-1-michael.d.kinney@intel.com> References: <20180801065722.9500-1-michael.d.kinney@intel.com> Subject: [Patch v5 12/21] FmpDevicePkg: Remove DisplayUpdateProgressLib mapping for FmpDxe X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Aug 2018 06:57:52 -0000 From: Star Zeng FmpDxe does not consume DisplayUpdateProgressLib, so remove the mapping in FmpDevicePkg.dsc. Also rename the ESRT GUIDs. Cc: Michael D Kinney Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Star Zeng Reviewed-by: Michael D Kinney --- FmpDevicePkg/FmpDevicePkg.dsc | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/FmpDevicePkg/FmpDevicePkg.dsc b/FmpDevicePkg/FmpDevicePkg.dsc index 525640de2e..8d2436627d 100644 --- a/FmpDevicePkg/FmpDevicePkg.dsc +++ b/FmpDevicePkg/FmpDevicePkg.dsc @@ -43,8 +43,8 @@ [Defines] # # Define ESRT GUIDs for Firmware Management Protocol instances # - DEFINE FMP_GRAPHICS_ESRT_GUID = B461B3BD-E62A-4A71-841C-50BA4E500267 - DEFINE FMP_TEXT_ESRT_GUID = 226034C4-8B67-4536-8653-D6EE7CE5A316 + DEFINE SYSTEM_FMP_ESRT_GUID = B461B3BD-E62A-4A71-841C-50BA4E500267 + DEFINE DEVICE_FMP_ESRT_GUID = 226034C4-8B67-4536-8653-D6EE7CE5A316 [LibraryClasses] UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf @@ -116,11 +116,9 @@ [Components] FmpDevicePkg/FmpDxe/FmpDxe.inf { # - # FILE_GUID is FMP ESRT GUID + # FILE_GUID is used as ESRT GUID # - FILE_GUID = $(FMP_GRAPHICS_ESRT_GUID) - - DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdateProgressLibGraphics.inf + FILE_GUID = $(SYSTEM_FMP_ESRT_GUID) } FmpDevicePkg/FmpDxe/FmpDxe.inf { @@ -128,9 +126,7 @@ [Components] # # FILE_GUID is used as ESRT GUID # - FILE_GUID = $(FMP_TEXT_ESRT_GUID) - - DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLibText/DisplayUpdateProgressLibText.inf + FILE_GUID = $(DEVICE_FMP_ESRT_GUID) } [BuildOptions] -- 2.14.2.windows.3