Add more help text for the options of GenFw tool.

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

diff --git a/Source/C/GenFw/GenFw.c b/Source/C/GenFw/GenFw.c
index c81fdd3..bfdc409 100644 (file)
--- a/Source/C/GenFw/GenFw.c
+++ b/Source/C/GenFw/GenFw.c
@@ -202,28 +202,76 @@ Returns:
                         File will be created to store the ouput content.\n");\r
   fprintf (stdout, "  -e EFI_FILETYPE, --efiImage EFI_FILETYPE\n\\r
                         Create Efi Image. EFI_FILETYPE is one of BASE, SEC,\n\\r
-                        PEI_CORE, PEIM, DXE_CORE, DXE_RUNTIME_DRIVER,\n\\r
+                        PEI_CORE, PEIM, DXE_CORE, DXE_DRIVER, DXE_RUNTIME_DRIVER,\n\\r
                         DXE_SAL_DRIVER, UEFI_DRIVER, UEFI_APPLICATION, \n\\r
                         DXE_SMM_DRIVER, SECURITY_CORE, COMBINED_PEIM_DRIVER, \n\\r
                         PIC_PEIM, RELOCATABLE_PEIM, BS_DRIVER, RT_DRIVER,\n\\r
-                        APPLICATION, SAL_RT_DRIVER to support all module types\n");\r
-  fprintf (stdout, "  -c, --acpi            Create Acpi table.\n");\r
-  fprintf (stdout, "  -t, --terse           Create Te Image.\n");\r
-  fprintf (stdout, "  -u, --dump            Dump TeImage Header.\n");\r
-  fprintf (stdout, "  -z, --zero            Zero the Debug Data Fields in the PE input image file.\n");\r
-  fprintf (stdout, "  -b, --exe2bin         Convert the input EXE to the output BIN file.\n");\r
-  fprintf (stdout, "  -l, --stripped        Relocation info stripped from the input PE or TE image.\n");\r
-  fprintf (stdout, "  -r, --replace         Overwrite the input file with the output content.\n");\r
+                        APPLICATION, SAL_RT_DRIVER to support all module types\n\\r
+                        It can only be used together with --keepexceptiontable,\n\\r
+                        --keepzeropending, -r, -o option. It is a action option.\n\\r
+                        If it is combined with other action options, the later\n\\r
+                        input action option will override the previous one.\n");\r
+  fprintf (stdout, "  -c, --acpi            Create Acpi table.\n\\r
+                        It can't be combined with other action options\n\\r
+                        except for -o, -r option. It is a action option.\n\\r
+                        If it is combined with other action options, the later\n\\r
+                        input action option will override the previous one.\n");\r
+  fprintf (stdout, "  -t, --terse           Create Te Image.\n\\r
+                        It can only be used together with --keepexceptiontable,\n\\r
+                        --keepzeropending, -r, -o option. It is a action option.\n\\r
+                        If it is combined with other action options, the later\n\\r
+                        input action option will override the previous one.\n");\r
+  fprintf (stdout, "  -u, --dump            Dump TeImage Header.\n\\r
+                        It can't be combined with other action options\n\\r
+                        except for -o, -r option. It is a action option.\n\\r
+                        If it is combined with other action options, the later\n\\r
+                        input action option will override the previous one.\n");\r
+  fprintf (stdout, "  -z, --zero            Zero the Debug Data Fields in the PE input image file.\n\\r
+                        It can't be combined with other action options\n\\r
+                        except for -o, -r option. It is a action option.\n\\r
+                        If it is combined with other action options, the later\n\\r
+                        input action option will override the previous one.\n");\r
+  fprintf (stdout, "  -b, --exe2bin         Convert the input EXE to the output BIN file.\n\\r
+                        It can't be combined with other action options\n\\r
+                        except for -o, -r option. It is a action option.\n\\r
+                        If it is combined with other action options, the later\n\\r
+                        input action option will override the previous one.\n");;\r
+  fprintf (stdout, "  -l, --stripped        Relocation info stripped from the input PE or TE image.\n\\r
+                        It can't be combined with other action options\n\\r
+                        except for -o, -r option. It is a action option.\n\\r
+                        If it is combined with other action options, the later\n\\r
+                        input action option will override the previous one.\n");\r
   fprintf (stdout, "  -s timedate, --stamp timedate\n\\r
                         timedate format is \"yyyy-mm-dd 00:00:00\". if timedata \n\\r
                         is set to NOW, current system time is used. The support\n\\r
-                        date scope is 1970-1-1 0:0:0 ~ 2038-1-19 3:14:07\n");\r
-  fprintf (stdout, "  -m, --mcifile         Convert input microcode txt file to microcode bin file.\n");\r
-  fprintf (stdout, "  -j, --join            Combine multi microcode bin files to one file.\n");\r
-  fprintf (stdout, "  --keepexceptiontable  Don't clear exception table.\n");\r
-  fprintf (stdout, "  --keepzeropending     Don't strip zero pending of .reloc.\n");\r
-  fprintf (stdout, "  -a NUM, --align NUM   NUM is one HEX or DEC format alignment value.\n");\r
-  fprintf (stdout, "  -p NUM, --pad NUM     NUM is one HEX or DEC format padding value.\n");\r
+                        date scope is 1970-1-1 0:0:0 ~ 2038-1-19 3:14:07\n\\r
+                        It can't be combined with other action options\n\\r
+                        except for -o, -r option. It is a action option.\n\\r
+                        If it is combined with other action options, the later\n\\r
+                        input action option will override the previous one.\n");\r
+  fprintf (stdout, "  -m, --mcifile         Convert input microcode txt file to microcode bin file.\n\\r
+                        It can't be combined with other action options\n\\r
+                        except for -o option. It is a action option.\n\\r
+                        If it is combined with other action options, the later\n\\r
+                        input action option will override the previous one.\n");\r
+  fprintf (stdout, "  -j, --join            Combine multi microcode bin files to one file.\n\\r
+                        It can be specified with -a, -p, -o option.\n\\r
+                        No other options can be combined with it.\n\\r
+                        If it is combined with other action options, the later\n\\r
+                        input action option will override the previous one.\n");\r
+  fprintf (stdout, "  -a NUM, --align NUM   NUM is one HEX or DEC format alignment value.\n\\r
+                        This option is only used together with -j option.\n");  \r
+  fprintf (stdout, "  -p NUM, --pad NUM     NUM is one HEX or DEC format padding value.\n\\r
+                        This option is only used together with -j option.\n");\r
+  fprintf (stdout, "  --keepexceptiontable  Don't clear exception table.\n\\r
+                        This option can be used together with -e or -t.\n\\r
+                        It doesn't work for other options.\n");\r
+  fprintf (stdout, "  --keepzeropending     Don't strip zero pending of .reloc.\n\\r
+                        This option can be used together with -e or -t.\n\\r
+                        It doesn't work for other options.\n");\r
+  fprintf (stdout, "  -r, --replace         Overwrite the input file with the output content.\n\\r
+                        If more input files are specified,\n\\r
+                        the last input file will be as the output file.\n");\r
   fprintf (stdout, "  -v, --verbose         Turn on verbose output with informational messages.\n");\r
   fprintf (stdout, "  -q, --quiet           Disable all messages except key message and fatal error\n");\r
   fprintf (stdout, "  -d, --debug level     Enable debug messages, at input debug level.\n");\r