projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
POST: replace the LOGBUFF_INITIALIZED flag in gd->post_log_word (1 << 31) with the...
[oweals/u-boot.git]
/
common
/
cmd_ximg.c
diff --git
a/common/cmd_ximg.c
b/common/cmd_ximg.c
index 77f68c44c785408c0ecb919314abc4f81781671f..2753389eaee4c93c5bbc998cdc457673ccdc3baa 100644
(file)
--- a/
common/cmd_ximg.c
+++ b/
common/cmd_ximg.c
@@
-24,7
+24,6
@@
* MA 02111-1307 USA
*/
* MA 02111-1307 USA
*/
-#if defined(CONFIG_CMD_XIMG)
/*
* Multi Image extract
/*
* Multi Image extract
@@
-40,20
+39,19
@@
do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
ulong addr = load_addr;
ulong dest = 0;
ulong data, len, count;
ulong addr = load_addr;
ulong dest = 0;
ulong data, len, count;
- int
i,
verify;
+ int verify;
int part = 0;
char pbuf[10];
int part = 0;
char pbuf[10];
- char *s;
image_header_t *hdr;
#if defined(CONFIG_FIT)
image_header_t *hdr;
#if defined(CONFIG_FIT)
- const char *uname;
+ const char *uname
= NULL
;
const void* fit_hdr;
int noffset;
const void *fit_data;
size_t fit_len;
#endif
const void* fit_hdr;
int noffset;
const void *fit_data;
size_t fit_len;
#endif
- verify = getenv_
verify (
);
+ verify = getenv_
yesno ("verify"
);
if (argc > 1) {
addr = simple_strtoul(argv[1], NULL, 16);
if (argc > 1) {
addr = simple_strtoul(argv[1], NULL, 16);
@@
-134,7
+132,7
@@
do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
}
/* get subimage node offset */
}
/* get subimage node offset */
- noffset = fit_image_get_node (fit_hdr,
fit_
uname);
+ noffset = fit_image_get_node (fit_hdr, uname);
if (noffset < 0) {
printf ("Can't find '%s' FIT subimage\n", uname);
return 1;
if (noffset < 0) {
printf ("Can't find '%s' FIT subimage\n", uname);
return 1;
@@
-160,7
+158,7
@@
do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
return 1;
}
return 1;
}
- data = (ulong
*
)fit_data;
+ data = (ulong)fit_data;
len = (ulong)fit_len;
break;
#endif
len = (ulong)fit_len;
break;
#endif
@@
-190,5
+188,3
@@
U_BOOT_CMD(imxtract, 4, 1, do_imgextract,
" - extract <uname> subimage from FIT image at <addr> and copy to <dest>\n"
#endif
);
" - extract <uname> subimage from FIT image at <addr> and copy to <dest>\n"
#endif
);
-
-#endif