From nobody Fri May 10 07:52:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39720+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39720+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556504191; cv=none; d=zoho.com; s=zohoarc; b=aY7n62oLzO6UOgDpzlmoW92sMXlSjYtcCB/kQG1JHndsairgDVBacTxVOahoKp6RLQslN6qWNgmMeBDozBvuKTXHWVXxBOGtLnFWrLbhAbo8sOfiKPMA8t5+Ke1dwCtjFvfZIw4tGSLFU9lVw0c2ciPZiaCLEcbZ3SNuIonVQJk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556504191; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=Y9pXitX+4cBN0GvoLlfiW8LwdpliSvInPBgqKvR3lVo=; b=O2vP2RSflbqv9GZzYMb2JR7OPOfkGCdbsKbi0eN1IhyCWwW4XGIswP7lK3fkR4mwBR6GXLO3EBBpkeqSn2C6hvN/ThESPw5Ieb5VCOJL2xpZtja4Qf2nSxOjLz5UnPud7BY3uRMDIOsfNDslkozJYpKystAThbaAa4n1q7g9mZo= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39720+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 155650419141237.37606404302494; Sun, 28 Apr 2019 19:16:31 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by groups.io with SMTP; Sun, 28 Apr 2019 19:16:30 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-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:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,408,1549958400"; d="scan'208";a="139631891" X-Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.147]) by orsmga006.jf.intel.com with ESMTP; 28 Apr 2019 19:16:29 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao Subject: [edk2-devel] [patch 01/11] BaseTools/VfrCompile: Remove framework VFR support Date: Mon, 29 Apr 2019 10:15:57 +0800 Message-Id: <20190429021607.11304-2-dandan.bi@intel.com> In-Reply-To: <20190429021607.11304-1-dandan.bi@intel.com> References: <20190429021607.11304-1-dandan.bi@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,dandan.bi@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556504191; bh=ItM6fB4UgOVpU44n5P1wncfLDk1gQkJ5lmc3KZ8QM6Q=; h=Cc:Date:From:Reply-To:Subject:To; b=D4dv5NESGeTvgBsqRTCdkKsN3q1yYqiQSUd5NaUwh10zv3ijmTO/VyaTTruD6OPIiOy VCFImVH7db17sFNLu3b9xzyvFsG2SlMoNeWhhqU3ornoRcwXcyRtPgzIA3ntEfwMEQ1/c HjE1SGNm0CpAwqxl+9g59JKdKkB1mjW/LpI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1464 Currently there is no usage of framework VFR, remove the support from VfrCompile. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Dandan Bi Reviewed-by: Bob Feng Reviewed-by: Liming Gao --- BaseTools/Source/C/VfrCompile/VfrCompiler.cpp | 35 +----- BaseTools/Source/C/VfrCompile/VfrCompiler.h | 3 +- BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp | 23 +--- BaseTools/Source/C/VfrCompile/VfrFormPkg.h | 3 +- BaseTools/Source/C/VfrCompile/VfrSyntax.g | 103 +----------------- .../Source/C/VfrCompile/VfrUtilityLib.cpp | 52 +-------- BaseTools/Source/C/VfrCompile/VfrUtilityLib.h | 7 +- .../VfrCompiler_Utility_Man_Page.rtf | 4 - 8 files changed, 15 insertions(+), 215 deletions(-) diff --git a/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp b/BaseTools/Sour= ce/C/VfrCompile/VfrCompiler.cpp index c4d4d261ad..5f4d262d85 100644 --- a/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp +++ b/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp @@ -1,10 +1,10 @@ /** @file =20 VfrCompiler main class and main function. =20 -Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 #include "stdio.h" @@ -72,11 +72,10 @@ CVfrCompiler::OptionInitialization ( mOptions.PreprocessorOutputFileName =3D NULL; mOptions.VfrBaseFileName =3D NULL; mOptions.IncludePaths =3D NULL; mOptions.SkipCPreprocessor =3D TRUE; mOptions.CPreprocessorOptions =3D NULL; - mOptions.CompatibleMode =3D FALSE; mOptions.HasOverrideClassGuid =3D FALSE; mOptions.WarningAsError =3D FALSE; mOptions.AutoDefault =3D FALSE; mOptions.CheckDefault =3D FALSE; memset (&mOptions.OverrideClassGuid, 0, sizeof (EFI_GUID)); @@ -140,12 +139,10 @@ CVfrCompiler::OptionInitialization ( DebugError (NULL, 0, 1001, "Missing option", "-od - missing C-prep= rocessor argument"); goto Fail; } =20 AppendCPreprocessorOptions (Argv[Index]); - } else if (stricmp(Argv[Index], "-c") =3D=3D 0 || stricmp(Argv[Index],= "--compatible-framework") =3D=3D 0) { - mOptions.CompatibleMode =3D TRUE; } else if (stricmp(Argv[Index], "-s") =3D=3D 0|| stricmp(Argv[Index], = "--string-db") =3D=3D 0) { Index++; if ((Index >=3D Argc) || (Argv[Index][0] =3D=3D '-')) { DebugError (NULL, 0, 1001, "Missing option", "-s missing input str= ing file name"); goto Fail; @@ -559,12 +556,10 @@ CVfrCompiler::Usage ( " default is current directory", " -b, --create-ifr-package", " create an IFR HII pack file", " -n, --no-pre-processing", " do not preprocessing input file", - " -c, --compatible-framework", - " compatible framework vfr file", " -s, --string-db", " input uni string package file", " -g, --guid", " override class guid input", " format is xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx", @@ -683,11 +678,10 @@ CVfrCompiler::Compile ( if ((pInFile =3D fopen (LongFilePath (InFileName), "r")) =3D=3D NULL) { DebugError (NULL, 0, 0001, "Error opening the input file", "%s", InFil= eName); goto Fail; } =20 - InputInfo.CompatibleMode =3D mOptions.CompatibleMode; if (mOptions.HasOverrideClassGuid) { InputInfo.OverrideClassGuid =3D &mOptions.OverrideClassGuid; } else { InputInfo.OverrideClassGuid =3D NULL; } @@ -773,31 +767,10 @@ CVfrCompiler::AdjustBin ( //ok } else { DebugError (NULL, 0, 0001, "Error parsing vfr file", " %s.Buffer not a= llocated.", mOptions.VfrFileName); } =20 - // - // For UEFI mode, not do OpCode Adjust - // - if (mOptions.CompatibleMode) { - // - // Adjust Opcode to be compatible with framework vfr - // - Status =3D gCIfrRecordInfoDB.IfrRecordAdjust (); - if (Status !=3D VFR_RETURN_SUCCESS) { - // - // Record List Adjust Failed - // - SET_RUN_STATUS (STATUS_FAILED); - return; - } - // - // Re get the IfrRecord Buffer. - // - gCIfrRecordInfoDB.IfrRecordOutput (gRBuffer); - } - return; } =20 VOID CVfrCompiler::GenBinary ( @@ -851,24 +824,20 @@ CVfrCompiler::GenCFile ( =20 if (!IS_RUN_STATUS(STATUS_GENBINARY)) { goto Fail; } =20 - if (!mOptions.CreateIfrPkgFile || mOptions.CompatibleMode) { + if (!mOptions.CreateIfrPkgFile) { if ((pFile =3D fopen (LongFilePath (mOptions.COutputFileName), "w")) = =3D=3D NULL) { DebugError (NULL, 0, 0001, "Error opening output C file", "%s", mOpt= ions.COutputFileName); goto Fail; } =20 for (Index =3D 0; gSourceFileHeader[Index] !=3D NULL; Index++) { fprintf (pFile, "%s\n", gSourceFileHeader[Index]); } =20 - if (mOptions.CompatibleMode) { - gCVfrBufferConfig.OutputCFile (pFile, mOptions.VfrBaseFileName); - } - if (gCFormPkg.GenCFile (mOptions.VfrBaseFileName, pFile, &gRBuffer) != =3D VFR_RETURN_SUCCESS) { fclose (pFile); goto Fail; } fclose (pFile); diff --git a/BaseTools/Source/C/VfrCompile/VfrCompiler.h b/BaseTools/Source= /C/VfrCompile/VfrCompiler.h index b8cccca4b0..b6e207d2ce 100644 --- a/BaseTools/Source/C/VfrCompile/VfrCompiler.h +++ b/BaseTools/Source/C/VfrCompile/VfrCompiler.h @@ -1,10 +1,10 @@ /** @file =20 VfrCompiler internal definitions. =20 -Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 #ifndef _VFRCOMPILER_H_ @@ -45,11 +45,10 @@ typedef struct { CHAR8 *PreprocessorOutputFileName; CHAR8 *VfrBaseFileName; // name of input VFR file with no path or ext= ension CHAR8 *IncludePaths; bool SkipCPreprocessor; CHAR8 *CPreprocessorOptions; - BOOLEAN CompatibleMode; BOOLEAN HasOverrideClassGuid; EFI_GUID OverrideClassGuid; BOOLEAN WarningAsError; BOOLEAN AutoDefault; BOOLEAN CheckDefault; diff --git a/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp b/BaseTools/Sourc= e/C/VfrCompile/VfrFormPkg.cpp index 5948dc0883..36d3baaf10 100644 --- a/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp +++ b/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp @@ -1,10 +1,10 @@ /** @file =20 The definition of CFormPkg's member function =20 -Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 #include "stdio.h" @@ -442,25 +442,14 @@ CFormPkg::GenCFile ( =20 if ((Ret =3D BuildPkgHdr(&PkgHdr)) !=3D VFR_RETURN_SUCCESS) { return Ret; } =20 - // - // For framework vfr file, the extension framework header will be added. - // - if (VfrCompatibleMode) { - fprintf (pFile, " // FRAMEWORK PACKAGE HEADER Length\n"); - PkgLength =3D PkgHdr->Length + sizeof (UINT32) + 2; - _WRITE_PKG_LINE(pFile, BYTES_PRE_LINE, " ", (CHAR8 *)&PkgLength, size= of (UINT32)); - fprintf (pFile, "\n\n // FRAMEWORK PACKAGE HEADER Type\n"); - PkgLength =3D 3; - _WRITE_PKG_LINE(pFile, BYTES_PRE_LINE, " ", (CHAR8 *)&PkgLength, size= of (UINT16)); - } else { - fprintf (pFile, " // ARRAY LENGTH\n"); - PkgLength =3D PkgHdr->Length + sizeof (UINT32); - _WRITE_PKG_LINE(pFile, BYTES_PRE_LINE, " ", (CHAR8 *)&PkgLength, size= of (UINT32)); - } + + fprintf (pFile, " // ARRAY LENGTH\n"); + PkgLength =3D PkgHdr->Length + sizeof (UINT32); + _WRITE_PKG_LINE(pFile, BYTES_PRE_LINE, " ", (CHAR8 *)&PkgLength, sizeof= (UINT32)); =20 fprintf (pFile, "\n\n // PACKAGE HEADER\n"); _WRITE_PKG_LINE(pFile, BYTES_PRE_LINE, " ", (CHAR8 *)PkgHdr, sizeof (EF= I_HII_PACKAGE_HEADER)); PkgLength =3D sizeof (EFI_HII_PACKAGE_HEADER); =20 @@ -966,11 +955,11 @@ CFormPkg::DeclarePendingQuestion ( =20 // // For undefined Efi VarStore type question // Append the extended guided opcode to contain VarName // - if (VarStoreType =3D=3D EFI_VFR_VARSTORE_EFI || VfrCompatibleMode) { + if (VarStoreType =3D=3D EFI_VFR_VARSTORE_EFI) { CIfrVarEqName CVNObj (QId, Info.mInfo.mVarName); CVNObj.SetLineNo (LineNo); } =20 // diff --git a/BaseTools/Source/C/VfrCompile/VfrFormPkg.h b/BaseTools/Source/= C/VfrCompile/VfrFormPkg.h index 68df87ba88..1cea4f0e25 100644 --- a/BaseTools/Source/C/VfrCompile/VfrFormPkg.h +++ b/BaseTools/Source/C/VfrCompile/VfrFormPkg.h @@ -1,10 +1,10 @@ /** @file =20 The definition of CFormPkg's member function =20 -Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 #ifndef _EFIIFRCLASS_H_ @@ -93,11 +93,10 @@ struct SBufferNode { CHAR8 *mBufferFree; struct SBufferNode *mNext; }; =20 typedef struct { - BOOLEAN CompatibleMode; EFI_GUID *OverrideClassGuid; } INPUT_INFO_TO_SYNTAX; =20 class CFormPkg { private: diff --git a/BaseTools/Source/C/VfrCompile/VfrSyntax.g b/BaseTools/Source/C= /VfrCompile/VfrSyntax.g index 04fe030b61..24b30e3825 100644 --- a/BaseTools/Source/C/VfrCompile/VfrSyntax.g +++ b/BaseTools/Source/C/VfrCompile/VfrSyntax.g @@ -1,9 +1,9 @@ /*++ @file Vfr Syntax =20 -Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 --*/ =20 #header<< @@ -47,11 +47,10 @@ VfrParserStart ( IN FILE *File, IN INPUT_INFO_TO_SYNTAX *InputInfo ) { ParserBlackBox VfrParser(File); - VfrParser.parser()->SetCompatibleMode (InputInfo->CompatibleMode); VfrParser.parser()->SetOverrideClassGuid (InputInfo->OverrideClassGuid); return VfrParser.parser()->vfrProgram(); } >> =20 @@ -673,17 +672,10 @@ vfrFormSetDefinition : << _DeclareStandardDef= aultStorage (GET_LINENO (L)); >> vfrFormSetList E:EndFormSet << - if (mCompatibleMode)= { - // - // declare all und= efined varstore and efivarstore - // - _DeclareDefaultFra= meworkVarStore (GET_LINENO(E)); - } - =20 // // Declare undefined= Question so that they can be used in expression. // if (gCFormPkg.HavePe= ndingUnassigned()) { mParserStatus +=3D= gCFormPkg.DeclarePendingQuestion ( @@ -5047,23 +5039,18 @@ public: =20 VOID _STRCAT (IN OUT CHAR8 **, IN CONST CHAR8 *); =20 VOID _DeclareDefaultLinearVarStore (IN UINT32); VOID _DeclareStandardDefaultStorage (IN UINT32); - VOID _DeclareDefaultFrameworkVarStore (IN UINT32); =20 VOID AssignQuestionKey (IN CIfrQuestionHeader &, IN ANTLR= TokenPtr); =20 VOID ConvertIdExpr (IN UINT32 &, IN UINT32, IN EF= I_QUESTION_ID, IN CHAR8 *, IN UINT32); VOID IdEqValDoSpecial (IN UINT32 &, IN UINT32, IN EF= I_QUESTION_ID, IN CHAR8 *, IN UINT32, IN UINT16, IN EFI_COMPARE_TYPE); VOID IdEqIdDoSpecial (IN UINT32 &, IN UINT32, IN EF= I_QUESTION_ID, IN CHAR8 *, IN UINT32, IN EFI_QUESTION_ID, IN CHAR8 *, IN UI= NT32, IN EFI_COMPARE_TYPE); VOID IdEqListDoSpecial (IN UINT32 &, IN UINT32, IN EF= I_QUESTION_ID, IN CHAR8 *, IN UINT32, IN UINT16, IN UINT16 *); VOID SetOverrideClassGuid (IN EFI_GUID *); -// -// For framework vfr compatibility -// - VOID SetCompatibleMode (IN BOOLEAN); >> } =20 << VOID @@ -5540,88 +5527,10 @@ EfiVfrParser::_STOR ( Ref.DevicePath =3D _STOSID (DevicePath, LineNum); =20 return Ref; } =20 -// -// framework vfr to default declare varstore for each structure -// -VOID -EfiVfrParser::_DeclareDefaultFrameworkVarStore ( - IN UINT32 LineNo - ) -{ - SVfrVarStorageNode *pNode; - UINT32 TypeSize; - BOOLEAN FirstNode; - CONST CHAR8 VarName[] =3D "Setup"; - - FirstNode =3D TRUE; - pNode =3D gCVfrDataStorage.GetBufferVarStoreList(); - if (pNode =3D=3D NULL && gCVfrVarDataTypeDB.mFirstNewDataTypeName !=3D N= ULL) { - // - // Create the default Buffer Var Store when no VarStore is defined. - // its name should be "Setup" - // - gCVfrVarDataTypeDB.GetDataTypeSize (gCVfrVarDataTypeDB.mFirstNewDataTy= peName, &TypeSize); - CIfrVarStore VSObj; - VSObj.SetLineNo (LineNo); - VSObj.SetVarStoreId (0x1); //the first and only one Buffer Var Store - VSObj.SetSize ((UINT16) TypeSize); - //VSObj.SetName (gCVfrVarDataTypeDB.mFirstNewDataTypeName); - VSObj.SetName ((CHAR8 *) VarName); - VSObj.SetGuid (&mFormsetGuid); -#ifdef VFREXP_DEBUG - printf ("Create the default VarStoreName is %s\n", gCVfrVarDataTypeDB.= mFirstNewDataTypeName); -#endif - } else { - for (; pNode !=3D NULL; pNode =3D pNode->mNext) { - // - // create the default varstore opcode for not declared varstore - // the first varstore name should be "Setup" - // - if (!pNode->mAssignedFlag) { - CIfrVarStore VSObj; - VSObj.SetLineNo (LineNo); - VSObj.SetVarStoreId (pNode->mVarStoreId); - VSObj.SetSize ((UINT16) pNode->mStorageInfo.mDataType->mTotalSize); - if (FirstNode) { - VSObj.SetName ((CHAR8 *) VarName); - FirstNode =3D FALSE; - } else { - VSObj.SetName (pNode->mVarStoreName); - } - VSObj.SetGuid (&pNode->mGuid); -#ifdef VFREXP_DEBUG - printf ("undefined VarStoreName is %s and Id is 0x%x\n", pNode->mV= arStoreName, pNode->mVarStoreId); -#endif - } - } - } - - pNode =3D gCVfrDataStorage.GetEfiVarStoreList(); - for (; pNode !=3D NULL; pNode =3D pNode->mNext) { - // - // create the default efi varstore opcode for not exist varstore - // - if (!pNode->mAssignedFlag) { - CIfrVarStoreEfi VSEObj; - VSEObj.SetLineNo (LineNo); - VSEObj.SetAttributes (0x00000002); //hardcode EFI_VARIABLE_BOOTSERVI= CE_ACCESS attribute - VSEObj.SetGuid (&pNode->mGuid); - VSEObj.SetVarStoreId (pNode->mVarStoreId); - // Generate old efi varstore storage structure for compatible with o= ld "VarEqVal" opcode, - // which is 3 bytes less than new structure define in UEFI Spec 2.3.= 1. - VSEObj.SetBinaryLength (sizeof (EFI_IFR_VARSTORE_EFI) - 3); -#ifdef VFREXP_DEBUG - printf ("undefined Efi VarStoreName is %s and Id is 0x%x\n", pNode->= mVarStoreName, pNode->mVarStoreId); -#endif - } - } - -} - VOID EfiVfrParser::_DeclareDefaultLinearVarStore ( IN UINT32 LineNo ) { @@ -5917,20 +5826,10 @@ VOID EfiVfrParser::SetOverrideClassGuid (IN EFI_GUID *OverrideClassGuid) { mOverrideClassGuid =3D OverrideClassGuid; } =20 -// -// For framework vfr compatibility -// -VOID -EfiVfrParser::SetCompatibleMode (IN BOOLEAN Mode) -{ - mCompatibleMode =3D Mode; - mCVfrQuestionDB.SetCompatibleMode (Mode); -} - VOID EfiVfrParser::CheckDuplicateDefaultValue ( IN EFI_DEFAULT_ID DefaultId, IN ANTLRTokenPtr Tok ) diff --git a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp b/BaseTools/So= urce/C/VfrCompile/VfrUtilityLib.cpp index 9c9c4d4054..2b9b5dbb1c 100644 --- a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp +++ b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp @@ -1,10 +1,10 @@ /** @file =20 Vfr common library functions. =20 -Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 #include "stdio.h" @@ -757,21 +757,10 @@ CVfrVarDataTypeDB::GetFieldOffset ( { if (Field =3D=3D NULL) { return VFR_RETURN_FATAL_ERROR; } =20 - // - // Framework Vfr file Array Index is from 1. - // But Uefi Vfr file Array Index is from 0. - // - if (VfrCompatibleMode && ArrayIdx !=3D INVALID_ARRAY_INDEX) { - if (ArrayIdx =3D=3D 0) { - return VFR_RETURN_ERROR_ARRARY_NUM; - } - ArrayIdx =3D ArrayIdx - 1; - } - if ((ArrayIdx !=3D INVALID_ARRAY_INDEX) && ((Field->mArrayNum =3D=3D 0) = || (Field->mArrayNum <=3D ArrayIdx))) { return VFR_RETURN_ERROR_ARRARY_NUM; } =20 // @@ -1681,21 +1670,11 @@ CVfrDataStorage::GetFreeVarStoreId ( EFI_VFR_VARSTORE_TYPE VarType ) { UINT32 Index, Mask, Offset; =20 - // - // Assign the different ID range for the different type VarStore to supp= ort Framework Vfr - // Index =3D 0; - if ((!VfrCompatibleMode) || (VarType =3D=3D EFI_VFR_VARSTORE_BUFFER)) { - Index =3D 0; - } else if (VarType =3D=3D EFI_VFR_VARSTORE_EFI) { - Index =3D 1; - } else if (VarType =3D=3D EFI_VFR_VARSTORE_NAME) { - Index =3D 2; - } =20 for (; Index < EFI_FREE_VARSTORE_ID_BITMAP_SIZE; Index++) { if (mFreeVarStoreIdBitMap[Index] !=3D 0xFFFFFFFF) { break; } @@ -1913,17 +1892,10 @@ CVfrDataStorage::GetVarStoreByDataType ( ) { SVfrVarStorageNode *pNode; SVfrVarStorageNode *MatchNode; =20 - // - // Framework VFR uses Data type name as varstore name, so don't need che= ck again. - // - if (VfrCompatibleMode) { - return VFR_RETURN_UNDEFINED; - } - MatchNode =3D NULL; for (pNode =3D mBufferVarStoreList; pNode !=3D NULL; pNode =3D pNode->mN= ext) { if (strcmp (pNode->mStorageInfo.mDataType->mTypeName, DataTypeName) != =3D 0) { continue; } @@ -2287,20 +2259,10 @@ CVfrDataStorage::GetNameVarStoreInfo ( =20 if (mCurrVarStorageNode =3D=3D NULL) { return VFR_RETURN_GET_NVVARSTORE_ERROR; } =20 - // - // Framework Vfr file Index is from 1, but Uefi Vfr file Index is from 0. - // - if (VfrCompatibleMode) { - if (Index =3D=3D 0) { - return VFR_RETURN_ERROR_ARRARY_NUM; - } - Index --; - } - Info->mInfo.mVarName =3D mCurrVarStorageNode->mStorageInfo.mNameSpace.mN= ameTable[Index]; =20 return VFR_RETURN_SUCCESS; } =20 @@ -2859,14 +2821,11 @@ CVfrQuestionDB::RegisterQuestion ( } =20 if (QuestionId =3D=3D EFI_QUESTION_ID_INVALID) { QuestionId =3D GetFreeQuestionId (); } else { - // - // For Framework Vfr, don't check question ID conflict. - // - if (!VfrCompatibleMode && ChekQuestionIdFree (QuestionId) =3D=3D FALSE= ) { + if (ChekQuestionIdFree (QuestionId) =3D=3D FALSE) { delete pNode; return VFR_RETURN_QUESTIONID_REDEFINED; } MarkQuestionIdUsed (QuestionId); } @@ -3366,14 +3325,11 @@ CVfrQuestionDB::UpdateQuestionId ( if (QId =3D=3D NewQId) { // don't update return VFR_RETURN_SUCCESS; } =20 - // - // For Framework Vfr, don't check question ID conflict. - // - if (!VfrCompatibleMode && ChekQuestionIdFree (NewQId) =3D=3D FALSE) { + if (ChekQuestionIdFree (NewQId) =3D=3D FALSE) { return VFR_RETURN_REDEFINED; } =20 for (pNode =3D mQuestionList; pNode !=3D NULL; pNode =3D pNode->mNext) { if (pNode->mQuestionId =3D=3D QId) { @@ -3955,12 +3911,10 @@ CVfrStringDB::GetUnicodeStringTextSize ( } =20 return StringSize; } =20 -BOOLEAN VfrCompatibleMode =3D FALSE; - CVfrVarDataTypeDB gCVfrVarDataTypeDB; CVfrDefaultStore gCVfrDefaultStore; CVfrDataStorage gCVfrDataStorage; =20 =20 diff --git a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h b/BaseTools/Sour= ce/C/VfrCompile/VfrUtilityLib.h index e2b2917e99..57bb0c424d 100644 --- a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h +++ b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h @@ -1,10 +1,10 @@ /** @file =20 Vfr common library functions. =20 -Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 #ifndef _VFRUTILITYLIB_H_ @@ -13,11 +13,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include "string.h" #include "Common/UefiBaseTypes.h" #include "EfiVfr.h" #include "VfrError.h" =20 -extern BOOLEAN VfrCompatibleMode; static EFI_GUID gEdkiiIfrBitVarGuid =3D EDKII_IFR_BIT_VARSTORE_GUID; =20 #define MAX_BIT_WIDTH 32 #define MAX_NAME_LEN 64 #define MAX_STRING_LEN 0x100 @@ -422,14 +421,10 @@ public: EFI_VFR_RETURN_CODE FindQuestion (IN EFI_QUESTION_ID); EFI_VFR_RETURN_CODE FindQuestion (IN CHAR8 *); VOID PrintAllQuestion (IN VOID); VOID ResetInit (IN VOID); =20 - VOID SetCompatibleMode (IN BOOLEAN Mode) { - VfrCompatibleMode =3D Mode; - } - private: CVfrQuestionDB (IN CONST CVfrQuestionDB&); // Prevent copy-c= onstruction CVfrQuestionDB& operator=3D (IN CONST CVfrQuestionDB&); // Prevent assi= gnment }; =20 diff --git a/BaseTools/UserManuals/VfrCompiler_Utility_Man_Page.rtf b/BaseT= ools/UserManuals/VfrCompiler_Utility_Man_Page.rtf index fa0beebb9c..2b056f8f26 100644 --- a/BaseTools/UserManuals/VfrCompiler_Utility_Man_Page.rtf +++ b/BaseTools/UserManuals/VfrCompiler_Utility_Man_Page.rtf @@ -145,14 +145,10 @@ The generated file will be placed into the output dir= ectory sp\hich\af43\dbch\af \par }\pard \ltrpar\ql \li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\= lin0\itap0 {\rtlch\fcs1 \ab\af43\afs18 \ltrch\fcs0 \b\fs18\cf1\insrsid14166= 490 \hich\af43\dbch\af31505\loch\f43 -n, --no-pre-processing \par }\pard \ltrpar\ql \li360\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin= 0\lin360\itap0 {\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid141664= 90 \hich\af43\dbch\af31505\loch\f43 Do not preprocess}{\rtlch\fcs1 \af43\af= s18 \ltrch\fcs0=20 \fs18\cf1\insrsid2570438 \hich\af43\dbch\af31505\loch\f43 t}{\rtlch\fcs1 = \af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid1204842 \hich\af43\dbch\af31505\lo= ch\f43 he}{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid14166490 \h= ich\af43\dbch\af31505\loch\f43=20 input vfr file. The input VFR file has been pro\hich\af43\dbch\af31505\lo= ch\f43 cessed. If this option is not specified, the default behavior is sam= e to set this option.=20 \par }{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid83254 \hich\af= 43\dbch\af31505\loch\f43 Selecting this option disables preprocessing of VF= R files. }{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid2570438=20 -\par }\pard \ltrpar\ql \li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\= lin0\itap0 {\rtlch\fcs1 \ab\af43\afs18 \ltrch\fcs0 \b\fs18\cf1\insrsid14166= 490 \hich\af43\dbch\af31505\loch\f43 -c, --compatible-framework -\par }\pard \ltrpar\ql \li360\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin= 0\lin360\itap0 {\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid141664= 90 \hich\af43\dbch\af31505\loch\f43 Recognize}{\rtlch\fcs1 \af43\afs18 \ltr= ch\fcs0 \fs18\cf1\insrsid83254=20 -\hich\af43\dbch\af31505\loch\f43 s}{\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \f= s18\cf1\insrsid14166490 \hich\af43\dbch\af31505\loch\f43 the input VFR fil= e is the framework VFR syntax. If this option is n\hich\af43\dbch\af31505\l= och\f43=20 -ot specified, the UEFI syntax is default }{\rtlch\fcs1 \af43\afs18 \ltrch\= fcs0 \fs18\cf1\insrsid83254 \hich\af43\dbch\af31505\loch\f43 the VFR }{\rtl= ch\fcs1 \af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid14166490 \hich\af43\dbch\a= f31505\loch\f43 syntax. \par }\pard \ltrpar\ql \li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\= lin0\itap0 {\rtlch\fcs1 \ab\af43\afs18 \ltrch\fcs0 \b\fs18\cf1\insrsid14166= 490 \hich\af43\dbch\af31505\loch\f43 -h, --help \par }\pard \ltrpar\ql \fi360\li0\ri0\sb200\nowidctlpar\wrapdefault\faauto= \rin0\lin0\itap0 {\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \fs18\cf1\insrsid1416= 6490 \hich\af43\dbch\af31505\loch\f43 Print version and usage of this progr= am and exit. \par }\pard \ltrpar\ql \li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\= lin0\itap0\pararsid12931970 {\rtlch\fcs1 \ab\af43\afs18 \ltrch\fcs0 \b\fs18= \insrsid12931970\charrsid6448922 \hich\af43\dbch\af31505\loch\f43 -s, --str= ing-db \par }\pard \ltrpar\ql \fi360\li0\ri0\sb200\nowidctlpar\wrapdefault\faauto= \rin0\lin0\itap0\pararsid12931970 {\rtlch\fcs1 \af43\afs18 \ltrch\fcs0 \fs1= 8\insrsid12931970\charrsid6448922 \hich\af43\dbch\af31505\loch\f43 Input un= i string package file. \par }\pard \ltrpar\ql \li0\ri0\sb200\nowidctlpar\wrapdefault\faauto\rin0\= lin0\itap0\pararsid12931970 {\rtlch\fcs1 \ab\af43\afs18 \ltrch\fcs0 \b\fs18= \insrsid12931970\charrsid6448922 \hich\af43\dbch\af31505\loch\f43 -g, --guid --=20 2.18.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39720): https://edk2.groups.io/g/devel/message/39720 Mute This Topic: https://groups.io/mt/31378993/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 10 07:52:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39721+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39721+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556504195; cv=none; d=zoho.com; s=zohoarc; b=Ft5C2A5+/LSkX4zlknOkO6fkbtSJlWQ8c9I+ha7xz3Etde7S+IN+6KKfgbCkNkipr0WoQrybIgvOjWmp0Rz7KoKLfzuUNKSLRLvBWnup3VnCzlXCYCw9Gj5rrc4EDVGYjdGumocnDdDFKZ5eVOIpo0njG7ppIq+3SbXlWN3rpxc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556504195; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=IjtlZGXcO0YgLzZiKDO7Y8D5qNuYNsL84N9beIhKRYM=; b=fP7j4woiuiS7F481Bl9ILZ35fsxyZKujvIoTQOTtbOFbTu2ixL8XwLNI9iF4pzmorDH3teUBbkQLAYFDLT/sB5A8NJ+qmJ502u13DA04ypcmCX+nPaLjtL5TvDe8NB03FhrQoP7vfca/fvbCyvy1AUP7fvwHxFWpqpKteYYi94E= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39721+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1556504195518468.23280977868194; Sun, 28 Apr 2019 19:16:35 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com []) by groups.io with SMTP; Sun, 28 Apr 2019 19:16:34 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-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:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,408,1549958400"; d="scan'208";a="139631903" X-Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.147]) by orsmga006.jf.intel.com with ESMTP; 28 Apr 2019 19:16:34 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Ray Ni Subject: [edk2-devel] [patch 02/11] FatPkg/FatPei: Remove PcdFrameworkCompatibilitySupport usage Date: Mon, 29 Apr 2019 10:15:58 +0800 Message-Id: <20190429021607.11304-3-dandan.bi@intel.com> In-Reply-To: <20190429021607.11304-1-dandan.bi@intel.com> References: <20190429021607.11304-1-dandan.bi@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,dandan.bi@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556504195; bh=LKm9zQ1Hg4WySRwDWqQV7YVwtUsbB+qD2CYhTCox0yg=; h=Cc:Date:From:Reply-To:Subject:To; b=J8WhDao1Ek0U02M6TJ15SmyXjr6thFbJh4W8bCQXEXlcgEGGJw20ASkxw0xOkp58YcQ 18GGFDmrZIRg/o25yw6ICZqvRs1skMIRLm/YM+pqoDr/VBaxFaqS1qnLURheNCtS1yJTJ PscpXlsNsFx8y097WZ7Rz0PZwEh+kSFyd38= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1464 Currently Framework compatibility is not needed and PcdFrameworkCompatibilitySupport will be removed from edk2. So remove the usage of this PCD firstly. Cc: Ray Ni Signed-off-by: Dandan Bi Reviewed-by: Ray Ni --- FatPkg/FatPei/FatLiteApi.c | 10 +--------- FatPkg/FatPei/FatPei.inf | 4 ---- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/FatPkg/FatPei/FatLiteApi.c b/FatPkg/FatPei/FatLiteApi.c index 0bf6ddae6a..b9f883b9e0 100644 --- a/FatPkg/FatPei/FatLiteApi.c +++ b/FatPkg/FatPei/FatLiteApi.c @@ -1,9 +1,9 @@ /** @file FAT recovery PEIM entry point, Ppi Functions and FAT Api functions. =20 -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 @@ -429,14 +429,10 @@ GetRecoveryCapsuleInfo ( =20 if (EFI_ERROR (Status)) { return Status; } =20 - if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) { - CapsuleInstance =3D CapsuleInstance + 1; - } - if ((CapsuleInstance =3D=3D 0) || (CapsuleInstance > NumberRecoveryCapsu= les)) { return EFI_NOT_FOUND; } =20 PrivateData =3D PEI_FAT_PRIVATE_DATA_FROM_THIS (This); @@ -557,14 +553,10 @@ LoadRecoveryCapsule ( =20 if (EFI_ERROR (Status)) { return Status; } =20 - if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) { - CapsuleInstance =3D CapsuleInstance + 1; - } - if ((CapsuleInstance =3D=3D 0) || (CapsuleInstance > NumberRecoveryCapsu= les)) { return EFI_NOT_FOUND; } =20 PrivateData =3D PEI_FAT_PRIVATE_DATA_FROM_THIS (This); diff --git a/FatPkg/FatPei/FatPei.inf b/FatPkg/FatPei/FatPei.inf index b554aae040..d3466db9bf 100644 --- a/FatPkg/FatPei/FatPei.inf +++ b/FatPkg/FatPei/FatPei.inf @@ -63,14 +63,10 @@ [Ppis] gEfiPeiVirtualBlockIoPpiGuid ## SOMETIMES_CONSUMES PPI_= NOTIFY gEfiPeiVirtualBlockIo2PpiGuid ## SOMETIMES_CONSUMES PPI_= NOTIFY gEfiPeiDeviceRecoveryModulePpiGuid ## SOMETIMES_PRODUCES =20 - -[FeaturePcd] - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport = ## CONSUMES - [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryFileName ## CONSUMES =20 [Depex] gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid --=20 2.18.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39721): https://edk2.groups.io/g/devel/message/39721 Mute This Topic: https://groups.io/mt/31378995/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 10 07:52:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39722+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39722+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556504198; cv=none; d=zoho.com; s=zohoarc; b=MVKhJG1B2QM+sfPntQlA0elfJqtMQx83FIW2J0CZeK/N5L9uyCL+V5EV8o1tPw77e/QB9VrVOSJTeqEgJ4LyzZxNnrJ523fiEkPQYY88C0e38B4oUTjvrF85c2zS9os2zqy9KJFEMnDfsPzdryd5WPQ++f/UhCvvXgGyJ4Re8wI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556504198; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=zgvgH8yIZazvcqHKFReSVWGSSMS24jDB2froSFUk76Q=; b=NQgtBJCzbL+lyNVIxd/LUS9MVWpU1Oo6MvuNo1qruEOSrvmP8PxWbVn3c36ifd9//tEyAjkXIUJNAJWfZ5n4UCHdsrSuWuM/pTEAcBypDwIjA2Q0dlfTb5fOcc6ZCG9eExJ0cEeczKKnCb4GXWjAvSgn079v2Cbp6DkS1sAo7/0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39722+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1556504198005852.2597207355001; Sun, 28 Apr 2019 19:16:38 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com []) by groups.io with SMTP; Sun, 28 Apr 2019 19:16:37 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-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:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,408,1549958400"; d="scan'208";a="139631921" X-Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.147]) by orsmga006.jf.intel.com with ESMTP; 28 Apr 2019 19:16:36 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Liming Gao Subject: [edk2-devel] [patch 03/11] IntelFrameworkModulePkg: Remove PcdFrameworkCompatibilitySupport usage Date: Mon, 29 Apr 2019 10:15:59 +0800 Message-Id: <20190429021607.11304-4-dandan.bi@intel.com> In-Reply-To: <20190429021607.11304-1-dandan.bi@intel.com> References: <20190429021607.11304-1-dandan.bi@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,dandan.bi@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556504197; bh=OgIalkvquaddx0P2JvNBiJmiXbbbldB9OLcATGv04ew=; h=Cc:Date:From:Reply-To:Subject:To; b=OaLceHVK9IfqO9xZwnNSIK+toEHlssaUx1QhY08rL+YDXoa/9feT3Au+WWXwnFSDR6r RLDK+7F9rDqLbG7yLVskjWzS8n48ok/u1nu5sOinoKV/CB+Unhs8sKZEm8v76HxgW5hqj apVISFo4o0OUUyFK+n9VcbxxkD951kWGGJI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1464 Currently Framework compatibility is not needed and PcdFrameworkCompatibilitySupport will be removed from edk2. So remove the usage of this PCD firstly. Cc: Liming Gao Signed-off-by: Dandan Bi Reviewed-by: Liming Gao --- .../Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c | 10 +--------- .../Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf | 3 +-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Sav= e.c b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c index b5f8131f98..366ada935d 100644 --- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c +++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c @@ -1,10 +1,10 @@ /** @file This is an implementation of the ACPI S3 Save protocol. This is defined= in S3 boot path specification 0.9. =20 -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 @@ -138,14 +138,10 @@ S3Ready ( if (AlreadyEntered) { return EFI_SUCCESS; } AlreadyEntered =3D TRUE; =20 - if (FeaturePcdGet(PcdFrameworkCompatibilitySupport)) { - S3ReadyThunkPlatform (); - } - return EFI_SUCCESS; } =20 /** The Driver Entry Point. @@ -180,14 +176,10 @@ InstallAcpiS3Save ( mLegacyRegionSize =3D 0x250; } else { mLegacyRegionSize =3D 0x100; } =20 - if (FeaturePcdGet(PcdFrameworkCompatibilitySupport)) { - InstallAcpiS3SaveThunk (); - } - Status =3D gBS->InstallProtocolInterface ( &ImageHandle, &gEfiAcpiS3SaveProtocolGuid, EFI_NATIVE_INTERFACE, &mS3Save diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Sav= eDxe.inf b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveD= xe.inf index 2e4f0868d2..0cfcb8ce53 100644 --- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf +++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3SaveDxe.inf @@ -1,9 +1,9 @@ ## @file # AcpiS3Save module installs ACPI S3 Save protocol to prepare S3 boot data. # -# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # ## =20 @@ -56,11 +56,10 @@ ## SOMETIMES_CONSUMES gEdkiiVariableLockProtocolGuid =20 [FeaturePcd] gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformCsmSupport = ## CONSUMES - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport = ## CONSUMES =20 [Pcd] gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3AcpiReservedMemorySize = ## SOMETIMES_CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable = ## CONSUMES =20 --=20 2.18.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39722): https://edk2.groups.io/g/devel/message/39722 Mute This Topic: https://groups.io/mt/31378997/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 10 07:52:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39723+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39723+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556504200; cv=none; d=zoho.com; s=zohoarc; b=YegH2WKKOEwRUC2oGsdWQ929Bj6iOk/iEn3U8trWAoMbifSs4poloR/s/66iIOCiil9+BbVSTPZCTssF++Vk1KzPBMgOx4/tIxtZIteCwB7FtrcRvtiMAMcfQATmedUC/3BKRSfq14PnXKCEniSbVbYc1jNLiK4BOZ40O3pfWMw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556504200; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=M2mebT0KMsFrwxrIBhlvqJFYqdJ1Thjic/aYDmXXBxA=; b=CCbldPQB6TIOXanyOEMAdp3sQkRU1ychWcNJduyzOnewyx+6FZPm+NkDld7ZKd/gfauMqS9SaGULd99RtWQZ9oaPBocEGW2KRqnxrf/wECzBDmGBoffhR0ZY/a+yJUVYqvgxufn67APQon/M5PNvJopi4Ufa/d2bWQynRtwkm44= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39723+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1556504200827414.7928300720972; Sun, 28 Apr 2019 19:16:40 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com []) by groups.io with SMTP; Sun, 28 Apr 2019 19:16:40 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-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:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,408,1549958400"; d="scan'208";a="139631936" X-Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.147]) by orsmga006.jf.intel.com with ESMTP; 28 Apr 2019 19:16:38 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Liming Gao Subject: [edk2-devel] [patch 04/11] MdeModulePkg/Core: Remove PcdFrameworkCompatibilitySupport usage Date: Mon, 29 Apr 2019 10:16:00 +0800 Message-Id: <20190429021607.11304-5-dandan.bi@intel.com> In-Reply-To: <20190429021607.11304-1-dandan.bi@intel.com> References: <20190429021607.11304-1-dandan.bi@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,dandan.bi@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556504200; bh=TlbHleZjS8yvbg8WKaNpVRzg019/iryEhf1grNhOHsc=; h=Cc:Date:From:Reply-To:Subject:To; b=s4eOd4AwPD2VZdwSEwdTHmYJd3/TmGZ9lxt2/fi6Y36jh+QRSJTd48fUtjSpHfD3urZ Wjqu1+kXzJTerou57FNUUdcrHvE5Vh1ILWvN/zlKX+S3+fO3d8Yojc9tFIxVwbiXS5oTs Zoib47VnzZthubHzQkckaNprfO+mJcuGi0s= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1464 Currently Framework compatibility is not needed and PcdFrameworkCompatibilitySupport will be removed from edk2. So remove the usage of this PCD firstly. Cc: Liming Gao Signed-off-by: Dandan Bi --- MdeModulePkg/Core/Dxe/DxeMain.inf | 6 +- MdeModulePkg/Core/Dxe/Image/Image.c | 132 +--------------------------- MdeModulePkg/Core/Dxe/Image/Image.h | 85 +----------------- MdeModulePkg/Core/Pei/FwVol/FwVol.c | 65 -------------- MdeModulePkg/Core/Pei/PeiMain.inf | 1 - 5 files changed, 3 insertions(+), 286 deletions(-) diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeM= ain.inf index 8dee5bee0a..61161bee28 100644 --- a/MdeModulePkg/Core/Dxe/DxeMain.inf +++ b/MdeModulePkg/Core/Dxe/DxeMain.inf @@ -1,11 +1,11 @@ ## @file # This is core module in DXE phase. # # It provides an implementation of DXE Core that is compliant with DXE CI= S. # -# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # ## =20 [Defines] @@ -130,11 +130,10 @@ =20 [Protocols] ## PRODUCES ## SOMETIMES_CONSUMES gEfiDecompressProtocolGuid - gEfiLoadPeImageProtocolGuid ## SOMETIMES_PRODUCES # = Produces when PcdFrameworkCompatibilitySupport is set gEfiSimpleFileSystemProtocolGuid ## SOMETIMES_CONSUMES gEfiLoadFileProtocolGuid ## SOMETIMES_CONSUMES gEfiLoadFile2ProtocolGuid ## SOMETIMES_CONSUMES gEfiBusSpecificDriverOverrideProtocolGuid ## SOMETIMES_CONSUMES gEfiDriverFamilyOverrideProtocolGuid ## SOMETIMES_CONSUMES @@ -171,13 +170,10 @@ gEfiVariableWriteArchProtocolGuid ## CONSUMES gEfiVariableArchProtocolGuid ## CONSUMES gEfiCapsuleArchProtocolGuid ## CONSUMES gEfiWatchdogTimerArchProtocolGuid ## CONSUMES =20 -[FeaturePcd] - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport ## C= ONSUMES - [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressBootTimeCodePageNumber = ## SOMETIMES_CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressRuntimeCodePageNumber = ## SOMETIMES_CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable = ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdMaxEfiSystemTablePointerAddress = ## CONSUMES diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Im= age/Image.c index de5b8bed27..22a87ecf6d 100644 --- a/MdeModulePkg/Core/Dxe/Image/Image.c +++ b/MdeModulePkg/Core/Dxe/Image/Image.c @@ -1,9 +1,9 @@ /** @file Core image handling services to load and unload PeImage. =20 -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 #include "DxeMain.h" @@ -12,19 +12,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // // Module Globals // LOADED_IMAGE_PRIVATE_DATA *mCurrentImage =3D NULL; =20 -LOAD_PE32_IMAGE_PRIVATE_DATA mLoadPe32PrivateData =3D { - LOAD_PE32_IMAGE_PRIVATE_DATA_SIGNATURE, - NULL, - { - CoreLoadImageEx, - CoreUnloadImageEx - } -}; - typedef struct { LIST_ENTRY Link; EDKII_PECOFF_IMAGE_EMULATOR_PROTOCOL *Emulator; UINT16 MachineType; } EMULATOR_ENTRY; @@ -274,22 +265,10 @@ CoreInitializeImageServices ( ); ASSERT_EFI_ERROR(Status); =20 InitializeListHead (&mAvailableEmulators); =20 - if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) { - // - // Export DXE Core PE Loader functionality for backward compatibility. - // - Status =3D CoreInstallProtocolInterface ( - &mLoadPe32PrivateData.Handle, - &gEfiLoadPeImageProtocolGuid, - EFI_NATIVE_INTERFACE, - &mLoadPe32PrivateData.Pe32Image - ); - } - ProtectUefiImage (&Image->Info, Image->LoadedImageDevicePath); =20 return Status; } =20 @@ -1564,96 +1543,10 @@ CoreLoadImage ( PERF_LOAD_IMAGE_END (Handle); =20 return Status; } =20 - - -/** - Loads an EFI image into memory and returns a handle to the image with ex= tended parameters. - - @param This Calling context - @param ParentImageHandle The caller's image handle. - @param FilePath The specific file path from which the im= age is - loaded. - @param SourceBuffer If not NULL, a pointer to the memory loc= ation - containing a copy of the image to be loa= ded. - @param SourceSize The size in bytes of SourceBuffer. - @param DstBuffer The buffer to store the image. - @param NumberOfPages For input, specifies the space size of t= he - image by caller if not NULL. For output, - specifies the actual space size needed. - @param ImageHandle Image handle for output. - @param EntryPoint Image entry point for output. - @param Attribute The bit mask of attributes to set for th= e load - PE image. - - @retval EFI_SUCCESS The image was loaded into memory. - @retval EFI_NOT_FOUND The FilePath was not found. - @retval EFI_INVALID_PARAMETER One of the parameters has an invalid val= ue. - @retval EFI_UNSUPPORTED The image type is not supported, or the = device - path cannot be parsed to locate the prop= er - protocol for loading the file. - @retval EFI_OUT_OF_RESOURCES Image was not loaded due to insufficient - resources. - @retval EFI_LOAD_ERROR Image was not loaded because the image f= ormat was corrupt or not - understood. - @retval EFI_DEVICE_ERROR Image was not loaded because the device = returned a read error. - @retval EFI_ACCESS_DENIED Image was not loaded because the platfor= m policy prohibits the - image from being loaded. NULL is returne= d in *ImageHandle. - @retval EFI_SECURITY_VIOLATION Image was loaded and an ImageHandle was = created with a - valid EFI_LOADED_IMAGE_PROTOCOL. However= , the current - platform policy specifies that the image= should not be started. - -**/ -EFI_STATUS -EFIAPI -CoreLoadImageEx ( - IN EFI_PE32_IMAGE_PROTOCOL *This, - IN EFI_HANDLE ParentImageHandle, - IN EFI_DEVICE_PATH_PROTOCOL *FilePath, - IN VOID *SourceBuffer OPTIONAL, - IN UINTN SourceSize, - IN EFI_PHYSICAL_ADDRESS DstBuffer OPTIONAL, - OUT UINTN *NumberOfPages OPTIONAL, - OUT EFI_HANDLE *ImageHandle, - OUT EFI_PHYSICAL_ADDRESS *EntryPoint OPTIONAL, - IN UINT32 Attribute - ) -{ - EFI_STATUS Status; - EFI_HANDLE Handle; - - PERF_LOAD_IMAGE_BEGIN (NULL); - - Status =3D CoreLoadImageCommon ( - TRUE, - ParentImageHandle, - FilePath, - SourceBuffer, - SourceSize, - DstBuffer, - NumberOfPages, - ImageHandle, - EntryPoint, - Attribute - ); - - Handle =3D NULL; - if (!EFI_ERROR (Status)) { - // - // ImageHandle will be valid only Status is success. - // - Handle =3D *ImageHandle; - } - - PERF_LOAD_IMAGE_END (Handle); - - return Status; -} - - /** Transfer control to a loaded image's entry point. =20 @param ImageHandle Handle of image to be started. @param ExitDataSize Pointer of the size to ExitData @@ -2010,28 +1903,5 @@ CoreUnloadImage ( } =20 Done: return Status; } - - - -/** - Unload the specified image. - - @param This Indicates the calling context. - @param ImageHandle The specified image handle. - - @retval EFI_INVALID_PARAMETER Image handle is NULL. - @retval EFI_UNSUPPORTED Attempt to unload an unsupported image. - @retval EFI_SUCCESS Image successfully unloaded. - -**/ -EFI_STATUS -EFIAPI -CoreUnloadImageEx ( - IN EFI_PE32_IMAGE_PROTOCOL *This, - IN EFI_HANDLE ImageHandle - ) -{ - return CoreUnloadImage (ImageHandle); -} diff --git a/MdeModulePkg/Core/Dxe/Image/Image.h b/MdeModulePkg/Core/Dxe/Im= age/Image.h index 6020a27371..e9c44ab2a7 100644 --- a/MdeModulePkg/Core/Dxe/Image/Image.h +++ b/MdeModulePkg/Core/Dxe/Image/Image.h @@ -1,30 +1,17 @@ /** @file Data structure and functions to load and unload PeImage. =20 -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 =20 #ifndef _IMAGE_H_ #define _IMAGE_H_ =20 -#define LOAD_PE32_IMAGE_PRIVATE_DATA_SIGNATURE SIGNATURE_32('l','p','e','= i') - -typedef struct { - UINTN Signature; - /// Image handle - EFI_HANDLE Handle; - EFI_PE32_IMAGE_PROTOCOL Pe32Image; -} LOAD_PE32_IMAGE_PRIVATE_DATA; - -#define LOAD_PE32_IMAGE_PRIVATE_DATA_FROM_THIS(a) \ - CR(a, LOAD_PE32_IMAGE_PRIVATE_DATA, Pe32Image, LOAD_PE32_IMAGE_P= RIVATE_DATA_SIGNATURE) - - // // Private Data Types // #define IMAGE_FILE_HANDLE_SIGNATURE SIGNATURE_32('i','m','g','f') typedef struct { @@ -32,76 +19,6 @@ typedef struct { BOOLEAN FreeBuffer; VOID *Source; UINTN SourceSize; } IMAGE_FILE_HANDLE; =20 -/** - Loads an EFI image into memory and returns a handle to the image with ex= tended parameters. - - @param This Calling context - @param ParentImageHandle The caller's image handle. - @param FilePath The specific file path from which the im= age is - loaded. - @param SourceBuffer If not NULL, a pointer to the memory loc= ation - containing a copy of the image to be loa= ded. - @param SourceSize The size in bytes of SourceBuffer. - @param DstBuffer The buffer to store the image. - @param NumberOfPages For input, specifies the space size of t= he - image by caller if not NULL. For output, - specifies the actual space size needed. - @param ImageHandle Image handle for output. - @param EntryPoint Image entry point for output. - @param Attribute The bit mask of attributes to set for th= e load - PE image. - - @retval EFI_SUCCESS The image was loaded into memory. - @retval EFI_NOT_FOUND The FilePath was not found. - @retval EFI_INVALID_PARAMETER One of the parameters has an invalid val= ue. - @retval EFI_UNSUPPORTED The image type is not supported, or the = device - path cannot be parsed to locate the prop= er - protocol for loading the file. - @retval EFI_OUT_OF_RESOURCES Image was not loaded due to insufficient - resources. - @retval EFI_LOAD_ERROR Image was not loaded because the image f= ormat was corrupt or not - understood. - @retval EFI_DEVICE_ERROR Image was not loaded because the device = returned a read error. - @retval EFI_ACCESS_DENIED Image was not loaded because the platfor= m policy prohibits the - image from being loaded. NULL is returne= d in *ImageHandle. - @retval EFI_SECURITY_VIOLATION Image was loaded and an ImageHandle was = created with a - valid EFI_LOADED_IMAGE_PROTOCOL. However= , the current - platform policy specifies that the image= should not be started. - -**/ -EFI_STATUS -EFIAPI -CoreLoadImageEx ( - IN EFI_PE32_IMAGE_PROTOCOL *This, - IN EFI_HANDLE ParentImageHandle, - IN EFI_DEVICE_PATH_PROTOCOL *FilePath, - IN VOID *SourceBuffer OPTIONAL, - IN UINTN SourceSize, - IN EFI_PHYSICAL_ADDRESS DstBuffer OPTIONAL, - OUT UINTN *NumberOfPages OPTIONAL, - OUT EFI_HANDLE *ImageHandle, - OUT EFI_PHYSICAL_ADDRESS *EntryPoint OPTIONAL, - IN UINT32 Attribute - ); - - -/** - Unload the specified image. - - @param This Indicates the calling context. - @param ImageHandle The specified image handle. - - @retval EFI_INVALID_PARAMETER Image handle is NULL. - @retval EFI_UNSUPPORTED Attempt to unload an unsupported image. - @retval EFI_SUCCESS Image successfully unloaded. - -**/ -EFI_STATUS -EFIAPI -CoreUnloadImageEx ( - IN EFI_PE32_IMAGE_PROTOCOL *This, - IN EFI_HANDLE ImageHandle - ); #endif diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c b/MdeModulePkg/Core/Pei/Fw= Vol/FwVol.c index f817ba04e2..709db00694 100644 --- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c +++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c @@ -1092,19 +1092,10 @@ PeiFfsFindNextFile ( { PEI_CORE_FV_HANDLE *CoreFvHandle; =20 CoreFvHandle =3D FvHandleToCoreHandle (FvHandle); =20 - // - // To make backward compatiblity, if can not find corresponding the hand= le of FV - // then treat FV as build-in FFS2/FFS3 format and memory mapped FV that = FV handle is pointed - // to the address of first byte of FV. - // - if ((CoreFvHandle =3D=3D NULL) && FeaturePcdGet (PcdFrameworkCompatibili= tySupport)) { - return FindFileEx (FvHandle, NULL, SearchType, FileHandle, NULL); - } - if ((CoreFvHandle =3D=3D NULL) || CoreFvHandle->FvPpi =3D=3D NULL) { return EFI_NOT_FOUND; } =20 return CoreFvHandle->FvPpi->FindFileByType (CoreFvHandle->FvPpi, SearchT= ype, FvHandle, FileHandle); @@ -2109,66 +2100,10 @@ PEI_CORE_FV_HANDLE * FindNextCoreFvHandle ( IN PEI_CORE_INSTANCE *Private, IN UINTN Instance ) { - UINTN Index; - BOOLEAN Match; - EFI_HOB_FIRMWARE_VOLUME *FvHob; - - // - // Handle Framework FvHob and Install FvInfo Ppi for it. - // - if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) { - // - // Loop to search the wanted FirmwareVolume which supports FFS - // - FvHob =3D (EFI_HOB_FIRMWARE_VOLUME *)GetFirstHob (EFI_HOB_TYPE_FV); - while (FvHob !=3D NULL) { - // - // Search whether FvHob has been installed into PeiCore's FV databas= e. - // If found, no need install new FvInfoPpi for it. - // - for (Index =3D 0, Match =3D FALSE; Index < Private->FvCount; Index++= ) { - if ((EFI_PEI_FV_HANDLE)(UINTN)FvHob->BaseAddress =3D=3D Private->F= v[Index].FvHeader) { - Match =3D TRUE; - break; - } - } - - // - // Search whether FvHob has been cached into PeiCore's Unknown FV da= tabase. - // If found, no need install new FvInfoPpi for it. - // - if (!Match) { - for (Index =3D 0; Index < Private->UnknownFvInfoCount; Index ++) { - if ((UINTN)FvHob->BaseAddress =3D=3D (UINTN)Private->UnknownFvIn= fo[Index].FvInfo) { - Match =3D TRUE; - break; - } - } - } - - // - // If the Fv in FvHob has not been installed into PeiCore's FV datab= ase and has - // not been cached into PeiCore's Unknown FV database, install a new= FvInfoPpi - // for it then PeiCore will dispatch it in callback of FvInfoPpi. - // - if (!Match) { - PeiServicesInstallFvInfoPpi ( - &(((EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)FvHob->BaseAddress)->Fil= eSystemGuid), - (VOID *)(UINTN)FvHob->BaseAddress, - (UINT32)FvHob->Length, - NULL, - NULL - ); - } - - FvHob =3D (EFI_HOB_FIRMWARE_VOLUME *)GetNextHob (EFI_HOB_TYPE_FV, (V= OID *)((UINTN)FvHob + FvHob->Header.HobLength)); - } - } - if (Instance >=3D Private->FvCount) { return NULL; } =20 return &Private->Fv[Instance]; diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf b/MdeModulePkg/Core/Pei/PeiM= ain.inf index c8a6d5b80b..7c482dacfc 100644 --- a/MdeModulePkg/Core/Pei/PeiMain.inf +++ b/MdeModulePkg/Core/Pei/PeiMain.inf @@ -100,11 +100,10 @@ gEfiPeiCoreFvLocationPpiGuid ## SOMETIMES_CONSUMES =20 [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeiStackSize = ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst= ## CONSUMES - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport = ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressPeiCodePageNumber = ## SOMETIMES_CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressBootTimeCodePageNumber = ## SOMETIMES_CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressRuntimeCodePageNumber = ## SOMETIMES_CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable = ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdShadowPeimOnS3Boot = ## CONSUMES --=20 2.18.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39723): https://edk2.groups.io/g/devel/message/39723 Mute This Topic: https://groups.io/mt/31378998/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 10 07:52:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39724+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39724+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556504202; cv=none; d=zoho.com; s=zohoarc; b=QRrzQBqdFRiZG1BjtwE6F1Ady6nsM/Co7i4Sp41YEpnVehgmYTpXWh24Tk3Tr1WhLoZyBjYKRADMXzGDcET2K3dd7TA/b2eqSE2AJnaLpn2tzzvz4DdLjrgVTeRZMeC5baBYvUlHpBA/vdCmnM81Ee0AS1pQLawwW6TwQJijX/o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556504202; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=K9qeaesyEuinBmwTXIXp6ujJfgy0MrZTxu+DLsIpoSk=; b=nF3Dz1rQZ9u+k9+kZymk6F9USxXHMUhok7Mfl3W6O8rTlbm+14+MR7mEZ2VotJnIWP2t5LN/yYmRppuyWOxN45nlMsI466z4W4kqUZt7m6WaqH4fDMBFZE7UzAVJj4Rbz5vIpquJYgncZ45DF66/msbp5Xk0pzr+/+Nd8T4ZWoE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39724+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1556504202610882.1084936594326; Sun, 28 Apr 2019 19:16:42 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com []) by groups.io with SMTP; Sun, 28 Apr 2019 19:16:41 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-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:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,408,1549958400"; d="scan'208";a="139631952" X-Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.147]) by orsmga006.jf.intel.com with ESMTP; 28 Apr 2019 19:16:40 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Hao Wu , Liming Gao Subject: [edk2-devel] [patch 05/11] MdeModulePkg/CdExpress: Remove PcdFrameworkCompatibilitySupport usage Date: Mon, 29 Apr 2019 10:16:01 +0800 Message-Id: <20190429021607.11304-6-dandan.bi@intel.com> In-Reply-To: <20190429021607.11304-1-dandan.bi@intel.com> References: <20190429021607.11304-1-dandan.bi@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,dandan.bi@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556504202; bh=TbBcuv1b7vjpULJk9hJ8hQi9dIknIcJrO+250Zwhovg=; h=Cc:Date:From:Reply-To:Subject:To; b=RTxtwVu+34vfm9pk9py53HHVFFE8VuTxqS8/7huDcWDiGgoIym+0BzTZPvF6DASmHPL flpyeBfp/ljyyYnUnKsDL9Uvbkp7fCVJBVa6aDDfFK4PKnYpQbP51G0tSi7fgpNINLyyC VGpCTGUDCrDQrqBc3WX88mA49tCl5tJ7FlM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1464 Currently Framework compatibility is not needed and PcdFrameworkCompatibilitySupport will be removed from edk2. So remove the usage of this PCD firstly. Cc: Hao Wu Cc: Liming Gao Signed-off-by: Dandan Bi Reviewed-by: Hao Wu --- .../Universal/Disk/CdExpressPei/CdExpressPei.inf | 5 +---- .../Universal/Disk/CdExpressPei/PeiCdExpress.c | 10 +--------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf b/Md= eModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf index 11ab49b33b..184036bfb9 100644 --- a/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf +++ b/MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf @@ -3,11 +3,11 @@ # # This module reads data from CDROM device by all installed block IO ppi a= nd # finds whether there is Recovery data in the device. If it finds recovery # data, it will install Device Recovery Module PPI. # -# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # ## =20 @@ -56,13 +56,10 @@ ## NOTIFY ## CONSUMES gEfiPeiVirtualBlockIo2PpiGuid gEfiPeiDeviceRecoveryModulePpiGuid ## PRODUCES =20 -[FeaturePcd] - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport ## CON= SUMES - [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryFileName ## CONSUMES =20 [Depex] gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c b/MdeM= odulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c index b029c54729..fd34f07eec 100644 --- a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c +++ b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c @@ -1,9 +1,9 @@ /** @file Source file for CD recovery PEIM =20 -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 @@ -585,14 +585,10 @@ GetRecoveryCapsuleInfo ( =20 if (EFI_ERROR (Status)) { return Status; } =20 - if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) { - CapsuleInstance =3D CapsuleInstance + 1; - } - if ((CapsuleInstance =3D=3D 0) || (CapsuleInstance > NumberRecoveryCapsu= les)) { return EFI_NOT_FOUND; } =20 PrivateData =3D PEI_CD_EXPRESS_PRIVATE_DATA_FROM_THIS (This); @@ -645,14 +641,10 @@ LoadRecoveryCapsule ( =20 if (EFI_ERROR (Status)) { return Status; } =20 - if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) { - CapsuleInstance =3D CapsuleInstance + 1; - } - if ((CapsuleInstance =3D=3D 0) || (CapsuleInstance > NumberRecoveryCapsu= les)) { return EFI_NOT_FOUND; } =20 PrivateData =3D PEI_CD_EXPRESS_PRIVATE_DATA_FROM_THIS (This); --=20 2.18.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39724): https://edk2.groups.io/g/devel/message/39724 Mute This Topic: https://groups.io/mt/31378999/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 10 07:52:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39726+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39726+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556504209; cv=none; d=zoho.com; s=zohoarc; b=dAspgg2afpnKZrrprcklhe1/OPovyJeMYuf4jie/3Ys1eaZK2cHUGl8H3sgjekdw8uN0xO+mOI3Ua0uSTPGmVr9t3liEVNpZOi36qX5DsCzvCINzd8172rLwu8cACRwV20XG4W8nPS3mhlncLpA5IrnQCv3vXcDgEI41Cm5QEGo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556504209; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=kQNcVp9Z4YoJbAParttuj/atPsA/uTEVoBUMycUQILA=; b=SrT1c5DaxrvkBAR16FgkdcVp1bRmyqDaQiXcC3FuEUxfVTNEpA9ssTvk2nx7wjkwVSS3Ogx9MNeipGmm6inn51EBKH84GZoo4PLYSm2A6egkcreASKSvP/1ucXCJivzVERNp0OauGsO1OhRnEdwF1CVbAL1GcVVYq+yIwon7vVU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39726+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 155650420957612.464551185393702; Sun, 28 Apr 2019 19:16:49 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com []) by groups.io with SMTP; Sun, 28 Apr 2019 19:16:43 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-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:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,408,1549958400"; d="scan'208";a="139631967" X-Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.147]) by orsmga006.jf.intel.com with ESMTP; 28 Apr 2019 19:16:42 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Liming Gao , Eric Dong Subject: [edk2-devel] [patch 06/11] MdeModulePkg/Setup: Remove PcdFrameworkCompatibilitySupport usage Date: Mon, 29 Apr 2019 10:16:02 +0800 Message-Id: <20190429021607.11304-7-dandan.bi@intel.com> In-Reply-To: <20190429021607.11304-1-dandan.bi@intel.com> References: <20190429021607.11304-1-dandan.bi@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,dandan.bi@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556504209; bh=AYVgtL9KgGmIUuHjLDd60yy91Mn8QdBIjrmTufCLoBg=; h=Cc:Date:From:Reply-To:Subject:To; b=MUvuRh7LUdJJH1YlwT/tV4N9g4sTEcslmTZaGN9GIUT4xj+KCXp1i1YBk2bFakqOQ0i 1y70lQHUVaeqFamViOUqPpItT41ZL2HQC9uz6Wpdap0ic4RmDeiNIQ3NXls3DPkgtu7N3 gt5zuMyV2bmGG1UVmZ2QQcuEOWEWhacO12Q= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: Liming Gao Cc: Eric Dong Signed-off-by: Dandan Bi Reviewed-by: Eric Dong --- .../Universal/SetupBrowserDxe/IfrParse.c | 86 +------------------ .../SetupBrowserDxe/SetupBrowserDxe.inf | 6 +- 2 files changed, 2 insertions(+), 90 deletions(-) diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c b/MdeModuleP= kg/Universal/SetupBrowserDxe/IfrParse.c index 034edb51a7..891b95cf9f 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c @@ -1,9 +1,9 @@ /** @file Parser for IFR binary encoding. =20 -Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 #include "Setup.h" @@ -82,80 +82,10 @@ CreateStatement ( InsertTailList (&Form->StatementListHead, &Statement->Link); } return Statement; } =20 -/** - Convert a numeric value to a Unicode String and insert it to String Pack= age. - This string is used as the Unicode Name for the EFI Variable. This is to= support - the deprecated vareqval opcode. - - @param FormSet The FormSet. - @param Statement The numeric question whose VarStoreInfo.VarName is= the - numeric value which is used to produce the Unicode= Name - for the EFI Variable. - - If the Statement is NULL, the ASSERT. - If the opcode is not Numeric, then ASSERT. - - @retval EFI_SUCCESS The funtion always succeeds. -**/ -EFI_STATUS -UpdateCheckBoxStringToken ( - IN CONST FORM_BROWSER_FORMSET *FormSet, - IN FORM_BROWSER_STATEMENT *Statement - ) -{ - CHAR16 Str[MAXIMUM_VALUE_CHARACTERS]; - EFI_STRING_ID Id; - - ASSERT (Statement !=3D NULL); - ASSERT (Statement->Operand =3D=3D EFI_IFR_NUMERIC_OP); - - UnicodeValueToStringS (Str, sizeof (Str), 0, Statement->VarStoreInfo.Var= Name, MAXIMUM_VALUE_CHARACTERS - 1); - - Id =3D HiiSetString (FormSet->HiiHandle, 0, Str, NULL); - if (Id =3D=3D 0) { - return EFI_OUT_OF_RESOURCES; - } - - Statement->VarStoreInfo.VarName =3D Id; - - return EFI_SUCCESS; -} - -/** - Check if the next opcode is the EFI_IFR_EXTEND_OP_VAREQNAME. - - @param OpCodeData The current opcode. - - @retval TRUE Yes. - @retval FALSE No. -**/ -BOOLEAN -IsNextOpCodeGuidedVarEqName ( - IN UINT8 *OpCodeData - ) -{ - // - // Get next opcode - // - OpCodeData +=3D ((EFI_IFR_OP_HEADER *) OpCodeData)->Length; - if (*OpCodeData =3D=3D EFI_IFR_GUID_OP) { - if (CompareGuid (&gEfiIfrFrameworkGuid, (EFI_GUID *)(OpCodeData + size= of (EFI_IFR_OP_HEADER)))) { - // - // Specific GUIDed opcodes to support IFR generated from Framework H= II VFR - // - if ((((EFI_IFR_GUID_VAREQNAME *) OpCodeData)->ExtendOpCode) =3D=3D E= FI_IFR_EXTEND_OP_VAREQNAME) { - return TRUE; - } - } - } - - return FALSE; -} - /** Initialize Question's members. =20 @param OpCodeData Pointer of the raw OpCode data. @param FormSet Pointer of the current FormSet. @@ -174,11 +104,10 @@ CreateQuestion ( FORM_BROWSER_STATEMENT *Statement; EFI_IFR_QUESTION_HEADER *QuestionHdr; LIST_ENTRY *Link; FORMSET_STORAGE *Storage; NAME_VALUE_NODE *NameValueNode; - EFI_STATUS Status; BOOLEAN Find; =20 Statement =3D CreateStatement (OpCodeData, FormSet, Form); if (Statement =3D=3D NULL) { return NULL; @@ -196,23 +125,10 @@ CreateQuestion ( // VarStoreId of zero indicates no variable storage // return Statement; } =20 - // - // Take a look at next OpCode to see whether it is a GUIDed opcode to su= pport - // Framework Compatibility - // - if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) { - if ((*OpCodeData =3D=3D EFI_IFR_NUMERIC_OP) && IsNextOpCodeGuidedVarEq= Name (OpCodeData)) { - Status =3D UpdateCheckBoxStringToken (FormSet, Statement); - if (EFI_ERROR (Status)) { - return NULL; - } - } - } - // // Find Storage for this Question // Link =3D GetFirstNode (&FormSet->StorageListHead); while (!IsNull (&FormSet->StorageListHead, Link)) { diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/M= deModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf index a6b9402daa..82db7c1ef1 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf +++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf @@ -1,11 +1,11 @@ ## @file # The DXE driver produces FORM BROWSER2 protocol defined in UEFI specifica= tion. # # It also produces FormBrowserEx(2) protocol to let user register the diff= erent Hot key service. # -# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # # ## @@ -50,11 +50,10 @@ DevicePathLib PcdLib UefiLib =20 [Guids] - gEfiIfrFrameworkGuid ## SOMETIMES_CONSUMES ## = GUID gEfiHiiPlatformSetupFormsetGuid ## SOMETIMES_CONSUMES ## = GUID gEfiHiiStandardFormGuid ## SOMETIMES_CONSUMES ## = GUID gZeroGuid ## SOMETIMES_CONSUMES ## = GUID gEdkiiIfrBitVarstoreGuid ## SOMETIMES_CONSUMES ## = GUID =20 @@ -71,13 +70,10 @@ ## NOTIFY gEdkiiFormDisplayEngineProtocolGuid gEdkiiFormBrowserExProtocolGuid ## PRODUCES gEfiRegularExpressionProtocolGuid ## SOMETIMES_CONSUMES =20 -[FeaturePcd] - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport = ## CONSUMES - [Depex] gEfiHiiDatabaseProtocolGuid AND gEfiHiiConfigRoutingProtocolGuid =20 [UserExtensions.TianoCore."ExtraFiles"] SetupBrowserExtra.uni --=20 2.18.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39726): https://edk2.groups.io/g/devel/message/39726 Mute This Topic: https://groups.io/mt/31379001/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 10 07:52:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39725+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39725+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556504207; cv=none; d=zoho.com; s=zohoarc; b=SoTmvE6JwpzbMubj2nCWrSSHxsOJ84Sd48JplYpvlOS7R8K0QF1jIhCO3lgDGmoivxLR2Yo69PKPGKX8EmBFxwKoGM1x6uSCZ2quKTT175YtjOFgUHx7D8Beb/K2bVmR3s6o1y6+besCZaFlLogEEh6n+J5G+MdG4IG4+ZaIW2Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556504207; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=d7RzdDV1mfe8gti7DdLMq1CJkJ+mq7Kog0n0qv1Bp/8=; b=SS47S0Q2FME4H7+i5zkQitOqWOT5rhaRckEYE3hctn9ObJXI4WoznMMf1JzO8K6qsIuLthNb7StS1JVktmA7VuU298QhjScBFMQP7gVy1zfYXqksLRlRR2KIpKhFstc6jb/yJU5iwIc/nWr2JmdMhJi+lmyeDjw62v6R3kPq0lM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39725+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1556504207887577.3648677594591; Sun, 28 Apr 2019 19:16:47 -0700 (PDT) Return-Path: X-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 X-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" X-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: [edk2-devel] [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> In-Reply-To: <20190429021607.11304-1-dandan.bi@intel.com> References: <20190429021607.11304-1-dandan.bi@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,dandan.bi@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556504207; bh=CkNzp6iKOXlq9en+KShanZmIsUP0CNTU4UrJY9Ek6UA=; h=Cc:Date:From:Reply-To:Subject:To; b=GC6I1FWkon/GkvG9kL0r/JhbrhkwMOVNc+uxvDHPvIlMpOAOD2PFt8MuFMgxX+4mbJu gQZGM/9rSQ6oIfcHeQtzWRYxnoyR65saK8e7P51PUVGC88T1DAlDDr5aDWpCbAtGMm+Ce OSddYQGMYvfVDEzRe1H65iFLddX1RO2Y/IM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Liming Gao --- .../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. =20 -Copyright (c) 2013-2016 Intel Corporation. +Copyright (c) 2013-2019 Intel Corporation. =20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 @@ -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 + ); =20 if (EFI_ERROR (Status)) { return Status; } =20 @@ -237,26 +225,16 @@ Returns: Buffer =3D NULL; Address =3D (UINTN) AllocatePages ((RecoveryCapsuleSize - 1) / 0x1000 = + 1); ASSERT (Address); =20 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 + ); =20 DEBUG ((EFI_D_INFO | EFI_D_LOAD, "LoadRecoveryCapsule Returns: %r\n", = Status)); =20 if (Status =3D=3D EFI_DEVICE_ERROR) { AssertMediaDeviceError (PeiServices); diff --git a/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.i= nf 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 # ## =20 @@ -138,11 +138,10 @@ [FeaturePcd] gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnFatUsbDisk gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnDataCD gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnFatFloppyDisk gEfiMdeModulePkgTokenSpaceGuid.PcdRecoveryOnIdeDisk - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport gQuarkPlatformTokenSpaceGuid.WaitIfResetDueToError =20 [Pcd] gQuarkPlatformTokenSpaceGuid.PcdEsramStage1Base gQuarkPlatformTokenSpaceGuid.PcdFlashAreaSize --=20 2.18.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39725): https://edk2.groups.io/g/devel/message/39725 Mute This Topic: https://groups.io/mt/31379000/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 10 07:52:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39727+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39727+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556504212; cv=none; d=zoho.com; s=zohoarc; b=NFc/tJ1s0kbwfKAEkgZ4OtbCUwxA7G7HxARXIHTX+Yvs14BI6zynjKjTH8gMsLpkmdFsKbx99zFaeOvrFOlYXXt1itGx/GvTnOHn7v0DSs4Pezvixtr2pq/0CSGfCVtA0KuNyuqKEAnRRAS5iZcPE51hLTMCmbDATVMWQRTe9Sw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556504212; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=ocojVYJJ/FjPttXDDcMhuCgaPm0CmJqtVy0n4JDJOTE=; b=mOe655wj/zzahGkw8GGlP/GKslA90Es/4dBkVydCrWDOntwl48NcNXL2BxaFwrIsomSQHyeraAHgj5Et9KDIm1IiTRTKF0R0qQbOwXQkyRTvXXaDw5NmWtryoLan9e81TlCdKeUNRq4GhUck0IP8ap7cpGsDLKd2GLMzZE8clAE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39727+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1556504212048817.0470530766747; Sun, 28 Apr 2019 19:16:52 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by groups.io with SMTP; Sun, 28 Apr 2019 19:16:51 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-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:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,408,1549958400"; d="scan'208";a="139631987" X-Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.147]) by orsmga006.jf.intel.com with ESMTP; 28 Apr 2019 19:16:50 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Jiewen Yao , Chao Subject: [edk2-devel] [patch 08/11] SignedCapsulePkg: Remove PcdFrameworkCompatibilitySupport usage Date: Mon, 29 Apr 2019 10:16:04 +0800 Message-Id: <20190429021607.11304-9-dandan.bi@intel.com> In-Reply-To: <20190429021607.11304-1-dandan.bi@intel.com> References: <20190429021607.11304-1-dandan.bi@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,dandan.bi@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556504211; bh=yD4Vwqe7hDiaScItlVLW7Y63fxLEhQ1whsifeMXT72c=; h=Cc:Date:From:Reply-To:Subject:To; b=HeSVB51RSHfPCWVK1hHBV6d+dLlkKibMhvT28yZBVDuxGWpAmgcWi0Yapv6YHKAvMPY 1mrLL7/D0Suu/Up85pHR3fXuOOlNKWovhuWlG03D5HDDVKkrXDaOI0upTwpZ4ZcrKzlaM V4LDW05XWotJJTaJwm60UO7Hsk4UY7jqUaE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: Jiewen Yao Cc: Chao Zhang --- .../Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.c | 6 +++--- .../RecoveryModuleLoadPei/RecoveryModuleLoadPei.inf | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModul= eLoadPei.c b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModul= eLoadPei.c index 29a2cc520c..eda3cc5420 100644 --- a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPe= i.c +++ b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPe= i.c @@ -7,11 +7,11 @@ buffer overflow, integer overflow. =20 ProcessRecoveryCapsule(), ProcessFmpCapsuleImage(), ProcessRecoveryImage= (), ValidateFmpCapsule() will receive untrusted input and do basic validatio= n. =20 -Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 // @@ -764,11 +764,11 @@ LoadRecoveryCapsule ( for (CapsuleInstance =3D 1; CapsuleInstance <=3D NumberRecoveryCapsule= s; CapsuleInstance++) { CapsuleSize =3D 0; Status =3D DeviceRecoveryPpi->GetRecoveryCapsuleInfo ( (EFI_PEI_SERVICES **)PeiServices, DeviceRecoveryPpi, - FeaturePcdGet(PcdFrameworkCompatibilit= ySupport) ? CapsuleInstance - 1 : CapsuleInstance, + CapsuleInstance, &CapsuleSize, &CapsuleType ); DEBUG ((DEBUG_ERROR, "LoadRecoveryCapsule - GetRecoveryCapsuleInfo (= %d - %x) - %r\n", CapsuleInstance, CapsuleSize, Status)); if (EFI_ERROR (Status)) { @@ -781,11 +781,11 @@ LoadRecoveryCapsule ( continue; } Status =3D DeviceRecoveryPpi->LoadRecoveryCapsule ( (EFI_PEI_SERVICES **)PeiServices, DeviceRecoveryPpi, - FeaturePcdGet(PcdFrameworkCompatibilit= ySupport) ? CapsuleInstance - 1 : CapsuleInstance, + CapsuleInstance, CapsuleBuffer ); DEBUG ((DEBUG_ERROR, "LoadRecoveryCapsule - LoadRecoveryCapsule (%d)= - %r\n", CapsuleInstance, Status)); if (EFI_ERROR (Status)) { FreePages (CapsuleBuffer, EFI_SIZE_TO_PAGES(CapsuleSize)); diff --git a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModul= eLoadPei.inf b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryMod= uleLoadPei.inf index f0f5d21a7a..431b0e1802 100644 --- a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPe= i.inf +++ b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPe= i.inf @@ -1,11 +1,11 @@ ## @file # Recovery module. # # Load Recovery capsule and install FV. # -# Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # # ## @@ -54,13 +54,10 @@ =20 [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid ## CO= NSUMES gEfiSignedCapsulePkgTokenSpaceGuid.PcdEdkiiSystemFirmwareFileGuid ## CO= NSUMES =20 -[FeaturePcd] - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport = ## CONSUMES - [depex] gEfiPeiBootInRecoveryModePpiGuid =20 [UserExtensions.TianoCore."ExtraFiles"] RecoveryModuleLoadPeiExtra.uni --=20 2.18.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39727): https://edk2.groups.io/g/devel/message/39727 Mute This Topic: https://groups.io/mt/31379002/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 10 07:52:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39728+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39728+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556504215; cv=none; d=zoho.com; s=zohoarc; b=FtCBW2i4WaQtE172CQ+g89f5WA65Kh5DO6Mx76b955A9LCF1vclcXtTSX3uxny/tjZxVMXkNXkLtz2tj2rSRZ8mbf4+RaytMbOBzqdevUW6L2TwKwMK4OQnA5bYvxn1Ix8KJcCNc0RZAiZRJr8dE4r1g5e/fpWLlse9VZa5U/Yc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556504215; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=d94jGq2rAEL7qQYZ3EGlZUkKvo800TIoN9ZNYbFLaW8=; b=EUpVtancF+rY1XaCKkqzcV5gtXQxZQly7xCrSDwT0bVLhZt7qIVSpbx3w13rkbTBQFIMoX9FPFv8UixQ9H9fMUO6WSITPyOyWeqJLJ6Ij1gFQE4pDIgt1uTQ4xsa7U/1TKF4nFxbZ0P4HZiU4Dnkl4VRPmWf0eaVism1fEYr/Ok= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39728+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1556504215448994.8288777269246; Sun, 28 Apr 2019 19:16:55 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com []) by groups.io with SMTP; Sun, 28 Apr 2019 19:16:54 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-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:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,408,1549958400"; d="scan'208";a="139631995" X-Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.147]) by orsmga006.jf.intel.com with ESMTP; 28 Apr 2019 19:16:53 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Eric Dong , Ray Ni , Laszlo Ersek Subject: [edk2-devel] [patch 09/11] UefiCpuPkg: Remove PcdFrameworkCompatibilitySupport usage Date: Mon, 29 Apr 2019 10:16:05 +0800 Message-Id: <20190429021607.11304-10-dandan.bi@intel.com> In-Reply-To: <20190429021607.11304-1-dandan.bi@intel.com> References: <20190429021607.11304-1-dandan.bi@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,dandan.bi@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556504215; bh=XBiUeJ6q3gqfhJs08OFL5u5PS3f6jO+Plf5vl29Hkio=; h=Cc:Date:From:Reply-To:Subject:To; b=dOAPOmYTI9TUpQrlKWO68wnD3863cMWXHZ6ZLIlRV353CS53DYVckTbXIv608Qw4iN7 vaxvAD8xAOdc7Hoz05S85HgyiGTJQocbyTo8krKWhTd1qKWUkrhdMNg7iX+jSyA1vF4Zg gs4rZwwZ6XLJq6fG9aRF12+Hd1cDxx/aiCE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Signed-off-by: Dandan Bi Reviewed-by: Laszlo Ersek --- .../Universal/Acpi/S3Resume2Pei/S3Resume.c | 30 ------------------- .../Acpi/S3Resume2Pei/S3Resume2Pei.inf | 3 +- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c b/UefiCpuPkg= /Universal/Acpi/S3Resume2Pei/S3Resume.c index 77c3fb6bdc..83ce1c4037 100644 --- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c +++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c @@ -741,12 +741,10 @@ S3ResumeExecuteBootScript ( { EFI_STATUS Status; PEI_SMM_ACCESS_PPI *SmmAccess; UINTN Index; VOID *GuidHob; - IA32_DESCRIPTOR *IdtDescriptor; - VOID *IdtBuffer; PEI_S3_RESUME_STATE *PeiS3ResumeState; BOOLEAN InterruptStatus; =20 DEBUG ((DEBUG_INFO, "S3ResumeExecuteBootScript()\n")); =20 @@ -802,38 +800,10 @@ S3ResumeExecuteBootScript ( =20 if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) { AsmWriteCr3 ((UINTN)AcpiS3Context->S3NvsPageTableAddress); } =20 - if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) { - // - // On some platform, such as ECP, a dispatch node in boot script table= may execute a 32-bit PEIM which may need PeiServices - // pointer. So PeiServices need preserve in (IDTBase- sizeof (UINTN)). - // - IdtDescriptor =3D (IA32_DESCRIPTOR *) (UINTN) (AcpiS3Context->IdtrProf= ile); - // - // Make sure the newly allocated IDT align with 16-bytes - // - IdtBuffer =3D AllocatePages (EFI_SIZE_TO_PAGES((IdtDescriptor->Limit += 1) + 16)); - if (IdtBuffer =3D=3D NULL) { - REPORT_STATUS_CODE ( - EFI_ERROR_CODE | EFI_ERROR_MAJOR, - (EFI_SOFTWARE_PEI_MODULE | EFI_SW_PEI_EC_S3_RESUME_FAILED) - ); - ASSERT (FALSE); - } - // - // Additional 16 bytes allocated to save IA32 IDT descriptor and Pei S= ervice Table Pointer - // IA32 IDT descriptor will be used to setup IA32 IDT table for 32-bit= Framework Boot Script code - // - ZeroMem (IdtBuffer, 16); - AsmReadIdtr ((IA32_DESCRIPTOR *)IdtBuffer); - CopyMem ((VOID*)((UINT8*)IdtBuffer + 16),(VOID*)(IdtDescriptor->Base),= (IdtDescriptor->Limit + 1)); - IdtDescriptor->Base =3D (UINTN)((UINT8*)IdtBuffer + 16); - *(UINTN*)(IdtDescriptor->Base - sizeof(UINTN)) =3D (UINTN)GetPeiServic= esTablePointer (); - } - InterruptStatus =3D SaveAndDisableInterrupts (); // // Need to make sure the GDT is loaded with values that support long mod= e and real mode. // AsmWriteGdtr (&mGdt); diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf b/Uefi= CpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf index d694a98691..aae984d138 100644 --- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf +++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf @@ -3,11 +3,11 @@ # # This module works with StandAloneBootScriptExecutor to S3 resume to OS. # This module will excute the boot script saved during last boot and after= that, # control is passed to OS waking up handler. # -# Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
# Copyright (c) 2017, AMD Incorporated. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # ## @@ -87,11 +87,10 @@ gEfiEndOfPeiSignalPpiGuid ## SOMETIMES_PRODUCES gEfiPeiSmmCommunicationPpiGuid ## SOMETIMES_CONSUMES =20 [FeaturePcd] gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode ## CONS= UMES - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport ## CONS= UMES =20 [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable ## SOMETIMES_CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask ##= CONSUMES =20 --=20 2.18.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39728): https://edk2.groups.io/g/devel/message/39728 Mute This Topic: https://groups.io/mt/31379004/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 10 07:52:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39729+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39729+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556504218; cv=none; d=zoho.com; s=zohoarc; b=cf3mGOxVyjHXIG+L8fzyD7kgkgNwWYjRDVH8EiGsO9HlV2uGgs681H3GQoX5hFwoeC9zhRw6xW0Q8kI3T8W614XN8R0NOcSDqEWTAQekuC512d5HOuoyPgQ8Of1MAEEokMXNp3UkWXXcPP+Ib3cGxEkhYK+X55AIEuLOBLFMdW8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556504218; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=MzcyvywJFkhxiVycoDNunPVY0K2cJjcEMf3JYkY2wkU=; b=c4+uQjuBJ6SriPsAxuB7/835U/nTQAQ/bfJU8aoTCEBf4iGu4gjozJO79VXID0/7TYPFRRoEM3GjcoVxBHLP3qtpFPLJ2s5q/q/ms6Mlb8qtrVK7WxztLM3ZWU9dlIhZ/yczoZUUfwVozHmlcmyqGENImiq5tRja5FU6mrdhvio= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39729+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1556504218731871.8288454951318; Sun, 28 Apr 2019 19:16:58 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com []) by groups.io with SMTP; Sun, 28 Apr 2019 19:16:57 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-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:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,408,1549958400"; d="scan'208";a="139632006" X-Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.147]) by orsmga006.jf.intel.com with ESMTP; 28 Apr 2019 19:16:56 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian Subject: [edk2-devel] [patch 10/11] Vlv2TbltDevicePkg: Remove PcdFrameworkCompatibilitySupport usage Date: Mon, 29 Apr 2019 10:16:06 +0800 Message-Id: <20190429021607.11304-11-dandan.bi@intel.com> In-Reply-To: <20190429021607.11304-1-dandan.bi@intel.com> References: <20190429021607.11304-1-dandan.bi@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,dandan.bi@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556504218; bh=7KquBLV5LbZfXpQP+rLEcUcjGbjC2CcmWUrLzSPGd10=; h=Cc:Date:From:Reply-To:Subject:To; b=LhEKczHaQpPwrHJO7m6esEJO9xH9brOrFNuwLBZMFNN1PLCRnOPPR4FDzaEUyCxwvZt F/yuzxEh+4SQxNZAcOQKU+Qj6pNI7jFOG1fmJbL0CyjXkMth9DNNorEmrEACUVlrToFI0 1BfYHUWMBIpooTYnTSSjE9N4PuI3hfrKXyM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: Zailiang Sun Cc: Yi Qian Signed-off-by: Dandan Bi Reviewed-by: Zailiang Sun --- Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 3 +-- Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 3 +-- Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/Pl= atformPkgGccX64.dsc index b3642c5c7a..96e77d54e8 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -1,9 +1,9 @@ #/** @file # Platform description. # -# Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2012 - 2019, Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # # #**/ @@ -489,11 +489,10 @@ !if $(CAPSULE_RESET_ENABLE) =3D=3D TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|TRUE !else gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|FALSE !endif - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport|TRUE gEfiCpuTokenSpaceGuid.PcdCpuSmmEnableBspElection|FALSE !if $(DATAHUB_STATUS_CODE_ENABLE) =3D=3D TRUE gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|TRUE !else gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|FALSE diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/Plat= formPkgIA32.dsc index 28e6f5a181..114353082b 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -1,9 +1,9 @@ #/** @file # Platform description. # -# Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2012 - 2019, Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # # #**/ @@ -491,11 +491,10 @@ !if $(CAPSULE_RESET_ENABLE) =3D=3D TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|TRUE !else gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|FALSE !endif - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport|TRUE gEfiCpuTokenSpaceGuid.PcdCpuSmmEnableBspElection|FALSE !if $(DATAHUB_STATUS_CODE_ENABLE) =3D=3D TRUE gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|TRUE !else gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|FALSE diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/Platf= ormPkgX64.dsc index f9ba56ef4b..20fdc691cb 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -1,9 +1,9 @@ #/** @file # Platform description. # -# Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2012 - 2019, Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # # #**/ @@ -491,11 +491,10 @@ !if $(CAPSULE_RESET_ENABLE) =3D=3D TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|TRUE !else gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|FALSE !endif - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport|TRUE gEfiCpuTokenSpaceGuid.PcdCpuSmmEnableBspElection|FALSE !if $(DATAHUB_STATUS_CODE_ENABLE) =3D=3D TRUE gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|TRUE !else gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseDataHub|FALSE --=20 2.18.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39729): https://edk2.groups.io/g/devel/message/39729 Mute This Topic: https://groups.io/mt/31379005/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 10 07:52:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39730+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39730+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556504225; cv=none; d=zoho.com; s=zohoarc; b=O5FY7nQMY2+ftGxhscr9O5Kt94sh+Gsy2vZPFudjhoaYErJcA3rJWRXFCCsSXgNHY86+Q5SgVdHnvQjsm7wnoTMXwGRRJ7X0aOGepZWHTmvDeUloVQ2eDOzjg5eqgNg7Mc3d21KRtOiwNt24lHPXabrT6qsMVz9RyaZHp4muuTE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556504225; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=VoYEy3PhiEzjCDoVOeQdHCtc+3hOayv1YKBK91t0D+U=; b=NncGl4C8LiUpglcOPID4g9zscfXfupKPpb7ZjPehxgwQPKC6ywZty8L/tecZQzFtw2dU+iwShc0nPCXpQC6KGfINyEdh1MBdbXq6wwz+Ln1d670KXWCL5JarkTdRF0UoP93vx4bRZeuU4iHdH2qcuenqdlPKuTxAm8CnUYh+S78= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39730+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 155650422532432.379666918248404; Sun, 28 Apr 2019 19:17:05 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by groups.io with SMTP; Sun, 28 Apr 2019 19:17:04 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-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:17:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,408,1549958400"; d="scan'208";a="139632027" X-Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.147]) by orsmga006.jf.intel.com with ESMTP; 28 Apr 2019 19:17:03 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Liming Gao , Hao Wu , Jian J Wang Subject: [edk2-devel] [patch 11/11] MdeModulePkg: Remove PcdFrameworkCompatibilitySupport Date: Mon, 29 Apr 2019 10:16:07 +0800 Message-Id: <20190429021607.11304-12-dandan.bi@intel.com> In-Reply-To: <20190429021607.11304-1-dandan.bi@intel.com> References: <20190429021607.11304-1-dandan.bi@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,dandan.bi@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556504224; bh=cMiM+DrKTS8xPIvmFE/od42Qq/dXggn5ulgfmqM4EaQ=; h=Cc:Date:From:Reply-To:Subject:To; b=owf5B6PJu/zhwuW3/8sgKUHqCztUQDWyxJJbNPxDXxIHQa4OiuwYvx+4nQuB9ZxZJaw 5CWt9pgTMYiMqTtC85h3+kokHdoX0dMmHM1atEVla518Omuk8uRV1bEHGCFmHtwf65bcv QI+BodKxRHLQx2+rSQO+B+9eHUcYR+bD0DI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: Liming Gao Cc: Hao Wu Cc: Jian J Wang Signed-off-by: Dandan Bi Reviewed-by: Hao Wu --- MdeModulePkg/MdeModulePkg.dec | 8 -------- MdeModulePkg/MdeModulePkg.uni | 6 ------ 2 files changed, 14 deletions(-) diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index be84916cc0..095863dc07 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -735,18 +735,10 @@ # TRUE - USB KeyBoard Driver will disable the default keyboard layout= .
# FALSE - USB KeyBoard Driver will not disable the default keyboard la= yout.
# @Prompt Disable default keyboard layout in USB KeyBoard Driver. gEfiMdeModulePkgTokenSpaceGuid.PcdDisableDefaultKeyboardLayoutInUsbKbDri= ver|FALSE|BOOLEAN|0x00010200 =20 - ## Indicates if backward compatibility to Framework HII and Framework Fv= Hob is supported.

