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.120; helo=mga04.intel.com; envelope-from=michael.a.kubacki@intel.com; receiver=edk2-devel@lists.01.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (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 3178D21BADAB9 for ; Wed, 16 Jan 2019 20:55:35 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Jan 2019 20:55:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,488,1539673200"; d="scan'208";a="292215100" Received: from orsmsx110.amr.corp.intel.com ([10.22.240.8]) by orsmga005.jf.intel.com with ESMTP; 16 Jan 2019 20:55:35 -0800 Received: from orsmsx156.amr.corp.intel.com (10.22.240.22) by ORSMSX110.amr.corp.intel.com (10.22.240.8) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 16 Jan 2019 20:55:34 -0800 Received: from orsmsx121.amr.corp.intel.com ([169.254.10.212]) by ORSMSX156.amr.corp.intel.com ([169.254.8.107]) with mapi id 14.03.0415.000; Wed, 16 Jan 2019 20:55:34 -0800 From: "Kubacki, Michael A" To: "Zeng, Star" , "edk2-devel@lists.01.org" CC: "Yao, Jiewen" Thread-Topic: [edk2-platforms PATCH] MinPlatformPkg: Use merged variable driver for emulated NV mode Thread-Index: AQHUrYWz/oaMXl2LyUOEaDlcDQI+lKWy5jDQ Date: Thu, 17 Jan 2019 04:55:34 +0000 Message-ID: <49AB4ACB9627B8468F29D589A27B74558449E84A@ORSMSX121.amr.corp.intel.com> References: <1547634278-43312-1-git-send-email-star.zeng@intel.com> In-Reply-To: <1547634278-43312-1-git-send-email-star.zeng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMmIzMGNhNTItYWQyNy00ZDhiLTk2MWItZGMwODg0NDA1YmNiIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiRVhuNFdqQnJhT3hvSlRVbWJUWG02UDc2Qkd5MHEreXBZc1pKS0kyZTJLeEwzR1BxaUswbjRhWEF4ZnVBQTlnViJ9 x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.22.254.140] MIME-Version: 1.0 Subject: Re: [edk2-platforms PATCH] MinPlatformPkg: Use merged variable driver for emulated NV mode X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2019 04:55:36 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Michael Kubacki =20 -----Original Message----- From: Zeng, Star=20 Sent: Wednesday, January 16, 2019 2:25 AM To: edk2-devel@lists.01.org Cc: Zeng, Star ; Kubacki, Michael A ; Yao, Jiewen Subject: [edk2-platforms PATCH] MinPlatformPkg: Use merged variable driver = for emulated NV mode REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1323 Merge EmuVariable and Real variable driver. The real variable driver has been updated to support emulated variable NV m= ode and the EmuVariableRuntimeDxe will be removed later, so use merged vari= able driver for emulated NV mode. Cc: Michael A Kubacki Cc: Jiewen Yao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Star Zeng --- Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc | 7 ++++= +-- Platform/Intel/MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc b= /Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc index 9b033f43a6cb..6bd526a27b09 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc @@ -1,7 +1,7 @@ ## @file # Platform description. # -# Copyright (c) 2017, Intel Corporation. All rights reserved.
+# Copyright (c) 2017 - 2019, Intel Corporation. All rights=20 +reserved.
# # This program and the accompanying materials are licensed and made availa= ble under # the terms and conditions of the BSD License which accompanies = this distribution. @@ -44,7 +44,10 @@ NULL|MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.inf } !else - MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf { + + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable|TRUE + } !endif =20 MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntim= eDxe.inf diff --git a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.= fdf b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf index da5ca7619732..be3caad402f9 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf +++ b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf @@ -1,7 +1,7 @@ ## @file # FDF file of Platform. # -# Copyright (c) 2017, Intel Corporation. All rights reserved.
+# Copyright (c) 2017 - 2019, Intel Corporation. All rights=20 +reserved.
# # This program and the accompanying materials are licensed and made availa= ble under # the terms and conditions of the BSD License which accompanies = this distribution. @@ -26,7 +26,7 @@ INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf =20 !if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly =3D=3D TRUE -INF Mde= ModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf +INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf !endif =20 INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRun= timeDxe.inf -- 2.7.0.windows.1