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 branch 'master' of git://git.denx.de/u-boot-sunxi
[oweals/u-boot.git]
/
common
/
spl
/
spl_dfu.c
diff --git
a/common/spl/spl_dfu.c
b/common/spl/spl_dfu.c
index 2c974735b11a8daf4eccdd3289307a488ffaaeba..01178f611f4bb9c73f0aa63274d9db1ebc535ce7 100644
(file)
--- a/
common/spl/spl_dfu.c
+++ b/
common/spl/spl_dfu.c
@@
-1,10
+1,9
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2016
* Texas Instruments, <www.ti.com>
*
* Ravi B <ravibabu@ti.com>
/*
* (C) Copyright 2016
* Texas Instruments, <www.ti.com>
*
* Ravi B <ravibabu@ti.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <spl.h>
*/
#include <common.h>
#include <spl.h>
@@
-39,16
+38,16
@@
int spl_dfu_cmd(int usbctrl, char *dfu_alt_info, char *interface, char *devstr)
int ret;
/* set default environment */
int ret;
/* set default environment */
- set_default_env(0);
+ set_default_env(
NULL,
0);
str_env = env_get(dfu_alt_info);
if (!str_env) {
str_env = env_get(dfu_alt_info);
if (!str_env) {
-
erro
r("\"dfu_alt_info\" env variable not defined!\n");
+
pr_er
r("\"dfu_alt_info\" env variable not defined!\n");
return -EINVAL;
}
ret = env_set("dfu_alt_info", str_env);
if (ret) {
return -EINVAL;
}
ret = env_set("dfu_alt_info", str_env);
if (ret) {
-
erro
r("unable to set env variable \"dfu_alt_info\"!\n");
+
pr_er
r("unable to set env variable \"dfu_alt_info\"!\n");
return -EINVAL;
}
return -EINVAL;
}