Reduce command line option, we can specify --capflag multi times to enumerate all...

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

diff --git a/Source/C/GenFv/GenFv.c b/Source/C/GenFv/GenFv.c
index d90afc8..f2ff2d2 100644 (file)
--- a/Source/C/GenFv/GenFv.c
+++ b/Source/C/GenFv/GenFv.c
@@ -141,8 +141,7 @@ Returns:
   fprintf (stdout, "  --FvNameGuid          GuidValue is the Fv Name Guid value.\n\\r
                         Its format is xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx\n");\r
   fprintf (stdout, "  --capflag CapFlag     Capsule Reset Flag can be PersistAcrossReset,\n\\r
-                        or PopulateSystemTable or PersistAcrossResetInitiateReset or \n\\r
-                        PopulateSystemTableInitateReset or not set.\n");\r
+                        or PopulateSystemTable or InitiateReset or not set\n");\r
   fprintf (stdout, "  --capheadsize HeadSize\n\\r
                         HeadSize is one HEX or DEC format value\n\\r
                         HeadSize is required by Capsule Image.\n");                        \r
@@ -408,10 +407,8 @@ Returns:
         mCapDataInfo.Flags |= CAPSULE_FLAGS_PERSIST_ACROSS_RESET | CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE;\r
       } else if (strcmp (argv[1], "PersistAcrossReset") == 0) {\r
         mCapDataInfo.Flags |= CAPSULE_FLAGS_PERSIST_ACROSS_RESET;\r
-      } else if (strcmp (argv[1], "PopulateSystemTableInitiateReset ") == 0) {\r
-        mCapDataInfo.Flags |= CAPSULE_FLAGS_PERSIST_ACROSS_RESET | CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE | CAPSULE_FLAGS_INITIATE_RESET;\r
-      } else if (strcmp (argv[1], "PersistAcrossResetInitiateReset ") == 0) {\r
-        mCapDataInfo.Flags |= CAPSULE_FLAGS_PERSIST_ACROSS_RESET;\r
+      } else if (strcmp (argv[1], "InitiateReset") == 0) {\r
+        mCapDataInfo.Flags |= CAPSULE_FLAGS_PERSIST_ACROSS_RESET | CAPSULE_FLAGS_INITIATE_RESET;\r
       } else {\r
         Error (NULL, 0, 1003, "Invalid option value", "%s = %s", argv[0], argv[1]);\r
         return STATUS_ERROR;\r

diff --git a/Source/C/GenFv/GenFvInternalLib.c b/Source/C/GenFv/GenFvInternalLib.c
index a273f92..2d430e6 100644 (file)
--- a/Source/C/GenFv/GenFvInternalLib.c
+++ b/Source/C/GenFv/GenFvInternalLib.c
@@ -3371,12 +3371,12 @@ Returns:
   if (Status == EFI_SUCCESS) {\r
     if (strstr (Value, "PopulateSystemTable") != NULL) {\r
       CapInfo->Flags |= CAPSULE_FLAGS_PERSIST_ACROSS_RESET | CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE;\r
-      if (strstr (Value, "InitiateReset")) {\r
+      if (strstr (Value, "InitiateReset") != NULL) {\r
         CapInfo->Flags |= CAPSULE_FLAGS_INITIATE_RESET;\r
       }\r
     } else if (strstr (Value, "PersistAcrossReset") != NULL) {\r
       CapInfo->Flags |= CAPSULE_FLAGS_PERSIST_ACROSS_RESET; \r
-      if (strstr (Value, "InitiateReset")) {\r
+      if (strstr (Value, "InitiateReset") != NULL) {\r
         CapInfo->Flags |= CAPSULE_FLAGS_INITIATE_RESET;\r
       }\r
     } else {\r