Update GenFv tool to print Fv Size Information into Fv Map size.

git-svn-id: https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools@1405 7335b38e-4728-0410-8992-fb3ffe349368

diff --git a/Source/C/GenFv/GenFv.c b/Source/C/GenFv/GenFv.c
index ad161ae..f2aa378 100644 (file)
--- a/Source/C/GenFv/GenFv.c
+++ b/Source/C/GenFv/GenFv.c
@@ -670,18 +670,6 @@ Returns:
       fprintf (FpFile, " = 0x%x\n", RtBase);\r
       DebugMsg (NULL, 0, 9, "Updated runtime driver base address", "%s = 0x%x", EFI_FV_RUNTIME_DRIVER_BASE_ADDRESS_STRING, RtBase);\r
     }\r
-    if (mFvTotalSize != 0) {\r
-      fprintf (FpFile, EFI_FV_TOTAL_SIZE_STRING);\r
-      fprintf (FpFile, " = 0x%x\n", mFvTotalSize);\r
-    }\r
-    if (mFvTakenSize != 0) {\r
-      fprintf (FpFile, EFI_FV_TAKEN_SIZE_STRING);\r
-      fprintf (FpFile, " = 0x%x\n", mFvTakenSize);\r
-    }\r
-    if (mFvTotalSize != 0 && mFvTakenSize != 0) {\r
-      fprintf (FpFile, EFI_FV_SPACE_SIZE_STRING);\r
-      fprintf (FpFile, " = 0x%x\n", mFvTotalSize - mFvTakenSize);\r
-    }\r
     fclose (FpFile);\r
   }\r
   \r

diff --git a/Source/C/GenFv/GenFvInternalLib.c b/Source/C/GenFv/GenFvInternalLib.c
index ae38a84..77bf56d 100644 (file)
--- a/Source/C/GenFv/GenFvInternalLib.c
+++ b/Source/C/GenFv/GenFvInternalLib.c
@@ -1836,6 +1836,22 @@ Returns:
     Error (NULL, 0, 0001, "Error opening file", FvMapName);\r
     return EFI_ABORTED;\r
   }\r
+  \r
+  //\r
+  // record FV size information into FvMap file.\r
+  //\r
+  if (mFvTotalSize != 0) {\r
+    fprintf (FvMapFile, EFI_FV_TOTAL_SIZE_STRING);\r
+    fprintf (FvMapFile, " = 0x%x\n", mFvTotalSize);\r
+  }\r
+  if (mFvTakenSize != 0) {\r
+    fprintf (FvMapFile, EFI_FV_TAKEN_SIZE_STRING);\r
+    fprintf (FvMapFile, " = 0x%x\n", mFvTakenSize);\r
+  }\r
+  if (mFvTotalSize != 0 && mFvTakenSize != 0) {\r
+    fprintf (FvMapFile, EFI_FV_SPACE_SIZE_STRING);\r
+    fprintf (FvMapFile, " = 0x%x\n\n", mFvTotalSize - mFvTakenSize);\r
+  }\r
 \r
   //\r
   // Add files to FV\r