- # TRUE - Setup Browser supports GUID opcodes generated from Framework= HII VFR file by VFR compiler. - # the PeiCore will handle the framework FvHob and install FvIn= fo PPI for it.
- # FALSE - Setup Browser doesn't support GUID opcodes generated from Fr= amework HII VFR file by VFR compiler. - # the PeiCore will not handle the framework FvHob and install = FvInfo PPI for it.
- # @Prompt Enable framework backward compatibility support. - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport|FALSE|BO= OLEAN|0x00012009 - ## Indicates if HelloWorld Application will print the verbose informatio= n. # This PCD is a sample to explain FeatureFlag PCD usage.

# TRUE - HelloWorld Application will print the verbose information. # FALSE - HelloWorld Application will not print the verbose informatio= n.
# @Prompt Enable HelloWorld print. diff --git a/MdeModulePkg/MdeModulePkg.uni b/MdeModulePkg/MdeModulePkg.uni index cf2aefa7ad..b71e68617c 100644 --- a/MdeModulePkg/MdeModulePkg.uni +++ b/MdeModulePkg/MdeModulePkg.uni @@ -709,16 +709,10 @@ =20 #string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdDisableDefaultKeyboardLayout= InUsbKbDriver_HELP #language en-US "Disable default USB keyboard layout? T= he default keyboard layout serves as the backup when no keyboard layout can= be retrieved from HII database.

