From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: dandan.bi@intel.com) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by groups.io with SMTP; Sun, 28 Apr 2019 19:16:47 -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 fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Apr 2019 19:16:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,408,1549958400"; d="scan'208";a="139631973" Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.147]) by orsmga006.jf.intel.com with ESMTP; 28 Apr 2019 19:16:45 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Michael D Kinney , Kelly Steele , Liming Gao Subject: [patch 07/11] QuarkPlatformPkg: Remove PcdFrameworkCompatibilitySupport usage Date: Mon, 29 Apr 2019 10:16:03 +0800 Message-Id: <20190429021607.11304-8-dandan.bi@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 In-Reply-To: <20190429021607.11304-1-dandan.bi@intel.com> References: <20190429021607.11304-1-dandan.bi@intel.com> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1464 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 = 0; - if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) { - Status = DeviceRecoveryModule->GetRecoveryCapsuleInfo ( - PeiServices, - DeviceRecoveryModule, - 0, - &RecoveryCapsuleSize, - &DeviceId - ); - } else { - Status = DeviceRecoveryModule->GetRecoveryCapsuleInfo ( - PeiServices, - DeviceRecoveryModule, - 1, - &RecoveryCapsuleSize, - &DeviceId - ); - - - } + Status = DeviceRecoveryModule->GetRecoveryCapsuleInfo ( + PeiServices, + DeviceRecoveryModule, + 1, + &RecoveryCapsuleSize, + &DeviceId + ); if (EFI_ERROR (Status)) { return Status; } @@ -237,26 +225,16 @@ Returns: Buffer = NULL; Address = (UINTN) AllocatePages ((RecoveryCapsuleSize - 1) / 0x1000 + 1); ASSERT (Address); Buffer = (UINT8 *) (UINTN) Address; - if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) { - Status = DeviceRecoveryModule->LoadRecoveryCapsule ( - PeiServices, - DeviceRecoveryModule, - 0, - Buffer - ); - } else { - Status = DeviceRecoveryModule->LoadRecoveryCapsule ( - PeiServices, - DeviceRecoveryModule, - 1, - Buffer - ); - - } + Status = DeviceRecoveryModule->LoadRecoveryCapsule ( + PeiServices, + DeviceRecoveryModule, + 1, + Buffer + ); DEBUG ((EFI_D_INFO | EFI_D_LOAD, "LoadRecoveryCapsule Returns: %r\n", Status)); if (Status == 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