UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / BaseTools / Source / C / VfrCompile / VfrFormPkg.cpp

diff --git a/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp b/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
index 6e63b698248bdd28dc8aa8b7921d86cc853e25fd..36d3baaf10f84708603be585b932f51db25f2004 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
+++ b/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
@@ -2,14 +2,8 @@
 \r
   The definition of CFormPkg's member function\r
 \r
-Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -450,21 +444,10 @@ CFormPkg::GenCFile (
     return Ret;\r
   }\r
 \r
-  //\r
-  // For framework vfr file, the extension framework header will be added.\r
-  //\r
-  if (VfrCompatibleMode) {\r
-    fprintf (pFile, "  // FRAMEWORK PACKAGE HEADER Length\n");\r
-    PkgLength = PkgHdr->Length + sizeof (UINT32) + 2;\r
-    _WRITE_PKG_LINE(pFile, BYTES_PRE_LINE, "  ", (CHAR8 *)&PkgLength, sizeof (UINT32));\r
-    fprintf (pFile, "\n\n  // FRAMEWORK PACKAGE HEADER Type\n");\r
-    PkgLength = 3;\r
-    _WRITE_PKG_LINE(pFile, BYTES_PRE_LINE, "  ", (CHAR8 *)&PkgLength, sizeof (UINT16));\r
-  } else {\r
-    fprintf (pFile, "  // ARRAY LENGTH\n");\r
-    PkgLength = PkgHdr->Length + sizeof (UINT32);\r
-    _WRITE_PKG_LINE(pFile, BYTES_PRE_LINE, "  ", (CHAR8 *)&PkgLength, sizeof (UINT32));\r
-  }\r
+\r
+  fprintf (pFile, "  // ARRAY LENGTH\n");\r
+  PkgLength = PkgHdr->Length + sizeof (UINT32);\r
+  _WRITE_PKG_LINE(pFile, BYTES_PRE_LINE, "  ", (CHAR8 *)&PkgLength, sizeof (UINT32));\r
 \r
   fprintf (pFile, "\n\n  // PACKAGE HEADER\n");\r
   _WRITE_PKG_LINE(pFile, BYTES_PRE_LINE, "  ", (CHAR8 *)PkgHdr, sizeof (EFI_HII_PACKAGE_HEADER));\r
@@ -974,7 +957,7 @@ CFormPkg::DeclarePendingQuestion (
       // For undefined Efi VarStore type question\r
       // Append the extended guided opcode to contain VarName\r
       //\r
-      if (VarStoreType == EFI_VFR_VARSTORE_EFI || VfrCompatibleMode) {\r
+      if (VarStoreType == EFI_VFR_VARSTORE_EFI) {\r
         CIfrVarEqName CVNObj (QId, Info.mInfo.mVarName);\r
         CVNObj.SetLineNo (LineNo);\r
       }\r