\n" = "TRUE - disable
\n" = "FALSE - enable
" =20 -#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdFrameworkCompatibilitySuppor= t_PROMPT #language en-US "Enable framework backward compatibility support" - -#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdFrameworkCompatibilitySuppor= t_HELP #language en-US "Indicates if backward compatibility to Framework H= II and Framework FvHob is supported.

\n" - = "TRUE - Setup Browser supports GUID opcodes genera= ted from Framework HII VFR file by VFR compiler. the PeiCore will handle th= e framework FvHob and install FvInfo PPI for it.
\n" - = "FALSE - Setup Browser doesn't support GUID opcodes= generated from Framework HII VFR file by VFR compiler. the PeiCore will no= t handle the framework FvHob and install FvInfo PPI for it.
" - #string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdHelloWorldPrintEnable_PROMPT= #language en-US "Enable HelloWorld print" =20 #string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdHelloWorldPrintEnable_HELP = #language en-US "Indicates if HelloWorld Application will print the verbose= information. This PCD is a sample to explain FeatureFlag PCD usage.
\n" = "TRUE - HelloWorld Application will print the verbose info= rmation.
\n" = "FALSE - HelloWorld Application will not print the verbose = information.
" --=20 2.18.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39730): https://edk2.groups.io/g/devel/message/39730 Mute This Topic: https://groups.io/mt/31379007/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-