From: Alex Kiernan <alex.kiernan@gmail.com>
Date: Sun, 11 Feb 2018 17:16:46 +0000 (+0000)
Subject: Fix --noheader on fw_printenv
X-Git-Url: http://git.dujemihanovic.xyz/html/static/git-logo.png?a=commitdiff_plain;h=d877a6c50e886af089bf8fb947e566982672fd0a;p=u-boot.git

Fix --noheader on fw_printenv

The single argument `--noheader' is expecting isn't taken from getopt
parsing, but instead from the remaining argv arguments.

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
---

diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
index ca5507d4d7..6b71acb28f 100644
--- a/tools/env/fw_env.c
+++ b/tools/env/fw_env.c
@@ -452,7 +452,7 @@ int fw_printenv(int argc, char *argv[], int value_only, struct env_opts *opts)
 
 	if (value_only && argc != 1) {
 		fprintf(stderr,
-			"## Error: `-n' option requires exactly one argument\n");
+			"## Error: `-n'/`--noheader' option requires exactly one argument\n");
 		return -1;
 	}
 
diff --git a/tools/env/fw_env_main.c b/tools/env/fw_env_main.c
index 6fdf41c876..d93a915fd1 100644
--- a/tools/env/fw_env_main.c
+++ b/tools/env/fw_env_main.c
@@ -46,7 +46,7 @@ static struct option long_options[] = {
 	{"config", required_argument, NULL, 'c'},
 	{"help", no_argument, NULL, 'h'},
 	{"script", required_argument, NULL, 's'},
-	{"noheader", required_argument, NULL, 'n'},
+	{"noheader", no_argument, NULL, 'n'},
 	{"lock", required_argument, NULL, 'l'},
 	{"version", no_argument, NULL, 'v'},
 	{NULL, 0, NULL, 0}