projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: sunxi: Enable PSCI for sun8i
[oweals/u-boot.git]
/
tools
/
dumpimage.c
diff --git
a/tools/dumpimage.c
b/tools/dumpimage.c
index 8f1527a9e77fe166d28cd8bbdb59a409cc50e579..75a5d4762cda6b1e31432a1e419b3d8400e7751e 100644
(file)
--- a/
tools/dumpimage.c
+++ b/
tools/dumpimage.c
@@
-18,7
+18,7
@@
static struct image_tool_params params = {
};
/*
};
/*
- * dumpimage_extract_
datafil
e -
+ * dumpimage_extract_
subimag
e -
*
* It scans all registered image types,
* verifies image_header for each supported image type
*
* It scans all registered image types,
* verifies image_header for each supported image type
@@
-28,7
+28,7
@@
static struct image_tool_params params = {
* returns negative if input image format does not match with any of
* supported image types
*/
* returns negative if input image format does not match with any of
* supported image types
*/
-static int dumpimage_extract_
datafil
e(struct image_type_params *tparams,
+static int dumpimage_extract_
subimag
e(struct image_type_params *tparams,
void *ptr, struct stat *sbuf)
{
int retval = -1;
void *ptr, struct stat *sbuf)
{
int retval = -1;
@@
-42,11
+42,11
@@
static int dumpimage_extract_datafile(struct image_type_params *tparams,
* Extract the file from the image
* if verify is successful
*/
* Extract the file from the image
* if verify is successful
*/
- if (tparams->extract_
datafil
e) {
- retval = tparams->extract_
datafil
e(ptr, ¶ms);
+ if (tparams->extract_
subimag
e) {
+ retval = tparams->extract_
subimag
e(ptr, ¶ms);
} else {
fprintf(stderr,
} else {
fprintf(stderr,
- "%s: extract_
datafil
e undefined for %s\n",
+ "%s: extract_
subimag
e undefined for %s\n",
params.cmdname, tparams->name);
return -2;
}
params.cmdname, tparams->name);
return -2;
}
@@
-170,7
+170,7
@@
int main(int argc, char **argv)
* Extract the data files from within the matched
* image type. Returns the error code if not matched
*/
* Extract the data files from within the matched
* image type. Returns the error code if not matched
*/
- retval = dumpimage_extract_
datafil
e(tparams, ptr,
+ retval = dumpimage_extract_
subimag
e(tparams, ptr,
&sbuf);
} else {
/*
&sbuf);
} else {
/*