BaseTools/VfrCompile: Remove framework VFR support

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

diff --git a/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp b/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp
index c4d4d261ad3770663a7423e9881b15c49c185079..5f4d262d85c51e73a7e9502fe87eb8145feaa4fa 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp
+++ b/BaseTools/Source/C/VfrCompile/VfrCompiler.cpp
@@ -2,7 +2,7 @@
 \r
   VfrCompiler main class and main function.\r
 \r
-Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR>\r
 SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
@@ -74,7 +74,6 @@ CVfrCompiler::OptionInitialization (
   mOptions.IncludePaths                  = NULL;\r
   mOptions.SkipCPreprocessor             = TRUE;\r
   mOptions.CPreprocessorOptions          = NULL;\r
-  mOptions.CompatibleMode                = FALSE;\r
   mOptions.HasOverrideClassGuid          = FALSE;\r
   mOptions.WarningAsError                = FALSE;\r
   mOptions.AutoDefault                   = FALSE;\r
@@ -142,8 +141,6 @@ CVfrCompiler::OptionInitialization (
       }\r
 \r
       AppendCPreprocessorOptions (Argv[Index]);\r
-    } else if (stricmp(Argv[Index], "-c") == 0 || stricmp(Argv[Index], "--compatible-framework") == 0) {\r
-      mOptions.CompatibleMode = TRUE;\r
     } else if (stricmp(Argv[Index], "-s") == 0|| stricmp(Argv[Index], "--string-db") == 0) {\r
       Index++;\r
       if ((Index >= Argc) || (Argv[Index][0] == '-')) {\r
@@ -561,8 +558,6 @@ CVfrCompiler::Usage (
     "                 create an IFR HII pack file",\r
     "  -n, --no-pre-processing",\r
     "                 do not preprocessing input file",\r
-    "  -c, --compatible-framework",\r
-    "                 compatible framework vfr file",\r
     "  -s, --string-db",\r
     "                 input uni string package file",\r
     "  -g, --guid",\r
@@ -685,7 +680,6 @@ CVfrCompiler::Compile (
     goto Fail;\r
   }\r
 \r
-  InputInfo.CompatibleMode = mOptions.CompatibleMode;\r
   if (mOptions.HasOverrideClassGuid) {\r
     InputInfo.OverrideClassGuid = &mOptions.OverrideClassGuid;\r
   } else {\r
@@ -775,27 +769,6 @@ CVfrCompiler::AdjustBin (
     DebugError (NULL, 0, 0001, "Error parsing vfr file", " %s.Buffer not allocated.", mOptions.VfrFileName);\r
   }\r
 \r
-  //\r
-  // For UEFI mode, not do OpCode Adjust\r
-  //\r
-  if (mOptions.CompatibleMode) {\r
-    //\r
-    // Adjust Opcode to be compatible with framework vfr\r
-    //\r
-    Status = gCIfrRecordInfoDB.IfrRecordAdjust ();\r
-    if (Status != VFR_RETURN_SUCCESS) {\r
-      //\r
-      // Record List Adjust Failed\r
-      //\r
-      SET_RUN_STATUS (STATUS_FAILED);\r
-      return;\r
-    }\r
-    //\r
-    // Re get the IfrRecord Buffer.\r
-    //\r
-    gCIfrRecordInfoDB.IfrRecordOutput (gRBuffer);\r
-  }\r
-\r
   return;\r
 }\r
 \r
@@ -853,7 +826,7 @@ CVfrCompiler::GenCFile (
     goto Fail;\r
   }\r
 \r
-  if (!mOptions.CreateIfrPkgFile || mOptions.CompatibleMode) {\r
+  if (!mOptions.CreateIfrPkgFile) {\r
     if ((pFile = fopen (LongFilePath (mOptions.COutputFileName), "w")) == NULL) {\r
       DebugError (NULL, 0, 0001, "Error opening output C file", "%s", mOptions.COutputFileName);\r
       goto Fail;\r
@@ -863,10 +836,6 @@ CVfrCompiler::GenCFile (
       fprintf (pFile, "%s\n", gSourceFileHeader[Index]);\r
     }\r
 \r
-    if (mOptions.CompatibleMode) {\r
-      gCVfrBufferConfig.OutputCFile (pFile, mOptions.VfrBaseFileName);\r
-    }\r
-\r
     if (gCFormPkg.GenCFile (mOptions.VfrBaseFileName, pFile, &gRBuffer) != VFR_RETURN_SUCCESS) {\r
       fclose (pFile);\r
       goto Fail;\r