vendor/acpica/20170531

1 files changed, 8 insertions, 5 deletions

diff --git a/source/compiler/aslhelp.c b/source/compiler/aslhelp.c
index 2244e264db96..2b0dc7632e83 100644
--- a/source/compiler/aslhelp.c
+++ b/source/compiler/aslhelp.c
@@ -180,7 +180,6 @@ Usage (
     ACPI_OPTION ("-@  <file>",      "Specify command file");
     ACPI_OPTION ("-I  <dir>",       "Specify additional include directory");
     ACPI_OPTION ("-p  <prefix>",    "Specify path/filename prefix for all output files");
-    ACPI_OPTION ("-ca <file>",      "convert a given ASL file to ASL+ (retains comments)");
     ACPI_OPTION ("-v",              "Display compiler version");
     ACPI_OPTION ("-vd",             "Display compiler build date and time");
     ACPI_OPTION ("-vo",             "Enable optimization comments");
@@ -209,7 +208,7 @@ Usage (
     ACPI_OPTION ("-w <1|2|3>",      "Set warning reporting level");
     ACPI_OPTION ("-we",             "Report warnings as errors");
 
-    printf ("\nAML Code Generation (*.aml):\n");
+    printf ("\nAML Bytecode Generation (*.aml):\n");
     ACPI_OPTION ("-oa",             "Disable all optimizations (compatibility mode)");
     ACPI_OPTION ("-of",             "Disable constant folding");
     ACPI_OPTION ("-oi",             "Disable integer optimization to Zero/One/Ones");
@@ -226,20 +225,24 @@ Usage (
     ACPI_OPTION ("-ls",             "Create combined source file (expanded includes) (*.src)");
     ACPI_OPTION ("-lx",             "Create cross-reference file (*.xrf)");
 
-    printf ("\nFirmware Support - C Output:\n");
+    printf ("\nFirmware Support - C Text Output:\n");
     ACPI_OPTION ("-tc",             "Create hex AML table in C (*.hex)");
     ACPI_OPTION ("-sc",             "Create named hex AML arrays in C (*.c)");
     ACPI_OPTION ("-ic",             "Create include file in C for -sc symbols (*.h)");
     ACPI_OPTION ("-so",             "Create namespace AML offset table in C (*.offset.h)");
 
-    printf ("\nFirmware Support - Assembler Output:\n");
+    printf ("\nFirmware Support - Assembler Text Output:\n");
     ACPI_OPTION ("-ta",             "Create hex AML table in assembler (*.hex)");
     ACPI_OPTION ("-sa",             "Create named hex AML arrays in assembler (*.asm)");
     ACPI_OPTION ("-ia",             "Create include file in assembler for -sa symbols (*.inc)");
 
-    printf ("\nFirmware Support - ASL Output:\n");
+    printf ("\nFirmware Support - ASL Text Output:\n");
     ACPI_OPTION ("-ts",             "Create hex AML table in ASL (Buffer object) (*.hex)");
 
+    printf ("\nLegacy-ASL to ASL+ Converter:\n");
+    ACPI_OPTION ("-ca <file>",      "Convert legacy-ASL source file to new ASL+ file");
+    ACPI_OPTION ("",                "  (Original comments are passed through to ASL+ file)");
+
     printf ("\nData Table Compiler:\n");
     ACPI_OPTION ("-G",              "Compile custom table that contains generic operators");
     ACPI_OPTION ("-T <sig list>|ALL",   "Create ACPI table template/example files");