From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: liming.gao@intel.com) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by groups.io with SMTP; Mon, 06 May 2019 22:58:23 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 May 2019 22:58:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,440,1549958400"; d="scan'208";a="142132069" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga006.jf.intel.com with ESMTP; 06 May 2019 22:58:22 -0700 Received: from fmsmsx163.amr.corp.intel.com (10.18.125.72) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 6 May 2019 22:58:20 -0700 Received: from shsmsx108.ccr.corp.intel.com (10.239.4.97) by fmsmsx163.amr.corp.intel.com (10.18.125.72) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 6 May 2019 22:58:20 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.33]) by SHSMSX108.ccr.corp.intel.com ([169.254.8.126]) with mapi id 14.03.0415.000; Tue, 7 May 2019 13:58:18 +0800 From: "Liming Gao" To: "devel@edk2.groups.io" , "Bi, Dandan" CC: "Kinney, Michael D" , "Steele, Kelly" Subject: Re: [edk2-devel] [patch 07/11] QuarkPlatformPkg: Remove PcdFrameworkCompatibilitySupport usage Thread-Topic: [edk2-devel] [patch 07/11] QuarkPlatformPkg: Remove PcdFrameworkCompatibilitySupport usage Thread-Index: AQHU/jGn3nch5GnaYEqYm7d+MsXf8qZfNz3Q Date: Tue, 7 May 2019 05:58:18 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E443E6F@SHSMSX104.ccr.corp.intel.com> References: <20190429021607.11304-1-dandan.bi@intel.com> <20190429021607.11304-8-dandan.bi@intel.com> In-Reply-To: <20190429021607.11304-8-dandan.bi@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: liming.gao@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao >-----Original Message----- >From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of >Dandan Bi >Sent: Monday, April 29, 2019 10:16 AM >To: devel@edk2.groups.io >Cc: Kinney, Michael D ; Steele, Kelly >; Gao, Liming >Subject: [edk2-devel] [patch 07/11] QuarkPlatformPkg: Remove >PcdFrameworkCompatibilitySupport usage > >REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1464 > >Currently Framework compatibility support is not needed and >PcdFrameworkCompatibilitySupport will be removed from edk2. >So remove the usage of this PCD firstly. > >Cc: Michael D Kinney >Cc: Kelly Steele >Cc: Liming Gao >Signed-off-by: Dandan Bi >--- > .../Pei/PlatformInit/Generic/Recovery.c | 50 ++++++------------- > .../Pei/PlatformInit/PlatformEarlyInit.inf | 3 +- > 2 files changed, 15 insertions(+), 38 deletions(-) > >diff --git a/QuarkPlatformPkg/Platform/Pei/PlatformInit/Generic/Recovery.= c >b/QuarkPlatformPkg/Platform/Pei/PlatformInit/Generic/Recovery.c >index f6a076f757..67299a68b7 100644 >--- a/QuarkPlatformPkg/Platform/Pei/PlatformInit/Generic/Recovery.c >+++ b/QuarkPlatformPkg/Platform/Pei/PlatformInit/Generic/Recovery.c >@@ -1,10 +1,10 @@ > /** @file > Install Platform EFI_PEI_RECOVERY_MODULE_PPI and Implementation of > EFI_PEI_LOAD_RECOVERY_CAPSULE service. > >-Copyright (c) 2013-2016 Intel Corporation. >+Copyright (c) 2013-2019 Intel Corporation. > > SPDX-License-Identifier: BSD-2-Clause-Patent > > **/ > >@@ -195,29 +195,17 @@ Returns: > // > // If there is an image provider, get the capsule ID > // > if (ProviderAvailable) { > RecoveryCapsuleSize =3D 0; >- if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) { >- Status =3D DeviceRecoveryModule->GetRecoveryCapsuleInfo ( >- PeiServices, >- DeviceRecoveryModule, >- 0, >- &RecoveryCapsuleSize, >- &DeviceId >- ); >- } else { >- Status =3D DeviceRecoveryModule->GetRecoveryCapsuleInfo ( >- PeiServices, >- DeviceRecoveryModule, >- 1, >- &RecoveryCapsuleSize, >- &DeviceId >- ); >- >- >- } >+ Status =3D DeviceRecoveryModule->GetRecoveryCapsuleInfo ( >+ PeiServices, >+ DeviceRecoveryModule, >+ 1, >+ &RecoveryCapsuleSize, >+ &DeviceId >+ ); > > if (EFI_ERROR (Status)) { > return Status; > } > >@@ -237,26 +225,16 @@ Returns: > Buffer =3D NULL; > Address =3D (UINTN) AllocatePages ((RecoveryCapsuleSize - 1) / 0x100= 0 + 1); > ASSERT (Address); > > Buffer =3D (UINT8 *) (UINTN) Address; >- if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) { >- Status =3D DeviceRecoveryModule->LoadRecoveryCapsule ( >- PeiServices, >- DeviceRecoveryModule, >- 0, >- Buffer >- ); >- } else { >- Status =3D DeviceRecoveryModule->LoadRecoveryCapsule ( >- PeiServices, >- DeviceRecoveryModule, >- 1, >- Buffer >- ); >- >- } >+ Status =3D DeviceRecoveryModule->LoadRecoveryCapsule ( >+ PeiServices, >+ DeviceRecoveryModule, >+ 1, >+ Buffer >+ ); > > DEBUG ((EFI_D_INFO | EFI_D_LOAD, "LoadRecoveryCapsule >Returns: %r\n", Status)); > > if (Status =3D=3D EFI_DEVICE_ERROR) { > AssertMediaDeviceError (PeiServices); >diff --git a/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit= .inf >b/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.inf >index 617d681d77..df8b0dd3bd 100644 >--- a/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.inf >+++ b/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.inf >@@ -34,11 +34,11 @@ > # Recovery.c - provides the platform recoveyr functionality. > # MrcWrapper.c - Contains the logic to call MRC PPI and do Framework > # memory specific stuff like build memory map, build > # resource description hob for DXE phase,etc. > # Bootmode.c - Detect boot mode. >-# Copyright (c) 2013 - 2016 Intel Corporation. >+# Copyright (c) 2013 - 2019 Intel Corporation. > # > # SPDX-License-Identifier: BSD-2-Clause-Patent > # > ## > >@@ -138,11 +138,10 @@ > [FeaturePcd] > gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnFatUsbDisk > gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnDataCD > gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnFatFloppyDisk > gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnIdeDisk >- gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport > gQuarkPlatformTokenSpaceGuid.WaitIfResetDueToError > > [Pcd] > gQuarkPlatformTokenSpaceGuid.PcdEsramStage1Base > gQuarkPlatformTokenSpaceGuid.PcdFlashAreaSize >-- >2.18.0.windows.1 > > >