projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
[oweals/u-boot.git]
/
tools
/
env
/
fw_env_main.c
diff --git
a/tools/env/fw_env_main.c
b/tools/env/fw_env_main.c
index b8bff264eb4ef5e0da6f90d3aff3b2aed3406d6e..1d193bd437d83ddfd78508765959f1c4561923c7 100644
(file)
--- a/
tools/env/fw_env_main.c
+++ b/
tools/env/fw_env_main.c
@@
-1,8
+1,7
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2000-2008
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
/*
* (C) Copyright 2000-2008
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
*/
/*
@@
-27,6
+26,7
@@
* of AES key), eg. '-a aabbccddeeff00112233445566778899'.
*/
* of AES key), eg. '-a aabbccddeeff00112233445566778899'.
*/
+#include <env.h>
#include <fcntl.h>
#include <getopt.h>
#include <stdio.h>
#include <fcntl.h>
#include <getopt.h>
#include <stdio.h>
@@
-34,6
+34,7
@@
#include <stdlib.h>
#include <sys/file.h>
#include <unistd.h>
#include <stdlib.h>
#include <sys/file.h>
#include <unistd.h>
+#include <version.h>
#include "fw_env_private.h"
#include "fw_env.h"
#include "fw_env_private.h"
#include "fw_env.h"
@@
-42,12
+43,12
@@
static int do_printenv;
static struct option long_options[] = {
static int do_printenv;
static struct option long_options[] = {
- {"aes", required_argument, NULL, 'a'},
{"config", required_argument, NULL, 'c'},
{"help", no_argument, NULL, 'h'},
{"script", required_argument, NULL, 's'},
{"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'},
{"lock", required_argument, NULL, 'l'},
+ {"version", no_argument, NULL, 'v'},
{NULL, 0, NULL, 0}
};
{NULL, 0, NULL, 0}
};
@@
-67,9
+68,7
@@
void usage_printenv(void)
"Print variables from U-Boot environment\n"
"\n"
" -h, --help print this help.\n"
"Print variables from U-Boot environment\n"
"\n"
" -h, --help print this help.\n"
-#ifdef CONFIG_ENV_AES
- " -a, --aes aes key to access environment\n"
-#endif
+ " -v, --version display version\n"
#ifdef CONFIG_FILE
" -c, --config configuration file, default:" CONFIG_FILE "\n"
#endif
#ifdef CONFIG_FILE
" -c, --config configuration file, default:" CONFIG_FILE "\n"
#endif
@@
-78,16
+77,14
@@
void usage_printenv(void)
"\n");
}
"\n");
}
-void usage_
setenv
(void)
+void usage_
env_set
(void)
{
fprintf(stderr,
"Usage: fw_setenv [OPTIONS]... [VARIABLE]...\n"
"Modify variables in U-Boot environment\n"
"\n"
" -h, --help print this help.\n"
{
fprintf(stderr,
"Usage: fw_setenv [OPTIONS]... [VARIABLE]...\n"
"Modify variables in U-Boot environment\n"
"\n"
" -h, --help print this help.\n"
-#ifdef CONFIG_ENV_AES
- " -a, --aes aes key to access environment\n"
-#endif
+ " -v, --version display version\n"
#ifdef CONFIG_FILE
" -c, --config configuration file, default:" CONFIG_FILE "\n"
#endif
#ifdef CONFIG_FILE
" -c, --config configuration file, default:" CONFIG_FILE "\n"
#endif
@@
-123,16
+120,9
@@
static void parse_common_args(int argc, char *argv[])
env_opts.config_file = CONFIG_FILE;
#endif
env_opts.config_file = CONFIG_FILE;
#endif
- while ((c = getopt_long(argc, argv, ":a:c:l:h", long_options, NULL)) !=
+ while ((c = getopt_long(argc, argv, ":a:c:l:h
:v
", long_options, NULL)) !=
EOF) {
switch (c) {
EOF) {
switch (c) {
- case 'a':
- if (parse_aes_key(optarg, env_opts.aes_key)) {
- fprintf(stderr, "AES key parse error\n");
- exit(EXIT_FAILURE);
- }
- env_opts.aes_flag = 1;
- break;
#ifdef CONFIG_FILE
case 'c':
env_opts.config_file = optarg;
#ifdef CONFIG_FILE
case 'c':
env_opts.config_file = optarg;
@@
-142,7
+132,11
@@
static void parse_common_args(int argc, char *argv[])
env_opts.lockname = optarg;
break;
case 'h':
env_opts.lockname = optarg;
break;
case 'h':
- do_printenv ? usage_printenv() : usage_setenv();
+ do_printenv ? usage_printenv() : usage_env_set();
+ exit(EXIT_SUCCESS);
+ break;
+ case 'v':
+ fprintf(stderr, "Compiled with " U_BOOT_VERSION "\n");
exit(EXIT_SUCCESS);
break;
default:
exit(EXIT_SUCCESS);
break;
default:
@@
-162,7
+156,7
@@
int parse_printenv_args(int argc, char *argv[])
parse_common_args(argc, argv);
parse_common_args(argc, argv);
- while ((c = getopt_long(argc, argv, "a:c:ns:l:h", long_options, NULL))
+ while ((c = getopt_long(argc, argv, "a:c:ns:l:h
:v
", long_options, NULL))
!= EOF) {
switch (c) {
case 'n':
!= EOF) {
switch (c) {
case 'n':
@@
-189,7
+183,7
@@
int parse_setenv_args(int argc, char *argv[])
parse_common_args(argc, argv);
parse_common_args(argc, argv);
- while ((c = getopt_long(argc, argv, "a:c:ns:l:h", long_options, NULL))
+ while ((c = getopt_long(argc, argv, "a:c:ns:l:h
:v
", long_options, NULL))
!= EOF) {
switch (c) {
case 's':
!= EOF) {
switch (c) {
case 's':
@@
-202,7
+196,7
@@
int parse_setenv_args(int argc, char *argv[])
/* ignore common options */
break;
default: /* '?' */
/* ignore common options */
break;
default: /* '?' */
- usage_
setenv
();
+ usage_
env_set
();
exit(EXIT_FAILURE);
break;
}
exit(EXIT_FAILURE);
break;
}
@@
-245,7
+239,7
@@
int main(int argc, char *argv[])
argv += optind;
if (env_opts.lockname) {
argv += optind;
if (env_opts.lockname) {
- lockname = malloc(s
izeof
(env_opts.lockname) +
+ lockname = malloc(s
trlen
(env_opts.lockname) +
sizeof(CMD_PRINTENV) + 10);
if (!lockname) {
fprintf(stderr, "Unable allocate memory");
sizeof(CMD_PRINTENV) + 10);
if (!lockname) {
fprintf(stderr, "Unable allocate memory");
@@
-273,7
+267,7
@@
int main(int argc, char *argv[])
retval = EXIT_FAILURE;
} else {
if (!script_file) {
retval = EXIT_FAILURE;
} else {
if (!script_file) {
- if (fw_
setenv
(argc, argv, &env_opts) != 0)
+ if (fw_
env_set
(argc, argv, &env_opts) != 0)
retval = EXIT_FAILURE;
} else {
if (fw_parse_script(script_file, &env_opts) != 0)
retval = EXIT_FAILURE;
} else {
if (fw_parse_script(script_file, &env_opts) != 0)