@ -34,6 +34,7 @@
# include <stdlib.h>
# include <stdlib.h>
# include <sys/file.h>
# include <sys/file.h>
# include <unistd.h>
# include <unistd.h>
# include <version.h>
# include "fw_env_private.h"
# include "fw_env_private.h"
# include "fw_env.h"
# include "fw_env.h"
@ -48,6 +49,7 @@ static struct option long_options[] = {
{ " script " , required_argument , NULL , ' s ' } ,
{ " script " , required_argument , NULL , ' s ' } ,
{ " noheader " , required_argument , NULL , ' n ' } ,
{ " noheader " , required_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,6 +69,7 @@ void usage_printenv(void)
" Print variables from U-Boot environment \n "
" Print variables from U-Boot environment \n "
" \n "
" \n "
" -h, --help print this help. \n "
" -h, --help print this help. \n "
" -v, --version display version \n "
# ifdef CONFIG_ENV_AES
# ifdef CONFIG_ENV_AES
" -a, --aes aes key to access environment \n "
" -a, --aes aes key to access environment \n "
# endif
# endif
@ -85,6 +88,7 @@ void usage_env_set(void)
" Modify variables in U-Boot environment \n "
" Modify variables in U-Boot environment \n "
" \n "
" \n "
" -h, --help print this help. \n "
" -h, --help print this help. \n "
" -v, --version display version \n "
# ifdef CONFIG_ENV_AES
# ifdef CONFIG_ENV_AES
" -a, --aes aes key to access environment \n "
" -a, --aes aes key to access environment \n "
# endif
# endif
@ -123,7 +127,7 @@ static void parse_common_args(int argc, char *argv[])
env_opts . config_file = CONFIG_FILE ;
env_opts . config_file = CONFIG_FILE ;
# endif
# 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 ) {
EOF ) {
switch ( c ) {
switch ( c ) {
case ' a ' :
case ' a ' :
@ -145,6 +149,10 @@ static void parse_common_args(int argc, char *argv[])
do_printenv ? usage_printenv ( ) : usage_env_set ( ) ;
do_printenv ? usage_printenv ( ) : usage_env_set ( ) ;
exit ( EXIT_SUCCESS ) ;
exit ( EXIT_SUCCESS ) ;
break ;
break ;
case ' v ' :
fprintf ( stderr , " Compiled with " U_BOOT_VERSION " \n " ) ;
exit ( EXIT_SUCCESS ) ;
break ;
default :
default :
/* ignore unknown options */
/* ignore unknown options */
break ;
break ;
@ -162,7 +170,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 ) {
! = EOF ) {
switch ( c ) {
switch ( c ) {
case ' n ' :
case ' n ' :
@ -189,7 +197,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 ) {
! = EOF ) {
switch ( c ) {
switch ( c ) {
case ' s ' :
case ' s ' :